From 0a7e33961a8b28d1e9e7c87b417c86a0454d9ebd Mon Sep 17 00:00:00 2001
From: Harshan Liyanage <harshan@wso2.com>
Date: Wed, 21 Jun 2017 18:33:39 +0530
Subject: [PATCH] Fixed sample-deployer issues which resolves
 wso2/product-iots#458

---
 modules/distribution/src/assembly/bin.xml     | 16 +++++++
 .../src/assembly/filter.properties            |  4 ++
 .../connectedcup/component/plugin/pom.xml     |  5 +--
 .../plugin/impl/ConnectedCupManager.java      |  1 -
 .../impl/ConnectedCupManagerService.java      | 13 +++++-
 .../src/main/resources/p2.inf                 | 44 +++++++++----------
 .../src/core/samples/connectedcup/pom.xml     | 15 +++----
 .../src/core/samples/samples-deployer.xml     | 10 ++---
 pom.xml                                       |  6 +--
 9 files changed, 68 insertions(+), 46 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 41361479..254f11c5 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -664,6 +664,10 @@
                 <include>*/**</include>
             </includes>
             <fileMode>644</fileMode>
+            <excludes>
+                <exclude>**/*samples-deployer.xml</exclude>
+                <exclude>**/*connectedcup/pom.xml</exclude>
+            </excludes>
         </fileSet>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
 
@@ -1877,6 +1881,18 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/wso2/broker/conf</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/samples/samples-deployer.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/samples/connectedcup/pom.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/connectedcup/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
         <!-- ********************************* End of Broker Profile ********************************* -->
     </files>
 </assembly>
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index aeefa12d..b7a35d4f 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -29,3 +29,7 @@ cdmf.platform.role=CDMFPlatform
 cdmf.analytics.role=CDMFAnalytics
 geodashboard.role=GeoDashboard
 bundle.creators=org.wso2.carbon.mediator.bridge.MediatorBundleCreator
+carbon-device-mgt-plugin-version=4.0.4
+carbon-device-mgt-version=3.0.7
+carbon-analytics-version=1.3.3
+carbon-kernel-version=4.4.14
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
index ac039084..37229f8a 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/pom.xml
@@ -68,13 +68,10 @@
 							javax.naming;resolution:=optional,
 							javax.sql;resolution:=optional,
 							javax.xml.bind.annotation.*;resolution:=optional,
-							javax.net;resolution:=optional,
-							javax.net.ssl;resolution:=optional,
-							org.w3c.dom;resolution:=optional,
 							org.wso2.carbon.device.mgt.common.*,
 							org.wso2.carbon.device.mgt.common,
 							org.wso2.carbon.context.*,
-							org.wso2.carbon.ndatasource.core,
+							org.wso2.carbon.base.*,
 							javax.xml.parsers.*;resolution:=optional
 						</Import-Package>
 
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
index 80741f5e..9f7604b1 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
+++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
@@ -251,5 +251,4 @@ public class ConnectedCupManager implements DeviceManager {
         }
         return devices;
     }
-
 }
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
index dfb5fded..cf080fa4 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
+++ b/modules/distribution/src/core/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
@@ -24,6 +24,8 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
+import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
@@ -35,7 +37,7 @@ import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
 import java.util.List;
 
-public class ConnectedCupManagerService implements DeviceManagementService{
+public class ConnectedCupManagerService implements DeviceManagementService {
 	private DeviceManager deviceManager;
 
 	@Override
@@ -78,4 +80,13 @@ public class ConnectedCupManagerService implements DeviceManagementService{
         return null;
     }
 
+	@Override
+	public DeviceStatusTaskPluginConfig getDeviceStatusTaskPluginConfig() {
+		return null;
+	}
+
+	@Override
+	public InitialOperationConfig getInitialOperationConfig() {
+		return null;
+	}
 }
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
index 68abddb2..91e01d56 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
+++ b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
@@ -1,27 +1,27 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/carbonapps/,target:${installFolder}/../../deployment/server/carbonapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/deployment/server/carbonapps/,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../database/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
 
 instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/device-types/connectedcup.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connectedcup.war);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connected-cup-agent.war);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connectedcup);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/webapps/connected-cup-agent);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent);\
 org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/connectedcup-datasources.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../database/ConnectedCupDM_DB.h2.db);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/pom.xml b/modules/distribution/src/core/samples/connectedcup/pom.xml
index 560a610d..15def572 100644
--- a/modules/distribution/src/core/samples/connectedcup/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/pom.xml
@@ -284,11 +284,6 @@
                 <artifactId>json</artifactId>
                 <version>${commons-json.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.extensions</artifactId>
-                <version>${carbon.device.mgt.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
@@ -364,13 +359,13 @@
 
 
     <properties>
-		<carbon.kernel.version>${carbon.kernel.version}</carbon.kernel.version>
+		<carbon.kernel.version>@carbon-kernel-version@</carbon.kernel.version>
 
         <org.coffeeking.version>1.0.0</org.coffeeking.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>${carbon.device.mgt.version}</carbon.device.mgt.version>
-        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.version>@carbon-device-mgt-version@</carbon.device.mgt.version>
+        <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
 
         <paho.mqtt.version>1.0.2</paho.mqtt.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
@@ -384,8 +379,8 @@
         <jackson.version>1.9.0</jackson.version>
         <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
         <commons-json.version>3.0.0.wso2v1</commons-json.version>
-        <eclipse.equinox.common.version>${eclipse.equinox.common.version}</eclipse.equinox.common.version>
-        <analytics.version>${carbon.analytics.version}</analytics.version>
+        <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
+        <analytics.version>@carbon.analytics.version@</analytics.version>
     </properties>
 
 </project>
diff --git a/modules/distribution/src/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/samples-deployer.xml
index 72b03a17..83b3dce8 100644
--- a/modules/distribution/src/core/samples/samples-deployer.xml
+++ b/modules/distribution/src/core/samples/samples-deployer.xml
@@ -71,7 +71,7 @@
                             <profile>default</profile>
                             <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
                             <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
-                            <destination>\${basedir}/../core/repository/components</destination>
+                            <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <feature>
@@ -94,11 +94,11 @@
                         <configuration>
                             <tasks>
                                 <replace token="false" value="true"
-                                         dir="../core/repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
+                                         dir="../wso2/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
                                     <include name="**/bundles.info"/>
                                 </replace>
-                                <copy todir="../analytics/repository/deployment/server/carbonapps">
-                                    <fileset dir="../core/repository/deployment/server/carbonapps">
+                                <copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
+                                    <fileset dir="../repository/deployment/server/carbonapps">
                                         <include name="*.car"/>
                                     </fileset>
                                 </copy>
@@ -189,7 +189,7 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>${carbon.device.mgt.plugin.version}</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
         <org.coffeeking.version>1.0.0</org.coffeeking.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 93006361..39026811 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1512,7 +1512,7 @@
 
         <!-- 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>
 
         <!-- IOT Device Management -->
@@ -1520,7 +1520,7 @@
 
         <!-- 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 -->
         <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
@@ -1627,7 +1627,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.25</appmgt.feature.version>
+        <appmgt.feature.version>1.2.27</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.4.8</carbon.store.version>