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

Merge branch 'master' of https://github.com/wso2/product-iots

Browse Source
merge-requests/1/head
Harshan Liyanage 8 years ago
parent 0a7e33961a a5513f5500
commit c240fb9a71
4 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -945,6 +945,12 @@
</excludes>
</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 ********************************* -->
<!-- ********************************* Start of Broker Profile ********************************* -->
@ -1617,6 +1623,14 @@
${pom.artifactId}-${pom.version}/repository/resources/lifecycles
</outputDirectory>
</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 ********************************* -->
<!-- ********************************* Start of Analytics Profile ********************************* -->

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

@ -391,6 +391,10 @@
<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 -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.gpl.siddhi.extension.geo.script.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
</featureArtifacts>
</configuration>
</execution>
@ -828,6 +832,12 @@
<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 -->
<feature>
<id>org.wso2.gpl.siddhi.extension.geo.script.feature.group</id>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
</features>
</configuration>
</execution>

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

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

4
pom.xml
Unescape View File

@ -1564,7 +1564,6 @@
<orbit.version.geronimo-jms_1.1_spec>1.1.0.wso2v1</orbit.version.geronimo-jms_1.1_spec>
<!--IOT Analytics-->
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<shindig.version>2.0.2</shindig.version>
<carbon.data.version>4.3.6</carbon.data.version>
<equinox.osgi.version>3.8.1.v20120830-144521</equinox.osgi.version>
@ -1604,7 +1603,6 @@
<slf4j.log4j12.version>1.6.1</slf4j.log4j12.version>
<slf4j.api.version>1.6.1</slf4j.api.version>
<slf4j.wso2.version>1.5.10.wso2v1</slf4j.wso2.version>
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<geoip.api.version>1.2.15</geoip.api.version>
<kryo.orbit.version>2.24.0.wso2v1</kryo.orbit.version>
<kryo.import.version>[2.24.0,3.0)</kryo.import.version>
@ -1636,7 +1634,7 @@
<carbon.um.ws.version>5.1.4</carbon.um.ws.version>
<!-- Cipher tool version-->
<cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
<cipher.tool.version>1.0.0-wso2v4</cipher.tool.version>
<!--XMPP/MQTT Version-->
<smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>

Write Preview
Loading…
Cancel
Save