ruwin
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #284 from ayyoob/cloud-3.1.0

Browse Source 
changes adapter configs after testing
application-manager-new
Ayyoob Hamza 8 years ago committed by GitHub
parent c61cd953b2 fe81bb75ca
commit 2da70ad50a
6 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File

8
modules/analytics/distribution/input-adapter-change.xml
Unescape View File

@ -9,9 +9,12 @@
<property key="jobQueueSize">10000</property>
<property key="maximumHttpConnectionPerHost">2</property>
<property key="maximumTotalHttpConnection">100</property>
<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="tokenUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
<property key="tokenRefreshTimeOffset">100</property>
</adapterConfig>
<adapterConfig type="oauth-mqtt">
@ -22,8 +25,9 @@
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
</adapterConfig>]]></value>
</add>
</processor>

2
modules/analytics/distribution/output-adapter-change.xml
Unescape View File

@ -22,7 +22,7 @@
<property key="jobQueueSize">10000</property>
<!--Authorizer holds the information of the authorizer that is used authorize a connection.-->
<property key="authenticator">org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator</property>
<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="tokenValidationUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="maximumHttpConnectionPerHost">2</property>
<property key="maximumTotalHttpConnection">100</property>
<property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>

8
modules/core/distribution/input-adapter-change.xml
Unescape View File

@ -9,9 +9,12 @@
<property key="jobQueueSize">10000</property>
<property key="maximumHttpConnectionPerHost">2</property>
<property key="maximumTotalHttpConnection">100</property>
<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="tokenUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
<property key="tokenRefreshTimeOffset">100</property>
</adapterConfig>
<adapterConfig type="oauth-mqtt">
@ -22,8 +25,9 @@
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.11/register</property>
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</property>
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
</adapterConfig>]]></value>
</add>
</processor>

2
modules/core/distribution/output-adapter-change.xml
Unescape View File

@ -22,7 +22,7 @@
<property key="jobQueueSize">10000</property>
<!--Authorizer holds the information of the authorizer that is used authorize a connection.-->
<property key="authenticator">org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.OAuthAuthenticator</property>
<property key="keymanagerUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="tokenValidationUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}</property>
<property key="maximumHttpConnectionPerHost">2</property>
<property key="maximumTotalHttpConnection">100</property>
<property key="authorizer">org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.DeviceAuthorizer</property>

4
modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
Unescape View File

@ -20,9 +20,7 @@
<eventReceiver name="connected_cup_receiver" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
<from eventAdapterType="oauth-mqtt">
<property name="topic">carbon.super/connectedcup/#</property>
<property name="username">admin</property>
<property name="password">admin</property>
<property name="contentValidator">org.wso2.carbon.device.mgt.input.adapter.mqtt.util.MQTTContentValidator</property>
<property name="contentValidator">iot-mqtt</property>
<property name="contentTransformer">default</property>
<property name="cleanSession">true</property>
</from>

6
pom.xml
Unescape View File

@ -1529,17 +1529,17 @@
<carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.12-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version>2.0.14-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management -->
<product.iot.version>3.1.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.9-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.device.mgt.plugin.version>3.0.11-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management -->
<carbon.api.mgt.version>6.1.64</carbon.api.mgt.version>
<carbon.api.mgt.version>6.1.65</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation -->

Write Preview
Loading…
Cancel
Save