community
/
product-iots
10
0
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #421 from ayyoob/new-master2

Browse Source 
Added filter properties for analytics plugin deployer and added android sense as a feature to the pack
merge-requests/1/head
Rasika Perera 8 years ago committed by GitHub
parent 9689ecc99f 408f392af2
commit 246d84cb19
10 changed files with 42 additions and 60 deletions
Show Stats Download Patch File Download Diff File

2
modules/distribution/src/analytics/conf/input-adapter-change.xml
Unescape View File

@ -28,6 +28,8 @@
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property> <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<property key="contentValidator">iot-mqtt</property>
<property key="cleanSession">true</property>
</adapterConfig>]]></value> </adapterConfig>]]></value>
</add> </add>
</processor> </processor>

3
modules/distribution/src/analytics/conf/output-adapter-change.xml
Unescape View File

@ -14,6 +14,8 @@
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property> <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<property key="qos">2</property>
<property key="clearSession">true</property>
</adapterConfig> </adapterConfig>
<adapterConfig type="secured-websocket"> <adapterConfig type="secured-websocket">
@ -33,7 +35,6 @@
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<!--websocket connection permissions which are validated for grouping (can have multiple permission.)--> <!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
<property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
<!--offset time from expiry time to trigger refresh call (in seconds)--> <!--offset time from expiry time to trigger refresh call (in seconds)-->
<property key="tokenRefreshTimeOffset">100</property> <property key="tokenRefreshTimeOffset">100</property>
</adapterConfig>]]></value> </adapterConfig>]]></value>

21
modules/distribution/src/analytics/plugins/pom.xml
Unescape View File

@ -47,16 +47,11 @@
<goal>p2-repo-gen</goal> <goal>p2-repo-gen</goal>
</goals> </goals>
<configuration> <configuration>
<metadataRepository>file:${project.basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${project.basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<publishArtifacts>true</publishArtifacts> <publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<!-- Android Sense Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Ardino Device Type Features --> <!-- Ardino Device Type Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.analytics.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.analytics.feature:${carbon.device.mgt.plugin.version}
@ -82,15 +77,11 @@
</goals> </goals>
<configuration> <configuration>
<profile>analytics-default</profile> <profile>analytics-default</profile>
<metadataRepository>file:${project.basedir}/target/p2-repo</metadataRepository> <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
<artifactRepository>file:${project.basedir}/target/p2-repo</artifactRepository> <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
<destination>${project.basedir}/../../components</destination> <destination>\${project.basedir}/../../components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.arduino.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -211,6 +202,6 @@
</repositories> </repositories>
<properties> <properties>
<carbon.device.mgt.plugin.version>3.0.33</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
</properties> </properties>
</project> </project>

17
modules/distribution/src/assembly/bin.xml
Unescape View File

@ -864,6 +864,22 @@
</outputDirectory> </outputDirectory>
</fileSet> </fileSet>
<fileSet>
<directory>
../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventstreams/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventstreams/
</outputDirectory>
</fileSet>
<fileSet>
<directory>
../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventreceivers/
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventreceivers/
</outputDirectory>
</fileSet>
<fileSet> <fileSet>
<directory> <directory>
../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources
@ -902,6 +918,7 @@
<fileSet> <fileSet>
<directory>src/analytics/plugins</directory> <directory>src/analytics/plugins</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
<filtered>true</filtered>
</fileSet> </fileSet>
<fileSet> <fileSet>

3
modules/distribution/src/core/conf/input-adapter-change.xml
Unescape View File

@ -15,6 +15,7 @@
<property key="tokenUrl">https://${iot.gateway.host}:${iot.gateway.https.port}/token</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="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
<property key="tokenRefreshTimeOffset">100</property> <property key="tokenRefreshTimeOffset">100</property>
<property key="contentValidator">iot-http</property>
</adapterConfig> </adapterConfig>
<adapterConfig type="oauth-mqtt"> <adapterConfig type="oauth-mqtt">
@ -28,6 +29,8 @@
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property> <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<property key="contentValidator">iot-mqtt</property>
<property key="cleanSession">true</property>
</adapterConfig>]]></value> </adapterConfig>]]></value>
</add> </add>
</processor> </processor>

4
modules/distribution/src/core/conf/output-adapter-change.xml
Unescape View File

@ -14,6 +14,8 @@
<property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property> <property key="url">tcp://${mqtt.broker.host}:${mqtt.broker.port}</property>
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<property key="qos">2</property>
<property key="clearSession">true</property>
</adapterConfig> </adapterConfig>
<adapterConfig type="secured-websocket"> <adapterConfig type="secured-websocket">
@ -32,8 +34,6 @@
<property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property> <property key="deviceMgtServerUrl">https://${iot.gateway.host}:${iot.gateway.https.port}</property>
<property key="username">admin</property> <property key="username">admin</property>
<property key="password">admin</property> <property key="password">admin</property>
<!--websocket connection permissions which are validated for grouping (can have multiple permission.)-->
<property key="statsPermission">/permission/admin/device-mgt/realtime_analytics</property>
<!--offset time from expiry time to trigger refresh call (in seconds)--> <!--offset time from expiry time to trigger refresh call (in seconds)-->
<property key="tokenRefreshTimeOffset">100</property> <property key="tokenRefreshTimeOffset">100</property>
</adapterConfig>]]></value> </adapterConfig>]]></value>

30
modules/distribution/src/core/plugins/plugins-deployer.xml
Unescape View File

@ -55,14 +55,6 @@
<publishArtifacts>true</publishArtifacts> <publishArtifacts>true</publishArtifacts>
<publishArtifactRepository>true</publishArtifactRepository> <publishArtifactRepository>true</publishArtifactRepository>
<featureArtifacts> <featureArtifacts>
<!-- Android Sense Device Type Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.ui.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.backend.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Ardino Device Type Features --> <!-- Ardino Device Type Features -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.ui.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.ui.feature:${carbon.device.mgt.plugin.version}
@ -102,16 +94,6 @@
<destination>\${basedir}/../wso2/components</destination> <destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<!-- Android Sense Device Type Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Ardino Device Type Features --> <!-- Ardino Device Type Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id>
@ -157,12 +139,6 @@
<destination>\${basedir}/../wso2/components</destination> <destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<!-- Android Sense Device Type UI Feature -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Ardino Device Type UI Features --> <!-- Ardino Device Type UI Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.arduino.ui.feature.group</id>
@ -196,12 +172,6 @@
<destination>\${basedir}/../wso2/components</destination> <destination>\${basedir}/../wso2/components</destination>
<deleteOldProfileFiles>false</deleteOldProfileFiles> <deleteOldProfileFiles>false</deleteOldProfileFiles>
<features> <features>
<!-- Android Sense Device Type BE Features -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Ardino Device Type BE Features --> <!-- Ardino Device Type BE Features -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.backend.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.arduino.backend.feature.group</id>

17
modules/p2-profile/analytics-profile/pom.xml
Unescape View File

@ -115,9 +115,6 @@
</featureArtifactDef> </featureArtifactDef>
<!-- END - Analytics features --> <!-- END - Analytics features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version} org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
</featureArtifactDef> </featureArtifactDef>
@ -392,7 +389,7 @@
org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.identity.carbon.auth.mutualssl:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
@ -806,12 +803,6 @@
<id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id> <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- IoT Analytics Features -->
<feature>
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.analytics.gadget.template.feature.group</id> <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
<version>${carbon.analytics.common.version}</version> <version>${carbon.analytics.common.version}</version>
@ -831,6 +822,12 @@
<id>org.wso2.extension.siddhi.execution.json.feature.group</id> <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!--android sense analytics feature-->
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

1
modules/p2-profile/iot-core-profile/pom.xml
Unescape View File

@ -1610,6 +1610,7 @@
</features> </features>
</configuration> </configuration>
</execution> </execution>
<!--Key Manager Profile--> <!--Key Manager Profile-->
<execution> <execution>
<id>6-p2-profile-generation</id> <id>6-p2-profile-generation</id>

4
pom.xml
Unescape View File

@ -1513,7 +1513,7 @@
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.61</carbon.device.mgt.version> <carbon.device.mgt.version>2.0.64</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
@ -1521,7 +1521,7 @@
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.33</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.34</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.80</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save