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

Merge remote-tracking branch 'upstream/master'

Browse Source
merge-requests/1/head
NuwanSameera 9 years ago
parent 335632769f a40da8416d
commit aa6d02f25c
28 changed files with 107 additions and 101 deletions
Show Stats Download Patch File Download Diff File

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

@ -381,7 +381,7 @@
<!-- Copying Mobile plugin management related dbscripts -->
<fileSet>
<directory>
../p2-profile-gen/target/wso2carbon-core-${carbon.mobile.device.mgt.version}/dbscripts/cdm/plugins
../p2-profile-gen/target/wso2carbon-core-${carbon.device.mgt.plugin.version}/dbscripts/cdm/plugins
</directory>
<outputDirectory>${pom.artifactId}-${pom.version}/dbscripts/cdm/plugins
</outputDirectory>

1
modules/distribution/src/assembly/dist.xml
Unescape View File

@ -32,6 +32,7 @@
<exclude>**/*.lock</exclude>
<exclude>**/.data</exclude>
<exclude>**/.settings</exclude>
<exclude>features/**</exclude>
</excludes>
</fileSet>
</fileSets>

8
modules/features/org.wso2.iot.styles.feature/pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, 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
@ -24,13 +24,13 @@
<parent>
<groupId>org.wso2.iot</groupId>
<artifactId>wso2iot-features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.styles.feature</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 IoT Server Styles Feature</name>
<url>http://wso2.org</url>
@ -39,7 +39,7 @@
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.iot.admin.styles</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</dependency>
</dependencies>

4
modules/features/pom.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, 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
@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>wso2iot-features</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 IoT Server UI Features</name>
<url>http://wso2.org</url>

4
modules/iotserver-ui/pom.xml
Unescape View File

@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, 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
@ -30,7 +30,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.wso2.iot.admin.styles</artifactId>
<packaging>bundle</packaging>
<version>1.0.0-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoT Server - UI styles</name>
<url>http://wso2.org</url>

50
modules/p2-profile-gen/pom.xml
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
~ Copyright (c) 2016, 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
@ -151,40 +151,40 @@
<!-- Mobile Device Management Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.mobile.device.mgt.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.mdm.mdmmgt.server.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.mdm.mdmmgt.server.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Mobile Device Management Features -->
<!-- IoT Device Management Features -->
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.arduino.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.digitaldisplay.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.droneanalyzer.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.raspberrypi.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<featureArtifactDef>
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.mobile.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- IoT Device Management Features -->
@ -421,7 +421,7 @@
<!--- MDM Features -->
<featureArtifactDef>
org.wso2.iot:org.wso2.iot.styles.feature:${carbon.iot.device.mgt.version}
org.wso2.iot:org.wso2.iot.styles.feature:${carbon.device.mgt.plugin.version}
</featureArtifactDef>
<!-- Mediation Features -->
@ -831,7 +831,7 @@
<!-- IoTServer Features -->
<feature>
<id>org.wso2.iot.styles.feature.group</id>
<version>${carbon.iot.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- End of IoTServer Features -->
@ -888,48 +888,48 @@
<feature>
<id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.mdm.mdmmgt.server.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.androidsense.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.arduino.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.digitaldisplay.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.droneanalyzer.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.raspberrypi.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<feature>
<id>org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature.group</id>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</feature>
<!-- Carbon Deployment Features -->

4
modules/samples/connectedcup/component/agent/pom.xml
Unescape View File

@ -21,13 +21,13 @@
<parent>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.agent</artifactId>
<packaging>war</packaging>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoTS(Device Types) - Connected Cup Agent Web app</name>
<url>http://maven.apache.org</url>

3
modules/samples/connectedcup/component/analytics/pom.xml
Unescape View File

@ -25,12 +25,13 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.analytics</artifactId>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoTS(Device Types) - Connected Cup Analytics capp</name>
<packaging>pom</packaging>

4
modules/samples/connectedcup/component/controller/pom.xml
Unescape View File

@ -23,14 +23,14 @@
<parent>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.controller.service</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>WSO2 IoTS(Device Types) - Connected Cup Controller Service</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Controller Service</description>

4
modules/samples/connectedcup/component/manager/pom.xml
Unescape View File

@ -23,13 +23,13 @@
<parent>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.manager.service</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>WSO2 IoTS(Device Types) - Connected Cup Manager Service</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Manager Service</description>

6
modules/samples/connectedcup/component/plugin/pom.xml
Unescape View File

@ -22,13 +22,13 @@
<parent>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.plugin</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin</name>
<description>WSO2 IoTS(Device Types) - Connected Cup CDMF Plugin</description>
@ -57,7 +57,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.artifactId}</Bundle-Name>
<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
<Bundle-Version>${carbon.device.mgt.plugin.version}</Bundle-Version>
<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
<Private-Package>org.coffeeking.connectedcup.plugin.internal</Private-Package>
<Import-Package>

8
modules/samples/connectedcup/component/pom.xml
Unescape View File

@ -24,13 +24,13 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device.mgt.iot.connectedcup-parent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 IoTS(Device Types) - Connected Cup Component</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Component</description>
@ -71,7 +71,7 @@
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.coffeeking.connectedcup.plugin</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<scope>provided</scope>
</dependency>
@ -97,7 +97,7 @@
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar

3
modules/samples/connectedcup/component/ui/pom.xml
Unescape View File

@ -25,12 +25,13 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device-mgt-iot-connectedcup</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.ui</artifactId>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoTS(Device Types) - Connected Cup UI</name>
<packaging>pom</packaging>

14
modules/samples/connectedcup/feature/connectedcup-feature/pom.xml
Unescape View File

@ -25,14 +25,14 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>connected-cup-feature-parent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.coffeeking.connectedcup.feature</artifactId>
<packaging>pom</packaging>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoTS(Device Types) - Connected Cup Feature</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Feature</description>
<url>http://wso2.org</url>
@ -41,27 +41,27 @@
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.coffeeking.connectedcup.plugin</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.coffeeking.connectedcup.manager.service</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.coffeeking.connectedcup.controller.service</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.coffeeking.connectedcup.agent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
@ -237,7 +237,7 @@
</adviceFile>
<bundles>
<bundleDef>
org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.plugin:${carbon.iot.device.mgt.version}
org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.plugin:${carbon.device.mgt.plugin.version}
</bundleDef>
</bundles>
<importFeatures>

4
modules/samples/connectedcup/feature/pom.xml
Unescape View File

@ -23,14 +23,14 @@
<parent>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device.mgt.iot.connectedcup-parent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>connected-cup-feature-parent</artifactId>
<packaging>pom</packaging>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>WSO2 IoTS(Device Types) - Connected Cup Feature Parent</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Feature Parent</description>
<url>http://wso2.org</url>

6
modules/samples/connectedcup/pom.xml
Unescape View File

@ -31,7 +31,7 @@
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>device.mgt.iot.connectedcup-parent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WSO2 IoTS(Device Types) - Connected Cup Component</name>
<description>WSO2 IoTS(Device Types) - Connected Cup Component</description>
@ -230,8 +230,8 @@
<paho.mqtt.version>1.0.2</paho.mqtt.version>
<commons-json.version>3.0.0.wso2v1</commons-json.version>
<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
<carbon.iot.device.mgt.jar.version>1.9.2.SNAPSHOT</carbon.iot.device.mgt.jar.version>
<carbon.device.mgt.plugin.version>2.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.iot.device.mgt.jar.version>2.0.4.SNAPSHOT</carbon.iot.device.mgt.jar.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<!--XMPP/MQTT Version-->

5
modules/samples/currentsensor/component/agent/pom.xml
Unescape View File

@ -15,6 +15,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@ -22,13 +23,13 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>${groupId}.currentsensor.agent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>${groupId}.currentsensor.agent</name>
<packaging>war</packaging>

3
modules/samples/currentsensor/component/analytics/pom.xml
Unescape View File

@ -25,12 +25,13 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>${groupId}.currentsensor.analytics</artifactId>
<version>2.0.4-SNAPSHOT</version>
<name>${groupId}.currentsensor.analytics</name>
<packaging>pom</packaging>

5
modules/samples/currentsensor/component/controller/pom.xml
Unescape View File

@ -15,6 +15,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@ -22,13 +23,13 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>${groupId}.currentsensor.controller</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>war</packaging>
<name>${groupId}.currentsensor.controller API</name>
<url>http://wso2.com</url>

5
modules/samples/currentsensor/component/manager/pom.xml
Unescape View File

@ -15,6 +15,7 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@ -22,14 +23,14 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>${groupId}.currentsensor.manager</artifactId>
<packaging>war</packaging>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<name>${groupId}.currentsensor.manager</name>
<url>http://wso2.org</url>

7
modules/samples/currentsensor/component/plugin/pom.xml
Unescape View File

@ -15,18 +15,19 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<artifactId>${groupId}.currentsensor.plugin</artifactId>
<packaging>bundle</packaging>
<name>${groupId}.currentsensor.plugin for CDMF </name>
@ -57,7 +58,7 @@
<instructions>
<Bundle-SymbolicName>${groupId}.currentsensor.plugin</Bundle-SymbolicName>
<Bundle-Name>${groupId}.currentsensor.plugin</Bundle-Name>
<Bundle-Version>1.9.2-SNAPSHOT</Bundle-Version>
<Bundle-Version>2.0.4-SNAPSHOT</Bundle-Version>
<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
<Private-Package>org.homeautomation.currentsensor.plugin.internal</Private-Package>
<Import-Package>

8
modules/samples/currentsensor/component/pom.xml
Unescape View File

@ -22,11 +22,11 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>currentsensor</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<artifactId>${project-base-package}-component</artifactId>
<name>WSO2 IoTS(Device Types) - Current Sensor Component</name>
<packaging>pom</packaging>
@ -64,7 +64,7 @@
<dependency>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}.plugin</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@ -90,7 +90,7 @@
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.iot</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
<scope>system</scope>
<systemPath>
${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar

4
modules/samples/currentsensor/component/ui/pom.xml
Unescape View File

@ -25,12 +25,12 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}-component</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<artifactId>${groupId}.currentsensor.ui</artifactId>
<name>${groupId}.currentsensor.ui</name>
<packaging>pom</packaging>

14
modules/samples/currentsensor/feature/feature/pom.xml
Unescape View File

@ -23,12 +23,12 @@
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>feature</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<artifactId>${groupId}.currentsensor.feature</artifactId>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
@ -38,24 +38,24 @@
<dependency>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}.plugin</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
</dependency>
<dependency>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}.manager</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}.controller</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.homeautomation</groupId>
<artifactId>${project-base-package}.agent</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>${carbon.device.mgt.plugin.version}</version>
<type>war</type>
</dependency>
<dependency>
@ -225,7 +225,7 @@
</adviceFile>
<bundles>
<bundleDef>
org.homeautomation:${project-base-package}.plugin:1.9.2-SNAPSHOT
org.homeautomation:${project-base-package}.plugin:${carbon.device.mgt.plugin.version}
</bundleDef>
</bundles>
<importFeatures>

5
modules/samples/currentsensor/feature/pom.xml
Unescape View File

@ -17,20 +17,21 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.homeautomation</groupId>
<artifactId>currentsensor</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>feature</artifactId>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<version>2.0.4-SNAPSHOT</version>
<modules>
<module>feature</module>

6
modules/samples/currentsensor/pom.xml
Unescape View File

@ -28,7 +28,7 @@
<groupId>org.homeautomation</groupId>
<artifactId>currentsensor</artifactId>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<url>http://wso2.com</url>
@ -161,8 +161,8 @@
<paho.mqtt.version>1.0.2</paho.mqtt.version>
<commons-json.version>3.0.0.wso2v1</commons-json.version>
<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
<carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
<carbon.iot.device.mgt.jar.version>1.9.2.SNAPSHOT</carbon.iot.device.mgt.jar.version>
<carbon.device.mgt.plugin.version>2.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
<carbon.iot.device.mgt.jar.version>2.0.4.SNAPSHOT</carbon.iot.device.mgt.jar.version>
<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
<commons-io.version>2.4</commons-io.version>

8
modules/samples/installer/device-deployer.xml
Unescape View File

@ -60,10 +60,10 @@
<featureArtifacts>
<featureArtifactDef>
<!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:1.9.2-SNAPSHOT
org.wso2.carbon.devicemgt-plugins:org.coffeeking.connectedcup.feature:2.0.4-SNAPSHOT
</featureArtifactDef>
<featureArtifactDef>
org.homeautomation:org.homeautomation.currentsensor.feature:1.9.2-SNAPSHOT
org.homeautomation:org.homeautomation.currentsensor.feature:2.0.4-SNAPSHOT
</featureArtifactDef>
</featureArtifacts>
</configuration>
@ -92,11 +92,11 @@
<!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE "<ARTIFACT_ID>.group" -->
<feature>
<id>org.coffeeking.connectedcup.feature.group</id>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</feature>
<feature>
<id>org.homeautomation.currentsensor.feature.group</id>
<version>1.9.2-SNAPSHOT</version>
<version>2.0.4-SNAPSHOT</version>
</feature>
</features>
</configuration>

13
pom.xml
Unescape View File

@ -307,7 +307,7 @@
<dependency>
<groupId>org.wso2.iot</groupId>
<artifactId>org.wso2.carbon.iot.integration.ui.pages</artifactId>
<version>${carbon.iot.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
<scope>test</scope>
</dependency>
@ -512,7 +512,7 @@
<dependency>
<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
<artifactId>org.wso2.carbon.device.mgt.mobile</artifactId>
<version>${carbon.mobile.device.mgt.version}</version>
<version>${carbon.device.mgt.plugin.version}</version>
</dependency>
<!--Osgi dependencies-->
@ -1049,13 +1049,10 @@
<carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
<!-- Carbon Mobile Device Management -->
<carbon.mobile.device.mgt.version>1.9.2-SNAPSHOT</carbon.mobile.device.mgt.version>
<!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>2.0.4-SNAPSHOT</carbon.device.mgt.plugin.version>
<mdm.version>2.0.0-SNAPSHOT</mdm.version>
<!-- IOT Device Management -->
<carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
<!-- API Management -->
<carbon.api.mgt.version>4.3.2-SNAPSHOT</carbon.api.mgt.version>
@ -1124,7 +1121,7 @@
<!-- MB Features -->
<carbon.messaging.version>3.1.0</carbon.messaging.version>
<product.mb.version>3.1.0-SNAPSHOT</product.mb.version>
<product.mb.version>3.1.0</product.mb.version>
<carbon.metrics.version>1.2.0</carbon.metrics.version>
</properties>

Write Preview
Loading…
Cancel
Save