Commit Graph

394 Commits

Author SHA1 Message Date
Shabirmean
63dcd1e04e Addidng SocialDB to distribution pom 2015-12-08 12:02:58 +05:30
Shabirmean
85bc5bd201 Adding SocialDB creation execution to distribution pom 2015-12-07 23:46:44 +05:30
Shabirmean
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +05:30
Shabirmean
808771056c removing the common-api feature from the build 2015-12-07 13:41:45 +05:30
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +05:30
ayyoob
098547efaa removing unnecessary es store files 2015-11-30 00:28:47 +05:30
ayyoob
320f754356 resolved few started errors 2015-11-28 01:27:40 +05:30
charithag
247dfa9820 Migrated to CDMF with Generic UI 2015-11-27 11:10:37 +05:30
Shabirmean
cbdb4eaece removed unnecessary logs from the VirtualFIreAlarmService 2015-11-20 19:48:27 +05:30
Shabirmean
ec98c99894 Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm 2015-11-20 19:04:28 +05:30
Shabirmean
af3e30fbc3 synced firealarm web.xml with virtual_firealarm web.xml 2015-11-17 13:34:39 +05:30
Shabirmean
d28a2bf4b3 Changes for the FireAlarmService to work with real device and SCEP service inclusions 2015-11-14 18:23:48 +05:30
Menaka Madushanka
c8e85ce0db resources.xml file added 2015-11-11 10:08:03 +05:30
Ace
f5f5356e35 Restructirng samples 2015-11-10 12:35:45 +05:30
Rasika Perera
29a0bf2fe2 fixing invalid relative paths in pom.xml 2015-11-03 11:38:14 +05:30
Rasika Perera
44f380c8e0 changes to the resources.xml 2015-11-03 11:30:00 +05:30
Rasika Perera
4c07301c8c upgrading carbon analytics versions 2015-11-03 11:23:38 +05:30
Ace
5a090d93df Adding property to pickup application name from web.xml 2015-10-31 15:12:43 +05:30
Charitha Goonetilleke
a337fefd8d Merge pull request #19 from charithag/master
Add simple and advanced fire alarm agents
2015-10-30 20:59:09 +05:30
Ace
1d2d57259b fixing some minor bugs 2015-10-30 19:43:13 +05:30
charithag
fe59fa9410 Add simple and advanced fire alarm agents 2015-10-30 14:23:51 +05:30
charithag
e8a0ccf6e3 Fire alarm changes done by Shabir 2015-10-25 22:49:49 +05:30
ayyoob
bf9bfd40b5 few changes after testing 2015-10-25 20:17:51 +05:30
ayyoob
a0ee671515 resolved errors on sample build and few changes on android service 2015-10-25 02:32:19 +05:30
ayyoob
e39ee91518 update version and few changes on android sense service 2015-10-24 21:20:56 +05:30
Rasika Perera
ec70dad7da refactoring 2015-10-23 12:34:19 +05:30
charithag
82740dec44 Revert pom changes to previous 2015-10-23 12:29:38 +05:30
Rasika Perera
b6156af241 refactoring 2015-10-23 11:16:32 +05:30
Rasika Perera
82f1f645fd resolving conflicts 2015-10-23 11:02:12 +05:30
Rasika Perera
6fabb28b1c migrating in memory sensor manager 2015-10-23 10:50:51 +05:30
Shabirmean
7664f73b4e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
Conflicts:
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/VirtualFireAlarmService.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/DeviceRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dao/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/dto/TemperatureRecord.java
	modules/samples/virtual_firealarm/src/org.wso2.carbon.device.mgt.iot.sample.virtual.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/virtual/firealarm/service/impl/util/DataHolder.java
2015-10-23 10:30:36 +05:30
Shabirmean
5bf09ef1ed changed package from dao to dot 2015-10-23 10:21:24 +05:30
ayyoob
5625b83b64 added android sense service and required stream definitions 2015-10-23 07:42:29 +05:30
Rasika Perera
fb21dc8b72 Merge pull request #13 from rasika90/master
Generalizing in memory map into any sensor reading
2015-10-23 01:11:11 +05:30
Rasika Perera
e31fda92a6 generalizing inmemory map into any sensor 2015-10-23 01:04:55 +05:30
Rasika Perera
50e90fa8de generalizing inmemory map into any sensor 2015-10-23 01:04:32 +05:30
charithag
ae1f904082 Deploy firealarm-webapp with virtual-firealarm sample 2015-10-22 21:20:17 +05:30
charithag
16f1fc7d5e Remove duplicate portal jaggery app 2015-10-22 19:11:08 +05:30
charithag
e9dc4c9097 Add in memory hash table to hold last received temperature data 2015-10-22 17:49:10 +05:30
Shabirmean
bf5fad5409 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-10-22 12:31:37 +05:30
Shabirmean
e9d08faa6c added changes to publish data received via MQTT and XMPP 2015-10-22 12:31:28 +05:30
charithag
928dd66ae3 License updated 2015-10-22 07:52:19 +05:30
charithag
36bf7a529a Redirect user to the login page upon successful registration 2015-10-22 06:51:53 +05:30
charithag
306646c51d Change virtual device "Download" button text to "Create a Device". 2015-10-22 06:50:55 +05:30
charithag
08d2d9d6a7 Removed un used cdm dbscripts 2015-10-22 06:48:00 +05:30
Shabirmean
75b4e5ff27 changes to the VirtualFireAlarm service to send and receive XMPP,MQTT messages 2015-10-20 20:21:02 +05:30
ayyoob
ec47429127 few changes after testing 2015-10-16 18:30:19 +05:30
ayyoob
aa001675b3 Merge branch 'master' of https://github.com/wso2-incubator/product-device-cloud 2015-10-16 16:58:58 +05:30
ayyoob
2d2ab1cdf3 update the bin file 2015-10-16 16:58:51 +05:30
ayyoob
fd2e7c3ed2 DAS update 2015-10-16 16:58:39 +05:30