community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,081 Commits 10 Branches 83 Tags 214 MiB
7b6061b51b
Commit Graph

866 Commits

Author SHA1 Message Date
Rasika Perera
29aca290a4 Adding group permission checking 2016-05-04 00:49:06 +05:30
ayyoob
751b2f8dae removed unused sample device types 2016-05-03 18:40:31 +05:30
ayyoob
586aaa5f1e Fixed https://wso2.org/jira/browse/IOTS-64 2016-05-03 18:40:15 +05:30
ayyoob
ad237ffd34 resolved issues in connected cup sample 2016-05-03 13:44:08 +05:30
ayyoob
720a57f5df updated IDP config 2016-04-29 17:41:05 +05:30
Shabirmean
5527e82bab Removed custom keystores and included only the 'wso2certs.jks' file with CA and RA certs for SCEP 2016-04-29 16:42:25 +05:30
ayyoob
2a6e42b646 resolve server shutdown issues 2016-04-24 02:16:27 +05:30
NuwanSameera
2f2c23105a Move digital display and drone analyzer to samples. 2016-04-22 15:58:12 +05:30
ayyoob
568bb7d09f Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-04-20 00:00:48 +05:30
ayyoob
b336c05625 few fixes after testing 2016-04-19 23:35:43 +05:30
NuwanSameera
4f28e803af Remove monitor operations from controoler api. 2016-04-19 17:21:09 +05:30
Prabath Abeysekara
2fadbc10a6 Merge pull request #116 from charithag/master 
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
 2016-04-19 13:36:58 +05:30
Prabath Abeysekara
a6e2b235c9 Merge pull request #117 from ayyoob/das-ext 
Added DAS extensions features and upgraded analytics versions
 2016-04-18 17:32:31 +05:30
ayyoob
394f57d729 Added DAS Extensions features 2016-04-18 17:17:14 +05:30
charithag
4d76f89b87 Merge branch 'master' of https://github.com/wso2/product-iots 2016-04-18 17:10:49 +05:30
charithag
49466b2953 Add devicemgt_admin jax-rs and removed mdm-admin jax-rs 2016-04-18 16:42:53 +05:30
NuwanSameera
ab7ee2dbb8 Merge remote-tracking branch 'origin/master' 
Conflicts:
	modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/transport/ConnectedCupMQTTConnector.java
	modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/ConnectedCupServiceUtils.java
	modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/ConnectedCupControllerService.java
	modules/samples/connectedcup/component/manager/src/main/java/org/coffeeking/manager/service/ConnectedCupManagerService.java
	modules/samples/connectedcup/component/manager/src/main/webapp/WEB-INF/cxf-servlet.xml
	modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
	modules/samples/currentsensor/component/controller/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorControllerService.java
	modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorManagerService.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDeviceDAOImpl.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
	modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
	modules/samples/firealarm/component/controller/src/main/java/org.homeautomation/firealarm/controller/api/ControllerService.java
 2016-04-18 11:49:18 +05:30
NuwanSameera
c7c2222e4b Add Uninstall feature to sample device types. 2016-04-18 11:47:47 +05:30
ayyoob
e9f2062362 added files related to activate synapse as a gateway 2016-04-18 02:58:55 +05:30
ayyoob
f2648c2c28 few changes after testing with the apim 2016-04-17 12:21:17 +05:30
ayyoob
a80a493506 few changes after testing 2016-04-15 23:11:11 +05:30
ayyoob
f91b566425 version update and added das extension feature 2016-04-14 19:57:13 +05:30
ayyoob
4d2c63eff7 disabled jwt grant type 2016-04-01 21:13:56 +05:30
ayyoob
7e51653b36 removed snapshot version from dependencies 2016-04-01 21:03:48 +05:30
Ruwan
94ba3ff6c2 Merge pull request #112 from rasika90/master 
Removing uuf template app feature from iots
 2016-04-01 19:29:31 +05:30
Rasika Perera
0fc75151f6 Removing uuf template app feature 2016-04-01 15:08:34 +05:30
charithag
85a00afe85 Merge branch 'master' of https://github.com/wso2/product-iot-server 
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/features/org.wso2.iot.styles.feature/pom.xml
#	modules/features/pom.xml
#	modules/p2-profile-gen/pom.xml
 2016-03-31 23:41:07 +05:30
ayyoob
0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature. 2016-03-31 05:58:09 +05:30
charithag
4cfa5f60ea Disabled IoT device types based features temporally. 2016-03-30 02:07:35 +05:30
charithag
17e9dd9127 Fix for https://wso2.org/jira/browse/IOTS-99 2016-03-25 15:29:40 +05:30
Ruwan
155867b334 Merge pull request #109 from ayyoob/master 
Added JWT grant type and upgraded the APIM version
 2016-03-24 08:45:03 +05:30
ayyoob
69740cc2f2 updated APIM version 2016-03-23 03:23:13 +05:30
GPrathap
65b4dec1d7 adding a new gadget: Data Range Picker 2016-03-21 05:55:00 +05:30
GPrathap
824503c0d7 adding new theme to dashboard portal application 2016-03-20 23:58:47 +05:30
Charitha Goonetilleke
9afcfc6ee6 Merge pull request #107 from charithag/master 
Refactoring
 2016-03-18 12:49:52 +05:30
charithag
e5c11b9fa5 Refactoring 2016-03-18 12:47:14 +05:30
NuwanSameera
e0b9524168 Remove policy based jaggery apps from samples. 2016-03-17 15:00:43 +05:30
NuwanSameera
77b4a51add Resolve conflicts. 2016-03-17 14:57:25 +05:30
NuwanSameera
0ab149d392 Remove policy based jagerry apps from samples. 2016-03-17 14:44:20 +05:30
charithag
16a8e63497 Merge branch 'master' of https://github.com/charithag/product-iot-server 
# Conflicts:
#	modules/samples/doormanager/component/pom.xml
 2016-03-15 13:58:16 +05:30
charithag
a2c016efcc Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-15 11:53:14 +05:30
charithag
dc3540f2ef Merge branch 'master' of https://github.com/charithag/product-iot-server 
# Conflicts:
#	modules/samples/doormanager/component/pom.xml
 2016-03-15 11:52:59 +05:30
GPrathap
d9fd45e5ab removed file separator when creating mqtt subscriber topic 2016-03-15 11:49:28 +05:30
NuwanSameera
1ac7f55435 Add permissions.xml to current sensor device type. 2016-03-15 10:50:03 +05:30
Charitha Goonetilleke
6029428336 Bump json version 2016-03-14 23:58:07 +05:30
Charitha Goonetilleke
f48b35b494 Bump json version 2016-03-14 23:38:14 +05:30
Charitha Goonetilleke
a7221a04b6 Bump json version 2016-03-14 23:37:30 +05:30
Charitha Goonetilleke
fbe6ebe9df Fix json library version 2016-03-14 23:36:14 +05:30
Menaka Madushanka
130cad34ee Changes suggested in the Code review. 2016-03-14 19:50:50 +05:30
Menaka Madushanka
f7cf6fe56e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-14 17:59:10 +05:30
Menaka Madushanka
0333007b1f Changes suggested in the Code review. 2016-03-14 17:41:23 +05:30
NuwanSameera
0e01164874 Merge branch 'master' of https://github.com/ayyoob/product-iot-server 2016-03-14 12:44:57 +05:30
Menaka Madushanka
eb77b572e7 Fixes 2016-03-14 12:28:03 +05:30
Menaka Madushanka
d7565e7fe7 Minor fixes 2016-03-14 11:18:47 +05:30
NuwanSameera
aeb3ef20ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-14 10:14:02 +05:30
Menaka Madushanka
d71b00d925 Added constants. 2016-03-14 10:04:42 +05:30
GPrathap
24fe930727 refactoring code 2016-03-13 22:02:09 +05:30
GPrathap
9b38eddd09 relocated ui component 2016-03-13 22:01:28 +05:30
GPrathap
87c4bbff85 removing and adding relevant images 2016-03-13 21:59:15 +05:30
GPrathap
39af0a9f57 removing and adding required images 2016-03-13 21:57:37 +05:30
GPrathap
5deac3cca1 adding claims definitions 2016-03-13 21:56:01 +05:30
GPrathap
3416a191c0 adding agent source code 2016-03-13 21:54:13 +05:30
GPrathap
5dd57a157e changing source code according to new API changes 2016-03-13 21:51:16 +05:30
GPrathap
e2ce28767e added analytics scripts 2016-03-13 21:45:29 +05:30
GPrathap
fa112b28e5 removed unnecessary module: agent 2016-03-13 21:41:57 +05:30
GPrathap
bd856c0b75 refactoring code 2016-03-13 21:28:12 +05:30
GPrathap
70fcea507d changed source code according to new API changes 2016-03-13 21:27:28 +05:30
GPrathap
4f6ab8f6f6 changed group id cdmf.devicetype into org.wso2.cdmf.devicetype 2016-03-13 21:06:27 +05:30
Menaka Madushanka
e3f8956d29 package refactoring 2016-03-12 14:44:10 +05:30
NuwanSameera
ee250d25c5 Add permissions.xml to connected-cup device type. 2016-03-11 19:16:09 +05:30
Menaka Madushanka
0ac1c73efe License headers added. 2016-03-11 11:39:06 +05:30
Menaka Madushanka
eac16a5d14 Code formatting 2016-03-11 11:31:51 +05:30
Menaka Madushanka
4cf1d77311 Added javadoc comments 2016-03-11 10:59:43 +05:30
Menaka Madushanka
ef9c3dfe70 Added comments and code restructured. 2016-03-10 20:19:37 +05:30
charithag
706002b4d5 Fix for https://wso2.org/jira/browse/IOTS-77 2016-03-10 19:25:50 +05:30
Menaka Madushanka
0ce1d75c61 Class name changed 2016-03-10 18:30:09 +05:30
Menaka Madushanka
6858fb8a85 Code cleanup and refactoring : Check alert is displayed 2016-03-10 16:31:43 +05:30
Menaka Madushanka
b930301819 Merge remote-tracking branch 'origin/master' 2016-03-10 15:06:04 +05:30
Menaka Madushanka
a1b94d5415 Code cleanup and refactoring 2016-03-10 15:05:44 +05:30
Menaka Madushanka
ead5b6e2bb Completed the sample test cases. 2016-03-10 15:04:50 +05:30
ayyoob
7a9b5547bd added feature extraction lifecycle listener 2016-03-08 23:58:54 +05:30
ayyoob
2a03111a5a merged with upstream 2016-03-08 16:08:16 +05:30
ayyoob
dd3bfd4ffb merged with upstream 2016-03-08 15:53:17 +05:30
ayyoob
03be540d99 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-08 15:52:44 +05:30
ayyoob
66971e4860 removed conflicting jars that exports same packages 2016-03-08 15:52:09 +05:30
Charitha Goonetilleke
febdc36cba Removed commented code and reformat 2016-03-08 13:44:47 +05:30
Shabirmean
d7de0f0607 Adding copy tasks for the portal app specific modifications in the bin.xml 2016-03-07 09:31:12 +05:30
Shabirmean
8206dc0f92 Added the doormanager-icon.png 2016-03-07 09:11:35 +05:30
Shabirmean
745d2369d3 Added portal app specific analytics changes and IoT-Gadget samples 2016-03-07 09:09:02 +05:30
Menaka Madushanka
adfa5762c9 Sample Enrollment and verification 2016-03-04 11:22:48 +05:30
charithag
6c7041dcda Add ESP8266 based fire alarm sample 2016-03-04 10:59:33 +05:30
charithag
f087baaa49 Bump event processing version to comply with analytics 2016-03-03 16:03:58 +05:30
charithag
4427f53044 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-03-01 15:00:42 +05:30
Menaka Madushanka
b99001ae8d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-29 18:31:37 +05:30
Menaka Madushanka
28879b416f Sample installation and verification 2016-02-29 18:31:28 +05:30
charithag
6dba086760 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-26 11:12:28 +05:30
Geesara Prathap
0a29e01356 Update README.md 2016-02-25 23:57:26 +05:30
GPrathap
4c2eeb4b2a Fix for JIRA IOTS-80 2016-02-25 23:52:21 +05:30
GPrathap
d9f48423e3 Fix for JIRA IOTS-79 2016-02-25 19:25:06 +05:30
charithag
62d795232e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-25 16:52:46 +05:30
Menaka Madushanka
890209e3de License header updated 2016-02-25 14:33:50 +05:30
Menaka Madushanka
98c222ed5e removed the unwanted build.xml file 2016-02-25 14:23:18 +05:30
Menaka Madushanka
34951b5395 Testng.xml changes 2016-02-25 14:22:02 +05:30
Menaka Madushanka
57f91949a3 Code formatting and fixes 2016-02-25 14:21:24 +05:30
Menaka Madushanka
fcd5669361 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-25 11:21:38 +05:30
Menaka Madushanka
9a0f0f2187 restart 2016-02-25 11:21:18 +05:30
GPrathap
a4695dfb2c added mqtt dependency to sample agent application 2016-02-25 08:29:15 +05:30
Ace
7b51e4f36b bumping dependencies to latest versions 2016-02-24 16:33:56 +05:30
GPrathap
953b15342f updated README.md 2016-02-24 12:17:19 +05:30
GPrathap
d59f7bc089 added deployable sample application 2016-02-24 11:34:00 +05:30
Menaka Madushanka
67cb3df652 Code formatting 2016-02-23 18:44:11 +05:30
Menaka Madushanka
7cf8fcf4ac Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-23 11:13:39 +05:30
charithag
c556a9a7b0 Geesara's changes 2016-02-17 16:35:47 +05:30
Ace
fca3016181 Bug fixes 2016-02-17 01:39:15 +05:30
Ace
bb1216c6bf logic to send event to CEP 2016-02-17 01:19:03 +05:30
Ace
8f8209db08 Adding method to check if user exists 2016-02-17 00:31:11 +05:30
charithag
ae08246052 fix issues 2016-02-16 23:07:20 +05:30
charithag
09fbbad7d7 Merge remote-tracking branch 'upstream/master' 2016-02-16 19:37:09 +05:30
GPrathap
1d698a73fd added new devicetype: doormanager 2016-02-16 19:32:21 +05:30
charithag
9e9627f37f upstream merge 2016-02-16 19:26:06 +05:30
charithag
81117d00c4 Change water dispensor category 2016-02-16 19:21:43 +05:30
NuwanSameera
cc5cf0e09e Current sensor display name changed to Samrt Meeter 2016-02-15 13:17:21 +05:30
NuwanSameera
aa6d02f25c Merge remote-tracking branch 'upstream/master' 2016-02-15 09:50:26 +05:30
NuwanSameera
335632769f Current Sensor controller changes 2016-02-15 09:49:51 +05:30
Menaka Madushanka
cb1c30ec43 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-02-14 01:48:17 +05:30
Menaka Madushanka
c7adb5530d Added comments and code cleanup 2016-02-12 10:39:25 +05:30
Menaka Madushanka
c086968e24 Added comments and code cleanup 2016-02-12 10:23:18 +05:30
charithag
fc702b96b9 Bump carbon device mgt plugins version 2016-02-11 15:33:10 +05:30
Shabirmean
8f4093b20f Removed already installed features from the "repository/components/features" folder 2016-02-10 17:32:25 +05:30
Menaka Madushanka
d9799fa3c0 License headers 2016-02-10 14:18:11 +05:30
Menaka Madushanka
0ee834fc16 License headers added 2016-02-10 14:15:39 +05:30
Menaka Madushanka
f91f4a3555 Integration tests for IOT server 2016-02-10 12:40:18 +05:30
NuwanSameera
8ca2614a08 Change Current Sensor display name to Water Dispensor 2016-02-08 17:42:40 +05:30
NuwanSameera
e64bed8b50 Add flow sensor to currentsensor device type and modify device view page 2016-02-08 16:07:32 +05:30
charithag
463fb50b8f Updated current sensor component structure 2016-02-02 21:27:23 +05:30
NuwanSameera
d9624efc80 Add current sensor device type sample 2016-02-02 16:13:46 +05:30
NuwanSameera
aff032c66d Add current sensor device type sample 2016-02-02 16:13:10 +05:30
charithag
90dcc43ed1 Updated connected cup component structure 2016-02-02 16:02:25 +05:30
charithag
74c04dc49b Merged with CDM master 2016-01-28 17:44:10 +05:30
Charitha Goonetilleke
0c2318c425 Merge pull request #83 from charithag/master 
Update coffee cup UI
 2016-01-27 15:14:21 +05:30
charithag
d0c7cddfd0 Update coffee cup UI 2016-01-27 15:13:20 +05:30
Ace
279c4a1c7a Adding fix for startup error when MB features are not yet up 2016-01-27 14:25:50 +05:30
Ace
1aef1d10c3 Bug fixes 2016-01-27 13:08:57 +05:30
Ace
f9be9a8c0e Improving connected cup UI 2016-01-27 12:09:34 +05:30
Ace
a3fd8d5134 Fixing issues with connected cup sample 2016-01-26 09:25:56 +05:30
Ruwan
347b27acf9 Merge pull request #78 from NuwanSameera/master 
Connected cup feature pom changes requested by menaka
 2016-01-26 08:42:49 +05:30
Ace
94f1b87ce3 Removing patches and upgrading DAS and MB 2016-01-25 10:47:31 +05:30
Shabirmean
fd0f149c61 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-22 18:49:44 +05:30
Shabirmean
9ef829536e Upgraded Paho-MQTT version to latest v1.0.2 2016-01-22 18:49:33 +05:30
GPrathap
7bd44f4499 removed auto generated device-deployer.xml 2016-01-22 14:40:46 +05:30
Shabirmean
390bda1b3a Fixing wrong parent-groupId in the tools module 2016-01-20 11:44:06 +05:30
GPrathap
17db3bc651 created auto generated device-deployer.xml file 2016-01-20 09:40:14 +05:30
GPrathap
84dc857811 facilitated to create a feature of given device type dynamically 2016-01-19 23:28:53 +05:30
GPrathap
a9750a2680 added a new maven archetype to generate sample structure of cdmf device type 2016-01-19 14:11:00 +05:30
NuwanSameera
ede2489b38 Connected cup feature pom changes 2016-01-19 12:45:46 +05:30
Charitha Goonetilleke
8aa804bb92 Merge pull request #76 from menaka121/master 
Connected cup start agent url generation fixed
 2016-01-18 09:50:52 +05:30
Shabirmean
7b5496d4db added the sample connected-cup project as a module into the device-deployer.xml 2016-01-14 16:56:04 +05:30
Menaka Madushanka
41bfb96fe2 Connected cup issues with url generation fixed 2016-01-14 15:59:11 +05:30
Menaka Madushanka
5770ecab2f fixed to get the server ip when starting the agent 2016-01-14 15:04:56 +05:30
Menaka Madushanka
f1a22397a3 connected cup agent added 2016-01-14 14:39:56 +05:30
Shabirmean
5f8c04243b Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2016-01-13 19:01:04 +05:30
ayyoob
3f9e279188 Merge pull request #75 from ayyoob/configConnectedCup 
few changes in connected cup to remove the dependent with the configu…
 2016-01-13 18:43:54 +05:30
ayyoob
31c745e8f2 few changes in connected cup to remove the dependent with the configuration file 2016-01-13 17:41:05 +05:30
charithag
0ce0c246da Fix minor bugs 2016-01-13 16:49:38 +05:30
charithag
a689182eac Fix minor bugs 2016-01-13 16:39:46 +05:30
Shabirmean
b769a4ac71 removed duplicate version entry 2016-01-13 16:02:05 +05:30
Ruwan
25fd183278 Merge pull request #72 from NuwanSameera/master 
connected-cup-agent modified
 2016-01-13 15:35:01 +05:30
NuwanSameera
06aecec053 connected-cup-agent modified 2016-01-13 15:34:00 +05:30
Ruwan
fe2ae62d56 Merge pull request #71 from menaka121/master 
publishedToDAS method changed
 2016-01-13 15:33:31 +05:30
Menaka Madushanka
37f22da494 publishedToDAS method changed 2016-01-13 15:30:50 +05:30
charithag
4a971476fb Fix minor bugs 2016-01-13 15:20:53 +05:30
Menaka Madushanka
1ac2dc9307 Issues fixed 2016-01-13 15:17:36 +05:30
Ruwan
54792872ef Merge pull request #69 from menaka121/master 
Issues fixed
 2016-01-13 15:17:25 +05:30
NuwanSameera
568199b507 connected cup agent added to samples 2016-01-13 14:45:28 +05:30
Shabirmean
ece55e1016 Small changes to the sample CoffeeCup sample 2016-01-13 11:35:33 +05:30
Menaka Madushanka
6179298d9f Connected cup device added 2016-01-13 11:11:55 +05:30
Menaka Madushanka
bc84be58ea Connected cup device added 2016-01-13 11:09:38 +05:30
Shabir Mohamed
10087d78c6 Revert "Updated the sample device-type "ConnectedCup"" 2016-01-12 22:46:45 +05:30
Shabirmean
5381fe3e6a Updated the sample device-type ""ConnectedCup 2016-01-12 22:32:27 +05:30
charithag
d29fce31b4 Use dependencies from P2 2016-01-12 14:11:03 +05:30
charithag
3201b2e112 Change zip archive name to wso2iots 2016-01-12 12:40:53 +05:30
charithag
d67ff8cd98 Removed IOS Mobile Plugin Management schema 2016-01-12 11:25:39 +05:30
ayyoob
2a30023d81 Merge pull request #61 from wso2-incubator/IoTS-1.0.0-M1 
added start up script
 2016-01-08 23:10:35 +05:30
ayyoob
754891e39a added start up script 2016-01-08 20:56:21 +05:30
Ace
03a05472c4 Adding andes patch 2016-01-08 12:05:42 +05:30
Ace
fad444510c Adding log fixes to spark core 2016-01-07 22:28:33 +05:30
Ace
a8ca6887f8 Adding fixes for DAS components to co-exist with MB components 2016-01-07 19:07:04 +05:30
Ace
82c0c226f9 Including mb features in pack 2016-01-06 10:51:21 +05:30
Ace
4752b12545 Integrating mb features to IotServer 2016-01-05 19:13:23 +05:30
Shabirmean
f29fa5e89e Force add the temporary jars relevant to DAS fix patches 2016-01-05 11:00:53 +05:30
Ruwan
337bdb3929 Merge pull request #59 from charithag/master 
Add device-types to configs
 2016-01-04 20:53:22 +05:30
charithag
b899f5c3a2 Add device-types to configs 2016-01-04 20:18:50 +05:30
Shabirmean
e01a7fe2d8 Moved DB Creation for Android and Windows to feature from product pom 2016-01-04 18:48:17 +05:30
Ace
94dcaa82d8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:57:43 +05:30
Ace
ddf04e867e Changing gateway ports to http/https ports 2015-12-23 11:57:13 +05:30
Shabirmean
8bdf2910f9 removed duplicated copy tasks 2015-12-23 11:51:07 +05:30
Shabirmean
078c14f746 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-23 11:00:56 +05:30
Shabirmean
fea8e23da0 Removed device-DB creation from distribution pom and moved to bin.xml copy task 2015-12-23 11:00:44 +05:30
Ace
424dd7979f Adding white listed tag to apim config 2015-12-23 03:41:58 +05:30
Shabir Mohamed
b0f70a9b1b Revert "Added mb feature" 2015-12-22 16:29:25 +05:30
Shabirmean
f8e9356504 Revert "Merge pull request #55 from sdkottegoda/embed-messaging-feature" 
This reverts commit fd09122872, reversing
changes made to e340d88608.
 2015-12-22 16:27:56 +05:30
ayyoob
fd09122872 Merge pull request #55 from sdkottegoda/embed-messaging-feature 
Added mb feature
 2015-12-22 14:34:16 +05:30
sdkottegoda
1ee42cc94e Added mb feature 2015-12-22 14:27:13 +05:30
Shabirmean
98b6cfc487 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-22 12:30:43 +05:30
Shabirmean
d37d73fe36 Copying custom sequences directory from distribution 2015-12-22 12:30:33 +05:30
Sumedha Rubasinghe
15fe50a774 including copying pom.xml 2015-12-22 11:53:16 +05:30
Sumedha Rubasinghe
d4e66e9a93 initial version of connectedcup device type 2015-12-22 08:27:05 +05:30
Shabirmean
7681a7f6be Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-21 16:44:22 +05:30
charithag
eb88f7c1c6 Fix path error 2015-12-21 13:18:59 +05:30
charithag
959d275dca Override server startup script to overcome out of memory error 2015-12-21 13:17:36 +05:30
Shabirmean
40ea51d3bf Changed the source of the device-type datasources to copy from. 2015-12-21 11:54:31 +05:30
Shabirmean
19d0d2a116 Added device-type deployer xml to the pack 2015-12-18 14:29:28 +05:30
Shabirmean
e02a31f6ee Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-18 11:13:31 +05:30
Shabirmean
dc475b3542 Adding updated keystone file with default "RA" and "CA" certs 2015-12-18 11:13:18 +05:30
Ace
35b3cf8d35 Adding additional listener to read features 2015-12-17 19:52:45 +05:30
Shabirmean
b94f3b6bfa Added featureDefs and DBCreation for RPi and Arduino 2015-12-17 12:46:04 +05:30
GPrathap
7234544212 changed datasource name 2015-12-16 12:47:50 +05:30
GPrathap
ca47bf9844 added datasource description 2015-12-16 12:35:20 +05:30
Ace
75cdffb651 Adding device cloud grant type 2015-12-15 20:13:23 +05:30
Charitha Goonetilleke
e91b80cd16 Merge pull request #43 from NuwanSameera/master 
rename digitaldisplay to digital_display
 2015-12-15 17:00:48 +05:30
NuwanSameera
727ea9d5c1 rename digitaldisplay to digital_display 2015-12-15 12:22:57 +05:30
charithag
2a37c07ffa Fix h2 script path 2015-12-15 11:23:49 +05:30
Ace
2fd99fa85d Adding fix for API Store/Publisher login 2015-12-15 11:22:22 +05:30
Shabirmean
86675ecf92 removing virtual_firealarm datasource info from master-datasources xml 2015-12-14 19:37:21 +05:30
NuwanSameera
d9fc247bf4 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-14 18:39:32 +05:30
NuwanSameera
72fef2a2cc Merge remote-tracking branch 'upstream/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-14 18:35:09 +05:30
charithag
71a19d05c4 Fix api-store loggin issue 2015-12-14 18:26:05 +05:30
Charitha Goonetilleke
1b003a65c1 Merge pull request #39 from charithag/master 
Add db create script
 2015-12-14 17:50:58 +05:30
charithag
3a16839855 Add db create script 2015-12-14 17:09:51 +05:30
Shabirmean
727e6358d1 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-14 17:03:11 +05:30
Shabirmean
631d907613 Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM 2015-12-14 17:02:14 +05:30
sajithar
a9bc546253 changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps. 2015-12-14 15:33:26 +05:30
charithag
99b123bf74 Add jaggery conf from cdmf 2015-12-14 13:54:30 +05:30
NuwanSameera
8b0d0ad8b5 digital display database configurations 2015-12-14 13:00:25 +05:30
NuwanSameera
7416404307 pom file changes 2015-12-14 12:51:59 +05:30
charithag
c32caa6067 Copy cdmf related uuf contents from devicemgt-cdmf 2015-12-14 12:25:57 +05:30
Ace
5e7bbd6cb6 Fixing api manager store/publisher login issue 2015-12-14 10:25:08 +05:30
Shabirmean
e7c7ab0e50 Adding execution to rename api store and publisher context in site.son 2015-12-12 15:01:33 +05:30
Ace
7e0d384dc9 Copying api publisher/store feature to pack 2015-12-12 12:19:52 +05:30
charithag
a9dcd8cd21 Moved analytics toCDMF coomponents 2015-12-11 22:54:17 +05:30
Menaka Madushanka
9857e2f2b4 spark script for pressure 2015-12-11 15:30:34 +05:30
Menaka Madushanka
454b24db1f spark scripts for the other sensors + build.xml edited 2015-12-11 14:47:50 +05:30
Menaka Madushanka
88a09c8cab spark scripts for the other sensors + build.xml edited 2015-12-11 14:41:04 +05:30
Menaka Madushanka
194843c91a spark scripts for the other sensors 2015-12-11 14:27:40 +05:30
charithag
de857cfc6e Fix issue in script 2015-12-11 12:12:42 +05:30
menaka
b7661d286b DB schema for android sense and script change 2015-12-11 11:15:00 +05:30
menaka
3b9fe436c3 Merge remote-tracking branch 'origin/master' 
Conflicts:
	modules/distribution/pom.xml
 2015-12-11 11:13:48 +05:30
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +05:30
menaka
75d4344f6c DB schema for android sense and script change 2015-12-11 11:02:20 +05:30
charithag
4b8662f58f Add required changes for android sense 2015-12-11 08:52:51 +05:30