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

Merge pull request #1020 from rasika/master

Browse Source 
Adding geo fencing
merge-requests/1/head
Rasika Perera 8 years ago committed by GitHub
parent 003b3d904a d48b7d4939
commit a5513f5500
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File

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

@ -941,6 +941,12 @@
</excludes> </excludes>
</fileSet> </fileSet>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<fileSet>
<directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/scripts</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/scripts</outputDirectory>
</fileSet>
<!-- ********************************* End of Analytics Profile ********************************* --> <!-- ********************************* End of Analytics Profile ********************************* -->
<!-- ********************************* Start of Broker Profile ********************************* --> <!-- ********************************* Start of Broker Profile ********************************* -->
@ -1613,6 +1619,14 @@
${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>
<!-- ********************************* End of IoT Core Profile ********************************* --> <!-- ********************************* End of IoT Core Profile ********************************* -->
<!-- ********************************* Start of Analytics Profile ********************************* --> <!-- ********************************* Start of Analytics Profile ********************************* -->

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

@ -391,6 +391,10 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version} org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef> </featureArtifactDef>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -828,6 +832,12 @@
<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- GPL Siddhi Extension Script for Geo Fencing -->
<feature>
<id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features> </features>
</configuration> </configuration>
</execution> </execution>

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

@ -745,6 +745,11 @@
<featureArtifactDef> <featureArtifactDef>
org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version} org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.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>
<!-- End of Geo Dashboard feature -->
</featureArtifacts> </featureArtifacts>
</configuration> </configuration>
</execution> </execution>
@ -1607,6 +1612,13 @@
<id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id> <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version> <version>${carbon.device.mgt.plugin.version}</version>
</feature> </feature>
<!-- 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 -->
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -2484,6 +2496,13 @@
<version>${identity.inbound.auth.saml.version}</version> <version>${identity.inbound.auth.saml.version}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<!-- 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 -->
</features> </features>
</configuration> </configuration>
</execution> </execution>
@ -3119,6 +3138,13 @@
<version>${carbon.device.mgt.version}</version> <version>${carbon.device.mgt.version}</version>
</feature> </feature>
<!-- SSO Fix--> <!-- SSO Fix-->
<!-- 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 -->
</features> </features>
</configuration> </configuration>
</execution> </execution>

4
pom.xml
Unescape View File

@ -1512,7 +1512,7 @@
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>3.0.1</carbon.device.mgt.version> <carbon.device.mgt.version>3.0.7</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
@ -1520,7 +1520,7 @@
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.1</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.0.4</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