Merge pull request 'Fixing iot story with emqx integration' (#7) from amalka.subasinghe/community-product:master into master

Reviewed-on: community/community-product#7
remotes/1731415108363211838/master
Charitha Goonetilleke 2 years ago
commit 0616de1aec

@ -88,6 +88,10 @@
<source>src/core/conf/deployment.toml</source> <source>src/core/conf/deployment.toml</source>
<outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
</file> </file>
<file>
<source>src/core/conf/input-event-adapters.xml</source>
<outputDirectory>${entgra-iot-core}/repository/conf/</outputDirectory>
</file>
<file> <file>
<source>src/core/keystores/wso2carbon.jks</source> <source>src/core/keystores/wso2carbon.jks</source>
<outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory> <outputDirectory>${entgra-iot-core}/repository/resources/security/</outputDirectory>

@ -218,6 +218,7 @@ set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.apache.jasper.runtime.BodyContentImpl.LI
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dorg.terracotta.quartz.skipUpdateCheck=true -Dcarbon.classpath=%CARBON_CLASSPATH% -Dfile.encoding=UTF8 -DworkerNode=false -Dcarbon.new.config.dir.path="%CARBON_HOME%\repository\resources\conf"
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Djava.endorsed.dirs=%JAVA_ENDORSED% -Dorg.wso2.ignoreHostnameVerification=true -Dorg.opensaml.httpclient.https.disableHostnameVerification=true -Dhttpclient.hostnameVerifier="DefaultAndLocalhost"
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443" set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Diot.core.host="localhost" -Diot.core.https.port="9443" -Diot.core.http.port="9763" -Diot.gateway.host="localhost" -Diot.gateway.https.port="8243" -Diot.gateway.http.port="8280" -Diot.gateway.carbon.https.port="9443" -Diot.gateway.carbon.http.port="9763" -Diot.gateway.websocket.ws.port="9099" -Diot.gateway.websocket.wss.port="8099" -Diot.remotesession.server.host="localhost" -Diot.remotesession.server.https.port="9443"
set CMD_LINE_ARGS=%CMD_LINE_ARGS% -Dmqtt.broker.host="localhost" -Dmqtt.broker.port="1883"
:runJava :runJava
echo JAVA_HOME environment variable is set to %JAVA_HOME% echo JAVA_HOME environment variable is set to %JAVA_HOME%

@ -370,6 +370,8 @@ do
-Diot.remotesession.server.host="localhost" \ -Diot.remotesession.server.host="localhost" \
-Diot.apim.host="localhost" \ -Diot.apim.host="localhost" \
-Diot.apim.https.port="9443" \ -Diot.apim.https.port="9443" \
-Dmqtt.broker.host="localhost" \
-Dmqtt.broker.port="1883" \
-Denable-api-scopes-sharing="true" \ -Denable-api-scopes-sharing="true" \
-Dagent-bundle="org.wso2.carbon.emm.mdmagent" \ -Dagent-bundle="org.wso2.carbon.emm.mdmagent" \
-Diot.reporting.event.host="" \ -Diot.reporting.event.host="" \

@ -0,0 +1,56 @@
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~
~ WSO2 Inc. licenses this file to you under the Apache License,
~ Version 2.0 (the "License"); you may not use this file except
~ in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing,
~ software distributed under the License is distributed on an
~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
~ KIND, either express or implied. See the License for the
~ specific language governing permissions and limitations
~ under the License.
-->
<inputEventAdaptersConfig>
<adapterConfig type="oauth-mqtt">
<!-- Thread Pool Related Properties -->
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
<property key="connectionKeepAliveInterval">60</property>
<property key="dcrUrl">https://${iot.keymanager.host}:${iot.keymanager.https.port}/client-registration/v0.17/register</property>
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property>
<property key="password">admin</property>
<property key="contentValidator">deviceid-topic-content-validator</property>
<property key="cleanSession">true</property>
</adapterConfig>
<adapterConfig type="http">
<property key="minThread">8</property>
<property key="maxThread">100</property>
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
<adapterConfig type="file-tail">
<property key="events.duplicated.in.cluster">false</property>
</adapterConfig>
<adapterConfig type="email">
<property key="moveToFolderName">readMails</property>
</adapterConfig>
<adapterConfig type="jms">
<property key="keepAliveTimeInMillis">20000</property>
<property key="jobQueueSize">10000</property>
</adapterConfig>
</inputEventAdaptersConfig>

@ -57,6 +57,49 @@
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
<execution>
<id>copy-emqx-exhook</id>
<phase>test</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.exhook</artifactId>
<version>${carbon.device.mgt.plugin.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<classifier>jar-with-dependencies</classifier>
<outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/lib/</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
<execution>
<id>copy-emqx-initializer</id>
<phase>test</phase>
<goals>
<goal>copy</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.emqx.initializer</artifactId>
<version>${carbon.device.mgt.plugin.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
<outputDirectory>${project.basedir}/target/${entgra-iot-core}/repository/components/dropins/</outputDirectory>
</artifactItem>
</artifactItems>
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>

@ -121,7 +121,7 @@
<!--Orbit versions--> <!--Orbit versions-->
<orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version> <orbit.h2.engine.version>1.4.199.wso2v1</orbit.h2.engine.version>
<carbon.device.mgt.plugin.version>6.0.12-SNAPSHOT</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>6.0.13-SNAPSHOT</carbon.device.mgt.plugin.version>
</properties> </properties>

Loading…
Cancel
Save