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

Merge pull request #1853 from charithag/iots-3.3.0

Browse Source 
Bug fixes and improvements for Geo fencing
merge-requests/1/head
Geeth 6 years ago committed by GitHub
parent 308c682bf4 9cb8f3be58
commit fbb5b5863f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 71 deletions
Show Stats Download Patch File Download Diff File

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

@ -1734,14 +1734,6 @@
${pom.artifactId}-${pom.version}/repository/resources/lifecycles ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
</outputDirectory> </outputDirectory>
</file> </file>
<!-- Adding Geo Dashboard CApp -->
<file>
<source>
../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
</source>
<outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
<fileMode>644</fileMode>
</file>
<file> <file>
<source>src/core/samples/connectedcup-samples-deployer.xml</source> <source>src/core/samples/connectedcup-samples-deployer.xml</source>
<outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory> <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>

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

@ -393,10 +393,6 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
</featureArtifactDef> </featureArtifactDef>
<!-- Geo Dashboard feature -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version} org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
</featureArtifactDef> </featureArtifactDef>
@ -410,9 +406,7 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- GPL Siddhi Extension Script for Geo Fencing --> <!-- GPL Siddhi Extension Script for Geo Fencing -->
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
@ -863,16 +857,8 @@
<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>
</feature> </feature>
<!-- End of IoT Analytics Features --> <!-- End of IoT Analytics Features -->
<!-- Geo Dashboard Feature -->
<feature>
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of Geo Dashboard Feature -->
<!-- Siddhi extension Feature --> <!-- Siddhi extension Feature -->
<feature> <feature>
<id>org.wso2.extension.siddhi.execution.json.feature.group</id> <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
@ -882,16 +868,6 @@
<id>org.wso2.extension.siddhi.device.feature.group</id> <id>org.wso2.extension.siddhi.device.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</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>
<!-- GPL Siddhi Extension Script for Geo Fencing --> <!-- GPL Siddhi Extension Script for Geo Fencing -->
<feature> <feature>
<id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id> <id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>

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

@ -180,12 +180,6 @@
</featureArtifactDef> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<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> </featureArtifactDef>
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.notification.listener.feature:${carbon.device.mgt.plugin.version}
@ -777,7 +771,10 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!-- End of Geo Dashboard feature --> <!-- IoT Analytics feature -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<featureArtifactDef> <featureArtifactDef>
@ -1060,14 +1057,6 @@
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature>
<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> </feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id> <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
@ -1721,7 +1710,11 @@
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id> <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- IoT Analytics Feature -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.remote.session.feature.group</id> <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
@ -2147,10 +2140,6 @@
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.ui.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -2624,7 +2613,11 @@
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id> <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- IoT Analytics Feature -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.remote.session.feature.group</id> <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
@ -2632,11 +2625,11 @@
</feature> </feature>
<!-- End of Realtime Operations Feature --> <!-- End of Realtime Operations Feature -->
<!--MQTT Dashboard Feature--> <!--MQTT Dashboard Feature-->
<feature> <feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id> <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2792,10 +2785,6 @@
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.backend.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature> <feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id> <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
@ -3254,18 +3243,22 @@
<id>org.wso2.carbon.iot.geo.dashboard.feature.group</id> <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Geo Dashboard Feature --> <!-- IoT Analytics Feature -->
<feature>
<id>org.wso2.carbon.device.mgt.iot.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Realtime Operations Feature --> <!-- Realtime Operations Feature -->
<feature> <feature>
<id>org.wso2.carbon.device.mgt.remote.session.feature.group</id> <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- End of Realtime Operations Feature --> <!-- End of Realtime Operations Feature -->
<!--MQTT Dashboard Feature--> <!--MQTT Dashboard Feature-->
<feature> <feature>
<id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id> <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

4
pom.xml
Unescape View File

@ -1528,14 +1528,14 @@
<carbon.governance.version>4.7.23</carbon.governance.version> <carbon.governance.version>4.7.23</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.1.28</carbon.device.mgt.version> <carbon.device.mgt.version>3.1.32</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.1.6</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.1.7</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.2.201</carbon.api.mgt.version> <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>

Write Preview
Loading…
Cancel
Save