Commit Graph

866 Commits

Author SHA1 Message Date
GPrathap
4003af39e8 removing obsolete code 2016-06-06 21:28:51 +05:30
GPrathap
ab201d0aa4 changed year in license header 2016-06-06 21:27:41 +05:30
GPrathap
fda1d4ddf7 adding plugin implementation 2016-06-06 21:19:50 +05:30
GPrathap
fdedb70f80 adding analytics scripts 2016-06-06 21:18:00 +05:30
mharindu
f8e3e9f87c Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-06-06 09:11:36 +05:30
GPrathap
25844c8c60 adding new device type: drone analyzer 2016-06-06 06:31:04 +05:30
GPrathap
5da3c09a18 removing droneanalyzer old sample 2016-06-06 06:00:19 +05:30
Ruwan
703a563527 Merge pull request #151 from charithag/master
Update firealarm to comply with latest modifications
2016-06-02 10:53:07 +05:30
GPrathap
6490c010f8 added analytics cdmf feature 2016-06-02 10:34:43 +05:30
charitha
5a463e4194 Fix bugs in generated firealarm plugin 2016-06-02 10:25:43 +05:30
charitha
6d530d684e Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-02 09:04:27 +05:30
charitha
80ff8613b2 Update firealarm to comply with latest modifications 2016-06-01 15:07:39 +05:30
GPrathap
39dcaa1460 added analytics dashboard feature 2016-06-01 12:16:54 +05:30
mharindu
11c3c783c2 Added new sequences to APIM 2016-05-30 11:51:34 +05:30
ayyoob
8568a704ea fixed https://wso2.org/jira/browse/IOTS-184 2016-05-26 12:51:15 +05:30
ayyoob
9289e9840b removed UI Publisher 2016-05-24 19:27:16 +05:30
ayyoob
97ac29c7ba Merge branch 'release-1.0.0-alpha' of https://github.com/wso2/product-iots into das-ext 2016-05-23 13:02:47 +05:30
mharindu
350beff9a0 [maven-release-plugin] prepare for next development iteration 2016-05-20 22:56:51 +05:30
mharindu
45a1e52aea [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 22:56:41 +05:30
mharindu
fe5c6926df Removed clean plugin 2016-05-20 22:49:04 +05:30
mharindu
c8cd3be0fd [maven-release-plugin] rollback the release of v1.0.0-alpha 2016-05-20 22:44:38 +05:30
mharindu
7e998d13ca [maven-release-plugin] prepare for next development iteration 2016-05-20 22:34:57 +05:30
mharindu
ec1170afc6 [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 22:34:47 +05:30
mharindu
f79d45f432 Removed group id from cdmf-devicetype 2016-05-20 22:03:34 +05:30
mharindu
6c13f3b51f [maven-release-plugin] rollback the release of v1.0.0-alpha 2016-05-20 22:00:44 +05:30
mharindu
aea3f2594a [maven-release-plugin] prepare for next development iteration 2016-05-20 21:10:34 +05:30
mharindu
181ac25ba8 [maven-release-plugin] prepare release v1.0.0-alpha 2016-05-20 21:09:36 +05:30
mharindu
8707d41603 Fixed pom errors 2016-05-20 20:57:40 +05:30
mharindu
2fce3a94ea Removed unnecessary comments 2016-05-20 20:46:02 +05:30
mharindu
2392badf70 Added license text 2016-05-20 20:23:51 +05:30
mharindu
f32792788b Updated README, release-notes 2016-05-20 18:53:52 +05:30
mharindu
073b9da935 Upgraded versions 2016-05-20 18:07:59 +05:30
ayyoob
8c14d86eb0 removed identity dbscripts 2016-05-19 18:38:55 +05:30
ayyoob
57fd20291b resolving coffeecup issues 2016-05-19 03:50:30 +05:30
mharindu
870009915f Removed api-publisher 2016-05-19 01:14:58 +05:30
mharindu
401a07540e Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-05-19 00:56:41 +05:30
sumedharubasinghe
e50ee7edad Merge pull request #141 from ayyoob/das-ext
removing mdm archtype
2016-05-19 00:40:47 +05:30
prabathabey
cba9d8baaa Adding virtual-fire-alarm-config.xml 2016-05-19 00:22:45 +05:30
ayyoob
99c693bcae few fixes after testing 2016-05-18 19:34:07 +05:30
GPrathap
8e71da6c15 appended tenant domain to username 2016-05-18 10:17:21 +05:30
GPrathap
c2d1879483 fix typo 2016-05-17 22:51:51 +05:30
GPrathap
3b819cab1d add mssql and oracle db scripts 2016-05-17 22:50:17 +05:30
GPrathap
2b68b48f4c removed copy link section from UI 2016-05-17 22:49:26 +05:30
ayyoob
9e8181c226 removing mdm archtype 2016-05-17 21:15:48 +05:30
ayyoob
0a2860d0d4 cleaning datasources 2016-05-17 21:14:53 +05:30
GPrathap
2a59c23a55 added touch points to unconfigure installed device plugin 2016-05-17 19:04:46 +05:30
GPrathap
8a013279a4 merged controller and manager apis 2016-05-17 18:55:45 +05:30
GPrathap
7ab6046d31 did some UI changes 2016-05-17 18:52:52 +05:30
GPrathap
f92f3f9692 added mqtt configuration and mqtt output adapter listener 2016-05-17 18:47:43 +05:30
GPrathap
470778fb48 added mqtt event receiver and updated existing analytics scripts 2016-05-17 18:45:01 +05:30
GPrathap
e8e648ce76 renamed table name and graph axes labels 2016-05-17 18:42:27 +05:30
GPrathap
3e561a6ccf updated event stream payload 2016-05-17 18:39:13 +05:30
GPrathap
92378287af updated event stream payload 2016-05-17 18:37:16 +05:30
GPrathap
1ee6231b75 added output event adapter dependencies 2016-05-17 18:31:10 +05:30
GPrathap
cb37583a3c added some file filers to process selected *.js and *.car file types 2016-05-17 18:28:31 +05:30
mharindu
bc72c16647 Merge branch 'master' of https://github.com/wso2/product-iots into apim 2016-05-17 12:25:41 +05:30
mharindu
46c054d567 Removed analytics from APIM fault sequence 2016-05-17 09:01:23 +05:30
Ruwan
b7040ca5c2 Merge pull request #118 from charithag/master
Update analytics and configs in connectedcup
2016-05-16 16:24:52 +05:30
charitha
c320148a10 Update analytics and configs in connectedcup 2016-05-16 16:18:19 +05:30
mharindu
b69a539aee Added new logs 2016-05-16 14:16:24 +05:30
mharindu
9307bf1f0b Fixed conflicts 2016-05-16 12:09:08 +05:30
mharindu
d239a5efb7 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-16 12:08:16 +05:30
mharindu
d2e914e275 Added new configuration for the webapp publisher and scope validator 2016-05-16 12:07:57 +05:30
ayyoob
b6882f8fbe fixed https://wso2.org/jira/browse/IOTS-153 2016-05-15 21:29:07 +05:30
ayyoob
a92eb8bd34 refactored connected cup apis 2016-05-15 17:46:30 +05:30
Ace
19775a7c99 Adding comments to config file 2016-05-15 01:35:08 +05:30
Ace
01ab2a5ce4 Adding device type deployment location property 2016-05-15 01:18:13 +05:30
ayyoob
d2f223da90 few fixes after testing the device type with the refactoring 2016-05-14 20:43:27 +05:30
ayyoob
d19da2357b added missing license headers 2016-05-14 11:29:17 +05:30
ayyoob
0b893ad64c refactored connected cup analytics scripts 2016-05-14 11:11:50 +05:30
ayyoob
d0183deb2a few changes in event recievers and remove type and method from feature 2016-05-13 02:54:21 +05:30
mharindu
5a3bdb599f Added new log4j.properties 2016-05-12 23:00:33 +05:30
mharindu
b777fa9764 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-12 22:05:07 +05:30
mharindu
566c5e5fb5 fixed issues in API publishing 2016-05-12 22:02:47 +05:30
ayyoob
e5d5afa9a0 added remote app manager config 2016-05-12 19:18:20 +05:30
ayyoob
a5be8acd45 Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-05-12 13:45:39 +05:30
ayyoob
14ead035d7 few changed mqtt authoriser 2016-05-12 13:39:44 +05:30
ayyoob
787178ddff added mqtt and xmpp.properties 2016-05-12 02:43:10 +05:30
prabathabey
cacd5bf5ae Adding APILifeCycle.xml 2016-05-11 16:56:40 +05:30
prabathabey
18c3f1dfd5 Removing api-mgt startup publisher feature and other redundant feature definitions 2016-05-10 22:44:49 +05:30
prabathabey
ab32e91501 Removing try-it and Siddhi try-it features 2016-05-10 22:42:17 +05:30
prabathabey
1e3454dc46 Removing jaggery-test dependency 2016-05-10 22:29:28 +05:30
prabathabey
125e398dab Removing all mobile related dependencies 2016-05-10 22:21:56 +05:30
prabathabey
9548b88dad Removing app-mgt dependencies 2016-05-10 22:12:25 +05:30
prabathabey
a98849b20f Removing API-mgt publisher feature 2016-05-10 21:30:15 +05:30
ayyoob
8bc2b482fe update on log4j.properties 2016-05-09 01:06:09 +05:30
ayyoob
44662c625b create mb extension for authorisation 2016-05-09 01:05:55 +05:30
ayyoob
02851637b3 removed das input adapters 2016-05-08 02:50:40 +05:30
GPrathap
ee304f1724 added SAML2 Web SSO federated authenticator 2016-05-06 21:01:20 +05:30
GPrathap
384c1f35b3 removed unused code 2016-05-05 22:24:16 +05:30
GPrathap
b40e5b4bb1 corrected subscribe topic format 2016-05-05 22:23:26 +05:30
ayyoob
046e646e8f Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-05-04 05:00:19 +05:30
ayyoob
652545b49a added release note 2016-05-04 04:45:50 +05:30
GPrathap
5f38afa77c change group id 2016-05-04 04:12:44 +05:30
sumedharubasinghe
71b13f0dcc Merge pull request #129 from GPrathap/master
refactoring cdmf-device type-archetype
2016-05-04 03:38:05 +05:30
GPrathap
fb0e089518 refactoring cdmf-device type-archetype 2016-05-04 03:18:47 +05:30
sumedharubasinghe
9fb543ff6d Merge pull request #128 from ayyoob/das-ext
Added few changes after testing
2016-05-04 03:17:12 +05:30
ayyoob
a43048679d added device-analytics-config 2016-05-04 03:01:27 +05:30
ayyoob
740afcac2a few changes after testing 2016-05-04 01:13:54 +05:30
Rasika Perera
a6e1cda740 Merge branch 'master' of https://github.com/wso2/product-iots 2016-05-04 00:52:08 +05:30
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