Commit Graph

1133 Commits

Author SHA1 Message Date
Rasika Perera
a6e5ab4531 Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kernel.version] 2017-01-07 08:23:29 +05:30
Rasika Perera
e04be13e52 Merge branch 'master' of https://github.com/wso2/product-iots 2017-01-06 20:30:53 +05:30
Rasika Perera
414044177d Merge pull request #242 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-360 : Modifying current UI integration tests.
2017-01-06 19:37:15 +05:30
Rasika Perera
452950c7e5 Merge pull request #240 from geethkokila/master
Adding the ios gateway support for the iot server
2017-01-06 19:35:04 +05:30
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