Commit Graph

1279 Commits

Author SHA1 Message Date
Menaka Jayawardena
c9ab7103d8 Fixed IOTS-360 : Modifying current ui integration tests. 2017-01-06 19:31:40 +05:30
Rasika Perera
cb4b5d9732 Merge pull request #241 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-359
2017-01-06 19:27:37 +05:30
Rasika Perera
ba46ff6dd0 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 19:03:32 +05:30
geethkokila
838d1cf610 Adding the ios gateway support for the iot server 2017-01-06 17:14:00 +05:30
Milan Perera
df79fcd6fd Merge branch 'master' of https://github.com/wso2/product-iots into latest-master 2017-01-06 16:51:39 +05:30
Rasika Perera
2e220d21ec Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 14:20:57 +05:30
Menaka Jayawardena
f40159eca3 Merge remote-tracking branch 'origin/master' 2017-01-06 14:19:16 +05:30
Menaka Jayawardena
88e696b4e9 Adding custom Test Automation Extensions to start up the servers. 2017-01-06 14:18:58 +05:30
Menaka Jayawardena
284c221056 Changed the integration pom version to 3.0.1-SNAPSHOT. 2017-01-06 14:16:36 +05:30
Ace
7cfa3970ed Adding auto_server_port 2017-01-06 13:34:36 +05:30
Milan Perera
11b0db7bed Fixed version conflics 2017-01-06 13:17:25 +05:30
ayyoob
754fbe7dd3 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 22:27:32 +05:30
ayyoob
8888383e81 added deployer features 2017-01-05 22:27:27 +05:30
GPrathap
d8fdd18dde Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-05 14:39:46 +05:30
GPrathap
acb4593b9a fixed: https://wso2.org/jira/browse/IOTS-344 2017-01-05 14:19:46 +05:30
Rasika Perera
c51d630bfd Merge pull request #234 from ruwany/jira-fix
Making h2 db shareable between das and iot core
2017-01-05 12:42:21 +05:30
GPrathap
2e13e834c5 fixed: IOTS-204 2017-01-05 12:36:31 +05:30
Milan Perera
1f172a65ee Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master 2017-01-05 10:05:33 +05:30
Milan Perera
45207898c0 Configured APIMs PasswordGrantHandler in identity.xml 2017-01-05 10:05:27 +05:30
Rasika Perera
56a976a84a Merge pull request #235 from rasika/master
Fixing https://wso2.org/jira/browse/IOTS-356
2017-01-04 19:53:06 +05:30
Rasika Perera
d93d9dd0a6 Fixing https://wso2.org/jira/browse/IOTS-356 2017-01-04 19:20:16 +05:30
Ace
70c656b5d4 reverting commit related to identity version bump 2017-01-04 18:18:29 +05:30
Ace
eaea7ff37f Merging with master 2017-01-04 18:03:08 +05:30
Ace
04128c7ee3 Making h2 db shareable between das and iot core 2017-01-04 17:51:37 +05:30
charitha
15d3a124b0 Increment plugin deployer version 2017-01-04 10:14:13 +05:30
sinthuja
1c203e0f61 Merge remote-tracking branch 'origin/master' 2017-01-03 13:35:25 +05:30
sinthuja
970bb35260 Adding sso by default for analytics portal application. 2017-01-03 13:35:08 +05:30
Ruwan
172f41d8da Merge pull request #233 from rasika/master
Fixing IoTS version issue
2017-01-03 12:31:41 +05:30
Rasika Perera
6866ee8f24 Fixing IoTS version issue 2017-01-03 12:25:08 +05:30
Ace
b22bfa88e6 Bumping IS versions to latest ones 2017-01-02 16:00:01 +05:30
GPrathap
24b6d4dc0e added org.wso2.carbon.apimgt.rest.api.dcr.feature 2017-01-02 14:41:59 +05:30
GPrathap
9192f8e65c updated designer.json 2017-01-02 14:34:38 +05:30
Menaka Jayawardena
329407d318 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-02 12:24:20 +05:30
Dimuth
37789891e7 location-data-visualizer sample added to product-iots/modules/samples 2017-01-01 21:48:49 +05:30
Rasika Perera
598a41e964 Merge pull request #230 from rasika/master
Upgrading CDMF and CDMF-plugins
2016-12-25 07:55:20 +05:30
Rasika Perera
36480c3c80 Upgrading CDMF and CDMF-plugins 2016-12-25 07:54:31 +05:30
WSO2 Builder
4cd01294ff [maven-release-plugin] prepare for next development iteration 2016-12-24 20:40:57 +00:00
WSO2 Builder
990d941c75 [maven-release-plugin] prepare release v3.0.0-BETA 2016-12-24 20:34:55 +00:00
Rasika Perera
879a3b1c5b Upgrading CDMF and CDMF-plugins 2016-12-25 01:58:25 +05:30
Menaka Jayawardena
53843181f7 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-23 12:27:38 +05:30
Ace
36ec90b681 Bumping oauth dependencies 2016-12-22 15:42:17 +05:30
Ace
6fa320f8bb Updating identity/auth-saml dependencies to latest 2016-12-22 11:02:36 +05:30
Supun94
91cf3015a4 Minor refactoring on cdm-config file 2016-12-22 10:51:56 +05:30
Supun94
4e845dcc37 Changing cdm-config file 2016-12-22 10:51:56 +05:30
Rasika Perera
a3b3d92be0 Disable hostname verification for opensaml http-client 2016-12-22 08:31:14 +05:30
charitha
ea333d897e Remove carbon console UI from MB 2016-12-20 12:31:13 +05:30
charitha
05ab111437 Merge branch 'master' of https://github.com/madawas/product-iots 2016-12-19 15:39:53 +05:30
Ace
d48f4e03ea Adding iot-core specific is bundles to accomodate appm identity version upgrade 2016-12-19 15:26:43 +05:30
Ace
fefd0ab3e2 upgrading to latest version of identity 2016-12-19 11:38:18 +05:30
Rasika Perera
485015b479 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-16 12:43:15 +05:30
Rasika Perera
c2806678e6 Updating APIKeyValidator/ServerURL to pick current IP instead of "localhost" 2016-12-16 12:42:47 +05:30
Harshan Liyanage
5de373b6c2 Added OWASP configurations to IoT pack. 2016-12-16 10:56:50 +05:30
Madawa Soysa
ac5c4b0d3c Removing UI components from MB
This commit removes the ui components of the message broker module in order to bring the module in to a headless state.
2016-12-15 17:21:21 +05:30
Menaka Jayawardena
75c6eba589 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 16:39:31 +05:30
Harshan Liyanage
4ef3e703da Added Owasp config for store and publisher apps 2016-12-14 11:22:25 +05:30
Menaka Jayawardena
5431fced9c Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 10:20:32 +05:30
Rasika Perera
fc821e1cab Changing SSO login page into /devicemgt/login 2016-12-09 19:02:19 +05:30
charitha
ec2a28d097 Bump versions to next development iteration 2016-12-09 13:12:41 +05:30
WSO2 Builder
412f912ca3 [maven-release-plugin] prepare for next development iteration 2016-12-09 06:30:04 +00:00
WSO2 Builder
80bfd669d2 [maven-release-plugin] prepare release v1.0.0-ALPHA5 2016-12-09 06:27:54 +00:00
charitha
0e13ffc991 Bump versions to released component versions 2016-12-09 01:32:56 +05:30
Charitha Goonetilleke
40d7ebce0b Merge pull request #217 from madhawap/master
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:03:39 +05:30
madhawap
62f46a2cf8 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:52:46 +05:30
dunithd
042da62607 Upgrading analytics carbon.kernel.version to 4.4.10 2016-12-08 17:50:00 +05:30
madhawap
dfbecaa8c2 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:43:53 +05:30
Menaka Jayawardena
1d7021d06a Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-08 16:43:50 +05:30
Rasika Perera
e7f6c0797f Revert back changes done to sso 2016-12-08 14:59:42 +05:30
Rasika Perera
b7bc800cec Replacing application-authentication.xml from IoT 2016-12-07 14:53:28 +05:30
Menaka Jayawardena
9045b50fa8 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-07 13:20:39 +05:30
Menaka Jayawardena
934b4706d4 Modified designer.json to share query parameters in portal. 2016-12-07 13:16:49 +05:30
sinthuja
c4bb4fc544 Merge branch 'android-sense-feature' 2016-12-07 11:08:46 +05:30
Megala
20da28f48b Making the local copies of designer.json to be compatible with carbon-dashboards designer.json 2016-12-07 09:57:30 +05:30
charitha
a52f02850f Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 18:01:32 +05:30
sinthuja
75a1fb6ede Merge pull request #213 from Megala21/embed
Adding siddhi extension feature for geo dashboard
2016-12-06 17:46:24 +05:30
Megala
aeaee5222f Adding siddhi extension feature for geo dashboard 2016-12-06 17:19:25 +05:30
Chatura Dilan
79325ac52a Creating APPM datasources 2016-12-06 15:16:37 +05:30
charitha
f0bc7854cc Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 15:09:25 +05:30
charitha
b255782834 Add certificate mgt apis 2016-12-06 15:09:11 +05:30
Chatura Dilan
cd26a8daec Merge branch 'master' of github.com:wso2/product-iots 2016-12-06 13:50:38 +05:30
Chatura Dilan
9874844082 Added config to remove webapps 2016-12-06 13:48:08 +05:30
Rasika Perera
3e3bf1ce38 Fixing application-authentication.xml not replaced 2016-12-06 12:18:30 +05:30
Rasika Perera
945c581d99 Copying application-authentication.xml into pack 2016-12-06 11:59:23 +05:30
Rasika Perera
ae96430e0d Adding /devicemgt/login as authentication url when sso enabled 2016-12-06 10:59:45 +05:30
Rasika Perera
17f01a137e Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-06 10:33:25 +05:30
Rasika Perera
96d0d048df Adding APNS and GCM commented on cdm-config 2016-12-06 10:25:40 +05:30
Chatura Dilan
5cd3b6a2a8 Adding appstore module 2016-12-05 13:50:18 +05:30
GPrathap
9ec723966d Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-02 18:59:33 +05:30
GPrathap
47a9d9a767 added mb related new configurations 2016-12-02 18:58:26 +05:30
Rasika Perera
fe8beb5eb2 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-02 08:56:28 +05:30
charitha
6fb07cfe40 Bump versions to next development 2016-12-01 20:43:00 +05:30
WSO2 Builder
58a2eafffb [maven-release-plugin] prepare for next development iteration 2016-12-01 14:58:06 +00:00
WSO2 Builder
72e39a9603 [maven-release-plugin] prepare release v1.0.0-ALPHA4 2016-12-01 14:55:56 +00:00
charitha
5398c691a7 Bump versions to released component versions 2016-12-01 20:16:40 +05:30
Rasika Perera
346a50fc64 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-01 17:05:41 +05:30
Rasika Perera
ebe22410c4 Adding missing certificate management web apps features 2016-12-01 16:45:42 +05:30
Megala
090da79419 Removing roles and commented lines 2016-12-01 15:45:58 +05:30
Megala
ccd6184c9a Adding fixes for sso and making sso by default for all the jaggery apps 2016-12-01 14:22:22 +05:30
Charitha Goonetilleke
913d974cdf Merge pull request #204 from hasuniea/IoTS-1.0.0
adding windows feature to plugins-deployer.xml
2016-11-30 11:45:07 +05:30
sinthuja
ccb7d837b8 adding the iot geo fencing dashboard. 2016-11-28 01:35:37 +05:30
charitha
50c456b04f Bump versions to next development 2016-11-25 16:31:25 +05:30
WSO2 Builder
5e2b243ee3 [maven-release-plugin] prepare for next development iteration 2016-11-25 10:41:48 +00:00
WSO2 Builder
9828edda94 [maven-release-plugin] prepare release 1.0.0-ALPHA3 2016-11-25 10:39:21 +00:00
charitha
7908154d40 Bump versions to released component versions 2016-11-25 15:47:29 +05:30
Hasunie
3f569d4691 adding windows feature to plugins-deployer.xml 2016-11-24 09:19:50 +05:30
ayyoob
119aff7fc4 Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-21 19:24:05 +05:30
ayyoob
f3f082568f removed feature listener 2016-11-21 19:23:55 +05:30
ayyoob
f132818459 renamed default idp name 2016-11-21 19:14:48 +05:30
sinthuja
0b86f76362 Adding some fixes for android analytics. 2016-11-21 17:15:38 +05:30
ayyoob
8083f0350b removed unused components 2016-11-20 02:38:05 +05:30
ayyoob
caf65dcfb7 removed matt-gateway-profile generation 2016-11-17 23:33:46 +05:30
ayyoob
c01ca30a79 Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-17 20:23:04 +05:30
ayyoob
857b4360dd Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-17 20:19:46 +05:30
ayyoob
7373de0a7a removed features tmp directory 2016-11-17 20:18:47 +05:30
sinthuja
62280f4e1a Removing the integration tests from core module to main module. 2016-11-17 12:17:11 +05:30
charitha
2c2f7ccd25 Bump versions to next development 2016-11-16 21:27:53 +05:30
WSO2 Builder
686d3be678 [maven-release-plugin] prepare for next development iteration 2016-11-16 15:34:29 +00:00
WSO2 Builder
80aaefe75f [maven-release-plugin] prepare release v1.0.0-ALPHA2 2016-11-16 15:32:27 +00:00
charitha
3ff3207ac1 Set broker version to be same as the core version 2016-11-16 20:41:22 +05:30
charitha
93ecdd3428 Update cdmf plugins version 2016-11-16 20:23:48 +05:30
Ace
4d44095714 Renaming samples to plugins 2016-11-16 17:44:35 +05:30
sinthuja
44af7334cf Removing the samples directory from the core distribution. 2016-11-16 16:31:07 +05:30
sinthuja
6a5ac2be1f Removing mqtt profile from core distribution, and adding the version to pack. 2016-11-16 16:24:28 +05:30
sinthuja
658cc1a157 Updating the module names according to the convention. 2016-11-16 15:48:49 +05:30
sinthuja
41bc7b038c Removing some unnecessary sources from the broker module. 2016-11-16 15:45:22 +05:30
sinthuja
6d1c377ab2 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-16 14:46:48 +05:30
sinthuja
e6d6c5f178 Removing some unnecessary sources from the analytics module. 2016-11-16 14:45:58 +05:30
charitha
669ab894f9 Update component versions for IoTS-1.0.0 release 2016-11-16 13:33:26 +05:30
sinthuja
4e29b177f0 Merge branch 'iot-product-restructure' into IoTS-1.0.0-fresh2
# Conflicts:
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationDataHolder.java
#	modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationServiceComponent.java
#	modules/core/iot-extensions/components/mb-extensions/pom.xml
#	modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/build.properties
#	modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/p2.inf
#	modules/core/iot-extensions/features/mb-extensions-feature/pom.xml
#	modules/distribution/src/samples-deployer.xml
#	pom.xml
2016-11-10 22:00:42 +05:30
sinthuja
617699693e Changing the JVM startup order, and adding trap for stoping the servers. 2016-11-10 21:48:36 +05:30
sinthuja
3349db1757 Changing the JVM startup order 2016-11-10 21:37:34 +05:30
sinthuja
15a4f4dd4f Fixing some issues in the broker distribution, and the analytics distribution. 2016-11-10 21:21:48 +05:30
sinthuja
2992d9e098 adding samples to the root location. 2016-11-09 17:55:24 +05:30
sinthuja
5ca98782fd Fixing issues in the sample integration. 2016-11-09 16:40:14 +05:30
sinthuja
3bf2f21711 Adding back the device-analytics-config.xml, and modifying log4j configs. 2016-11-09 14:19:17 +05:30
sinthuja
227779c2ad adding broker distribution and some logging configuration changes. 2016-11-09 12:44:21 +05:30
GPrathap
0ce49684fc init commit: adding wso2 mb as wso2iot- broker 2016-11-09 09:45:35 +05:30
ayyoob
8de788097a Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-08 23:43:26 +05:30
ayyoob
21bf103e6e added android feature 2016-11-08 23:41:27 +05:30
sinthuja
da7929c5a3 some more fixes to the startup script. 2016-11-08 20:57:12 +05:30
sinthuja
37b2cb01ff Adding bin scripts. 2016-11-08 20:38:27 +05:30
GPrathap
401ad2846c removing mb mqtt authorization extension. This has been moved to https://github.com/wso2/carbon-device-mgt-plugins/pull/403 2016-11-08 16:19:45 +05:30
sinthuja
e0b29d4f08 Moving geo dashboard related files to src/repo/resources. 2016-11-08 13:04:40 +05:30
sinthuja
5fb6db5c7a Renaming the analytics modules to follow the naming structure. 2016-11-08 12:55:40 +05:30
sinthuja
9704c0b51f Adding empty distribution module. 2016-11-08 12:50:07 +05:30
sinthuja
21ab784b44 removing the distro 2016-11-08 12:48:23 +05:30
sinthuja
f551b4447a Removing the distribution dir. 2016-11-08 12:39:12 +05:30
sinthuja
81030f5d22 Removing old modules, and creating empty skeleton for broker and distro. 2016-11-08 12:33:24 +05:30
sinthuja
0e959da763 First cut of iot-pack restructuring. 2016-11-08 12:27:59 +05:30
ayyoob
4a4412b927 disabled mobile feature installation 2016-11-07 00:52:06 +05:30
Ace
2e15f2767d merging with upstream 2016-11-04 20:09:28 +05:30
Ace
c9c717af1c removing common/base modules & refactoring 2016-11-04 18:57:19 +05:30
GPrathap
ffa6a9cf59 removing mb features and related configurations 2016-11-02 15:43:53 +05:30
GPrathap
56ec6b1e96 removing cdmf devicetype archetype. This has been moved to https://github.com/wso2/carbon-device-mgt-maven-plugin 2016-11-02 15:42:37 +05:30
charitha
7562734282 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0 2016-11-02 13:45:56 +05:30
sinthuja
b86694cc93 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0-fresh 2016-11-02 13:16:36 +05:30
charitha
be5d946794 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
# Conflicts:
#	modules/distribution/src/samples-deployer.xml
2016-11-02 13:08:04 +05:30
sinthuja
7424caa74f Merge branch 'removeMBReferences' of https://github.com/hastef88/product-iots into IoTS-1.0.0-fresh 2016-11-02 12:56:27 +05:30
Susinda Perera
8a59ae4f68 Merge pull request #195 from susinda/master
Adding certMgt to dbscripts folder
2016-11-02 12:46:30 +05:30
sinthuja
6454c5b0df Removing DAS 2016-11-02 11:09:14 +05:30
ayyoob
59207f9980 merged with origin IoTS-1.0.0 2016-11-02 09:44:30 +05:30
kamidu
89b8a45e2e adding new released version of carbon-kernal, device-mgt and device-mgt-plugins 2016-11-01 14:43:18 +05:30
Hasitha Amal De Silva
1fe9a80102 removing MB references from IOTserver pack 2016-11-01 00:31:16 -04:00
sinthuja
3156fd01ea Adding the analytics-scripts and themes template. 2016-10-26 17:00:50 +05:30
sinthuja
87109d5b87 Adding analytics files. 2016-10-26 15:10:49 +05:30
ayyoob
647262b652 added filter properties and escape string for resource plugin 2016-10-24 02:18:19 +05:30
ayyoob
b559f0cf3a removed tmp files 2016-10-23 20:45:30 +05:30
ayyoob
7844cba270 moved samples to src to support filter properties 2016-10-23 20:35:50 +05:30
ayyoob
a4b8e81a56 removed plugin and added the deployer file for connected cup 2016-10-23 20:28:15 +05:30
ayyoob
81efa0e2c7 updated plugins version 2016-10-23 14:18:03 +05:30
ayyoob
45348c2a0a added deployer features to p2 profile 2016-10-23 01:24:07 +05:30
susinda
12c12067c7 Merge remote-tracking branch 'upstream/master' 2016-10-21 12:41:46 +05:30
ayyoob
a6dac9a19e resolved default api invocation issue 2016-10-10 20:47:56 +05:30
ayyoob
2b31921bd5 added configurations 2016-10-09 19:11:00 +05:30
ayyoob
b2d20b93e1 few changes after apimgt version upgrade 2016-10-09 03:16:28 +05:30
susinda
425d420773 Adding certMgt to dbscripts folder 2016-10-04 17:41:57 +05:30
Rasika Perera
d246557763 Upgrading CDMF and CDMF plugins versions 2016-10-03 08:40:11 +05:30
Rasika Perera
2825269e4b Merge branch 'master' of https://github.com/rasika/product-iots 2016-09-29 16:17:58 +05:30
Rasika Perera
b8aacdcf40 Merge pull request #1 from warunalakshitha/master
Upgrade to carbon 4.4.9
2016-09-29 11:24:40 +05:30
warunalakshitha
6ef4bb4a9b Remove org.wso2.carbon.event.server featre from p2 since feature has been removed from carbon commons 2016-09-29 01:18:10 +05:30
warunalakshitha
eaf8da4548 Upgrade iot product features to latest identity and carbon version 2016-09-29 01:13:40 +05:30
warunalakshitha
b24ec4e36a Upgrade to carbon 4.4.9 2016-09-29 01:02:43 +05:30
warunalakshitha
af5c886907 Add akka reference file and registry-event-broker.xml 2016-09-29 01:01:55 +05:30
warunalakshitha
587c792b91 Fix hostname verfication issue 2016-09-29 01:00:49 +05:30
warunalakshitha
f1777e67ea Move carbon kernal version to 4.4.9 2016-09-29 00:59:09 +05:30
warunalakshitha
9a3fcccf63 Update api-manager.xml to 6.0.5 version 2016-09-29 00:58:05 +05:30
warunalakshitha
82a352242c Update api manager db scripts to 6.0.5 version 2016-09-29 00:57:29 +05:30
Rasika Perera
d47864db8a Fixing invalid invoker util URLs 2016-09-27 21:46:59 +05:30
Rasika Perera
9329e14bc1 Fixing invalid invoker util URLs 2016-09-27 21:42:26 +05:30
Rasika Perera
3b3bf6b854 Updating CDMF-plugins version for samples 2016-09-27 21:05:52 +05:30
Rasika Perera
70b1f9374c Fixing incorrect device object returned from JS to Hbs templates 2016-09-27 20:45:13 +05:30
Rasika Perera
eb3c68d895 Adding certificate management schema generation 2016-09-22 16:50:29 +05:30
Rasika Perera
d01f58186d Copying product specific cdm-config.xml for enabling custom PushNotificationProviders such as XMPP, MQTT 2016-09-21 00:59:55 +05:30
Rasika Perera
bb29f61dbe Removed GCM notification adapter feature 2016-09-21 00:59:55 +05:30
Rasika Perera
75a34b3b20 Updating samples cdmf and cdmf plugins versions into snapshots 2016-09-21 00:59:55 +05:30
Rasika Perera
3ccb57747d Updating samples version 2016-09-21 00:59:55 +05:30
Rasika Perera
cf56008672 Updating cdmf and cdmf-plugins versions in samples 2016-09-21 00:59:55 +05:30
Rasika Perera
a922fb5a0c Adding changes to the devicemgt app copy 2016-09-13 17:55:40 +05:30
ayyoob
70483aacde merged with upstream 2016-07-28 17:03:08 +05:30
ayyoob
dca55c7385 fixed formatting issues and removed storing error message 2016-07-28 15:40:55 +05:30
ayyoob
c9736707ca fixed the formatting issues. 2016-07-28 15:37:16 +05:30
ayyoob
1033dfd40e added missng log trace 2016-07-28 15:22:07 +05:30
ayyoob
f072fb260a Changed to commons logging 2016-07-28 14:43:24 +05:30
ayyoob
5991eeec58 added missing log 2016-07-28 14:32:30 +05:30
ayyoob
9c82589af2 fixed formatting issues 2016-07-28 14:28:28 +05:30
Milan Perera
aeef79b47e Merge pull request #180 from ayyoob/das-ext
few changes in real time analytics
2016-07-28 14:13:50 +05:30
ayyoob
971fd80b83 few changes in real time analytics 2016-07-27 14:45:55 +05:30
Ace
1bbaf13b5c Updating sample webapp name 2016-07-26 11:24:22 +05:30
charitha
0a61e29641 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/70 2016-07-23 11:33:23 +05:30
charitha
66470f145b Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/118 2016-07-23 11:14:59 +05:30
charitha
f071ce0d84 Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/83 2016-07-23 10:51:14 +05:30
charitha
1b42f08a01 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:50:11 +05:30
charitha
35a47f81b0 Fix issues in PR https://github.com/wso2/product-iots/pull/151 2016-07-21 17:43:49 +05:30
charitha
258d059ddb Merge branch 'master' of https://github.com/wso2/product-iots 2016-07-21 10:47:47 +05:30
charitha
3ed272f22e Remove wso2 license text from 3rd party libraries 2016-07-21 10:47:15 +05:30
charitha
c9d51df3cb Fix issues in PR https://github.com/wso2/product-iots/pull/172 2016-07-21 10:44:57 +05:30
Ace
288a523c23 Updating IoTS device.mgt versions 2016-07-13 14:42:59 +05:30
charitha
c1bb8a0c6d Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-30 10:36:39 +05:30
charitha
959792a09d Update agent code and analytics scripts. Fixed bugs 2016-06-30 10:36:22 +05:30
GPrathap
140e1c7571 adding carbon app 2016-06-30 00:18:54 +05:30
charitha
e642939b6c Merge branch 'master' of https://github.com/wso2/product-iots 2016-06-29 20:23:43 +05:30
charitha
3f533e2288 Update agent code and analytics scripts. Fixed bugs 2016-06-29 20:23:18 +05:30
GPrathap
db60cb9690 adding real-time analytics view 2016-06-29 19:48:21 +05:30
GPrathap
e44b6ca710 adding real-time analytics view 2016-06-29 19:47:17 +05:30
charitha
8478f1ebf0 Update agent code and analytics scripts. Fixed bugs 2016-06-29 11:45:53 +05:30
Ruwan
f5bb1b5a78 Merge pull request #173 from sahan-kariyawasam/master
Adding ui functionality for doormanager application
2016-06-27 17:39:26 +05:30
Ruwan
cb39eb665c Merge pull request #170 from GPrathap/master
adding new device type: geolocationTracker
2016-06-27 17:39:18 +05:30
Sahan Kariyawasam
67a7271299 Adding ui functionality for doormanager application 2016-06-27 17:15:58 +05:30
charitha
d5a56c4620 Add Smart Water Tank device type 2016-06-27 09:55:37 +05:30
Ruwan
44a0a61a85 Merge pull request #171 from ayyoob/das-ext
few changes added after testing with the cluster
2016-06-27 05:51:56 +05:30
ayyoob
2df0515585 few changes added after testing with the cluster 2016-06-27 00:13:34 +05:30
GPrathap
fab8e8f738 adding new device type: geolocationTracker 2016-06-26 18:23:42 +05:30
GPrathap
1f06c08f0d adding new device type: door manager 2016-06-22 18:54:20 +05:30
GPrathap
6193a0421a removing older sample: doormanager 2016-06-22 18:43:11 +05:30
Ruwan
62a602848f Merge pull request #168 from ayyoob/das-ext
Added device scope based authorisation for mqtt
2016-06-20 05:48:45 +05:30
ayyoob
97bf77f16c removed xmpp and mqtt properties 2016-06-20 02:58:46 +05:30
ayyoob
1dd689e8d4 Added device scope based authorisation for mqtt 2016-06-20 02:35:26 +05:30
Ruwan
3af6b875f1 Merge pull request #167 from ayyoob/das-ext
added a configuration ui to connected cup
2016-06-17 18:09:44 +05:30
ayyoob
599ad73a72 added a configuration ui to connected cup 2016-06-17 17:22:04 +05:30
Ruwan
6e2838bdbf Merge pull request #166 from GPrathap/master
code refactoring
2016-06-13 09:42:07 +05:30
GPrathap
4a7beac606 code refactoring 2016-06-12 21:05:17 +05:30
ayyoob
521f3b478a add removed libthrift 0.8 2016-06-10 15:35:09 +05:30
Ruwan
d712d07c80 Merge pull request #164 from sahan-kariyawasam/master
Embedded gadget dashboard page in connectedcup analytics page
2016-06-09 13:30:47 +05:30
Ruwan
94cafd0346 Merge pull request #163 from sidias/master
Error Handling
2016-06-09 13:30:40 +05:30
Ruwan
67d0b9ab72 Merge pull request #162 from sidias/patch-1
UI issues fixed
2016-06-09 13:30:31 +05:30
Sahan Kariyawasam
b6cc3147fe Embedded gadget dashboard page in connectedcup analytics page 2016-06-09 13:12:33 +05:30
buddhi nipun mihara
5df1d474ea Update type-view.hbs 2016-06-09 13:07:11 +05:30
GPrathap
93a9f90277 overriding default designer.json which is coming from portal app 2016-06-09 13:05:35 +05:30
buddhi nipun mihara
7407298ca4 Update PushSystemUsage.java 2016-06-09 13:03:48 +05:30
buddhi nipun mihara
52712e1b2e Update JavaApp.java 2016-06-09 13:00:27 +05:30
Ruwan
580421048d Merge pull request #159 from sidias/master
Mac OS X script update
2016-06-09 06:01:44 +05:30
Ruwan
14a6cf46b3 Merge pull request #160 from ayyoob/das-ext
Added profiles
2016-06-08 23:00:14 +05:30
ayyoob
5933702725 added http-gateway, mqtt-gateway, devicetype-publisher, devicetype-worker and device-key-manager profiles 2016-06-08 22:36:53 +05:30
buddhinipun
a45bbf67b5 add fix for bashrunner 2016-06-08 18:40:01 +05:30
buddhinipun
9d0af60be7 bug fix for summary table name 2016-06-08 18:17:10 +05:30
buddhinipun
c68df4d3a2 adding ui changes 2016-06-08 18:06:06 +05:30
buddhinipun
c092542b8e changes to mac device 2016-06-08 17:46:19 +05:30
buddhinipun
e02f9bf4a5 adding macosx device agent implementation 2016-06-08 16:43:56 +05:30
Ruwan
0ebfe2b8c0 Merge pull request #158 from sidias/master
resolving pom issues
2016-06-08 12:25:24 +05:30
buddhinipun
c1f3a670b5 resolving pom issues 2016-06-08 12:21:32 +05:30
GPrathap
d1a404da6d fixing IOTS-201 2016-06-08 09:27:53 +05:30
buddhinipun
e22089ef59 adding connectedlap device sample 2016-06-07 20:14:52 +05:30
ayyoob
af5d6250fc merge with upstream 2016-06-07 14:34:32 +05:30
ayyoob
47e6331c93 removed device type features and added mqtt profile 2016-06-07 14:28:07 +05:30
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