From b03b9589795cae3042d5e99733bcce4569456f59 Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 2 Feb 2017 03:17:40 +0530 Subject: [PATCH 1/2] changes adapter configs after testing --- modules/analytics/distribution/input-adapter-change.xml | 8 ++++++-- modules/analytics/distribution/output-adapter-change.xml | 2 +- modules/core/distribution/input-adapter-change.xml | 8 ++++++-- modules/core/distribution/output-adapter-change.xml | 2 +- .../connected_cup_receiver/connected_cup_receiver.xml | 4 +--- pom.xml | 4 ++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/modules/analytics/distribution/input-adapter-change.xml b/modules/analytics/distribution/input-adapter-change.xml index 854702e0..777004fa 100644 --- a/modules/analytics/distribution/input-adapter-change.xml +++ b/modules/analytics/distribution/input-adapter-change.xml @@ -9,9 +9,12 @@ 10000 2 100 - https://${iot.keymanager.host}:${iot.keymanager.https.port} + https://${iot.keymanager.host}:${iot.keymanager.https.port} admin admin + https://${iot.gateway.host}:${iot.gateway.https.port}/token + https://${iot.gateway.host}:${iot.gateway.https.port} + 100 @@ -22,8 +25,9 @@ 10000 60 https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register - https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin ]]> \ No newline at end of file diff --git a/modules/analytics/distribution/output-adapter-change.xml b/modules/analytics/distribution/output-adapter-change.xml index 9f4a0aa4..e5f571a5 100644 --- a/modules/analytics/distribution/output-adapter-change.xml +++ b/modules/analytics/distribution/output-adapter-change.xml @@ -22,7 +22,7 @@ 10000 org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator - https://${iot.keymanager.host}:${iot.keymanager.https.port} + https://${iot.keymanager.host}:${iot.keymanager.https.port} 2 100 org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer diff --git a/modules/core/distribution/input-adapter-change.xml b/modules/core/distribution/input-adapter-change.xml index 854702e0..777004fa 100644 --- a/modules/core/distribution/input-adapter-change.xml +++ b/modules/core/distribution/input-adapter-change.xml @@ -9,9 +9,12 @@ 10000 2 100 - https://${iot.keymanager.host}:${iot.keymanager.https.port} + https://${iot.keymanager.host}:${iot.keymanager.https.port} admin admin + https://${iot.gateway.host}:${iot.gateway.https.port}/token + https://${iot.gateway.host}:${iot.gateway.https.port} + 100 @@ -22,8 +25,9 @@ 10000 60 https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register - https://${iot.gateway.host}:${iot.gateway.https.port}/token tcp://${mqtt.broker.host}:${mqtt.broker.port} + admin + admin ]]> \ No newline at end of file diff --git a/modules/core/distribution/output-adapter-change.xml b/modules/core/distribution/output-adapter-change.xml index 9f4a0aa4..e5f571a5 100644 --- a/modules/core/distribution/output-adapter-change.xml +++ b/modules/core/distribution/output-adapter-change.xml @@ -22,7 +22,7 @@ 10000 org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator - https://${iot.keymanager.host}:${iot.keymanager.https.port} + https://${iot.keymanager.host}:${iot.keymanager.https.port} 2 100 org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml index e63f6973..0bf476f5 100644 --- a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml +++ b/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml @@ -20,9 +20,7 @@ carbon.super/connectedcup/# - admin - admin - org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTContentValidator + iot-mqtt default true diff --git a/pom.xml b/pom.xml index e36f1e67..a42bb586 100644 --- a/pom.xml +++ b/pom.xml @@ -1529,14 +1529,14 @@ 4.7.0 - 2.0.12-SNAPSHOT + 2.0.14-SNAPSHOT [2.0.0, 3.0.0) 3.1.0-SNAPSHOT - 3.0.9-SNAPSHOT + 3.0.11-SNAPSHOT 6.1.64 From fe81bb75ca89baa455d6294712258fe45180329b Mon Sep 17 00:00:00 2001 From: ayyoob Date: Thu, 2 Feb 2017 04:28:49 +0530 Subject: [PATCH 2/2] updated apimgt version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a42bb586..335779a1 100644 --- a/pom.xml +++ b/pom.xml @@ -1539,7 +1539,7 @@ 3.0.11-SNAPSHOT - 6.1.64 + 6.1.65 (6.0.0,7.0.0]