From c2b573b32c1e9eb458e84c1aa2139c4c168248ab Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Jun 2017 16:15:15 +0530
Subject: [PATCH 01/11] Adding geo fencing

---
 modules/distribution/src/assembly/bin.xml    |  6 +++++
 modules/p2-profile/analytics-profile/pom.xml | 10 ++++++++
 modules/p2-profile/iot-core-profile/pom.xml  | 26 ++++++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 41361479..c0342a8d 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -941,6 +941,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 ********************************* -->
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index b628623f..a1808ba5 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -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>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index c46b7ffb..e5084396 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -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>

From d48b7d4939282c18350b9f0522aa0b164003b1b6 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 21 Jun 2017 14:52:25 +0530
Subject: [PATCH 02/11] Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not
 copied

---
 modules/distribution/src/assembly/bin.xml | 8 ++++++++
 pom.xml                                   | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index c0342a8d..3eb56ef3 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1619,6 +1619,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 ********************************* -->
diff --git a/pom.xml b/pom.xml
index 93006361..da72c8da 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>

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 03/11] 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>

From 56cbef3f35b6d57258fd40050fa1dab781b3bf74 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 14:23:05 +0530
Subject: [PATCH 04/11] Fixing 
 https://github.com/wso2/product-iots/issues/776.

---
 .../src/core/conf/security/Owasp.CsrfGuard.Carbon.properties | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
index 345a112a..78c42b0b 100644
--- a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
+++ b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
@@ -469,16 +469,15 @@ org.owasp.csrfguard.unprotected.publisherAcs=%servletContext%/publisher/acs
 org.owasp.csrfguard.unprotected.publisherApi=%servletContext%/publisher/api
 org.owasp.csrfguard.unprotected.storeAcs=%servletContext%/store/acs
 org.owasp.csrfguard.unprotected.apiStoreAcs=%servletContext%/api-store/acs
-org.owasp.csrfguard.unprotected.apiStoreApis=%servletContext%/api-store/apis
+org.owasp.csrfguard.unprotected.apiStoreApis=%servletContext%/api-store/apis/*
 org.owasp.csrfguard.unprotected.portalAcs=%servletContext%/portal/acs
 org.owasp.csrfguard.unprotected.portalApis=%servletContext%/portal/apis/*
 org.owasp.csrfguard.unprotected.socialAcs=%servletContext%/social/acs
-org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis
+org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis/*
 org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
 org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
 org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
 
- 
 #carbon
 org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*
 

From 93f8acebb62fd8f88d3f2687f8b34b8054c41901 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 16:28:48 +0530
Subject: [PATCH 05/11] Updating the repo versions.

---
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 467588b0..9eb4f35d 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.8-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1520,10 +1520,10 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>4.0.1</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.5-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.1.80</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.1.94</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->
@@ -1625,10 +1625,10 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.25</appmgt.feature.version>
+        <appmgt.feature.version>1.2.29-SNAPSHOT</appmgt.feature.version>
 
         <!-- Carbon Store version-->
-        <carbon.store.version>1.4.8</carbon.store.version>
+        <carbon.store.version>1.5.1</carbon.store.version>
 
         <!-- Carbon Remote User Management version -->
         <carbon.um.ws.version>5.1.4</carbon.um.ws.version>

From 602e012e2e0488d9e5e5b5e8def0d23eb76cf6b5 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 18:11:52 +0530
Subject: [PATCH 06/11] committing the intermediate changes.

---
 .../analytics/{plugins => samples}/pom.xml    |  0
 .../eventsimulatorfiles/activity_data.csv     |  0
 .../activity_data_streamConfiguration.xml     |  0
 .../eventsimulatorfiles/audio_data.csv        |  0
 .../audio_data_streamConfiguration.xml        |  0
 .../eventsimulatorfiles/battery_data.csv      |  0
 .../battery_data_streamConfiguration.xml      |  0
 .../eventsimulatorfiles/call_data.csv         |  0
 .../call_data_streamConfiguration.xml         |  0
 .../eventsimulatorfiles/location_data.csv     |  0
 .../location_data_streamConfiguration.xml     |  0
 .../eventsimulatorfiles/network_data.csv      |  0
 .../network_data_streamConfiguration.xml      |  0
 .../eventsimulatorfiles/screen_data.csv       |  0
 .../screen_data_streamConfiguration.xml       |  0
 .../eventsimulatorfiles/sms_data.csv          |  0
 .../sms_data_streamConfiguration.xml          |  0
 modules/distribution/src/assembly/bin.xml     | 46 +++++++++----------
 ....xml => connectedcup-samples-deployer.xml} |  0
 .../device-plugins-deployer.xml}              |  2 +-
 20 files changed, 23 insertions(+), 25 deletions(-)
 rename modules/distribution/src/analytics/{plugins => samples}/pom.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/activity_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/audio_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/battery_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/call_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/call_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/location_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/location_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/network_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/network_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/screen_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/sms_data.csv (100%)
 rename modules/distribution/src/analytics/{plugins => samples}/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/core/samples/{samples-deployer.xml => connectedcup-samples-deployer.xml} (100%)
 rename modules/distribution/src/core/{plugins/plugins-deployer.xml => samples/device-plugins-deployer.xml} (99%)

diff --git a/modules/distribution/src/analytics/plugins/pom.xml b/modules/distribution/src/analytics/samples/pom.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/pom.xml
rename to modules/distribution/src/analytics/samples/pom.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data.csv
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
diff --git a/modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 1d6091a3..48219d8f 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -648,15 +648,6 @@
             </excludes>
         </fileSet>
 
-        <fileSet>
-            <directory>src/core/plugins</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/plugins</outputDirectory>
-            <includes>
-                <include>*/**</include>
-            </includes>
-			<filtered>true</filtered>
-        </fileSet>
-
         <fileSet>
             <directory>src/core/samples</directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/samples</outputDirectory>
@@ -665,8 +656,9 @@
             </includes>
             <fileMode>644</fileMode>
             <excludes>
-                <exclude>**/*samples-deployer.xml</exclude>
+                <exclude>**/*connectedcup-samples-deployer.xml</exclude>
                 <exclude>**/*connectedcup/pom.xml</exclude>
+                <exclude>**/*device-plugins-deployer.xml</exclude>
             </excludes>
         </fileSet>
         <!-- ********************************* End of IoT Core Profile ********************************* -->
@@ -924,8 +916,8 @@
         </fileSet>
 
         <fileSet>
-            <directory>src/analytics/plugins</directory>
-            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
+            <directory>src/analytics/samples</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/samples</outputDirectory>
 			<filtered>true</filtered>
         </fileSet>
 
@@ -1631,6 +1623,24 @@
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/resources/devicetypes/analytics/</outputDirectory>
             <fileMode>644</fileMode>
         </file>
+        <file>
+            <source>src/core/samples/connectedcup-samples-deployer.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+        <file>
+            <source>src/core/samples/device-plugins-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 IoT Core Profile ********************************* -->
 
         <!-- ********************************* Start of Analytics Profile ********************************* -->
@@ -1895,18 +1905,6 @@
             <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/core/samples/samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
similarity index 100%
rename from modules/distribution/src/core/samples/samples-deployer.xml
rename to modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
diff --git a/modules/distribution/src/core/plugins/plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
similarity index 99%
rename from modules/distribution/src/core/plugins/plugins-deployer.xml
rename to modules/distribution/src/core/samples/device-plugins-deployer.xml
index 5fe2d560..5bdb1247 100644
--- a/modules/distribution/src/core/plugins/plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -33,7 +33,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>../wso2/analytics/plugins</module>
+        <module>../wso2/analytics/samples</module>
     </modules>
 
     <build>

From b36371444697f424099d1328f15c01df3d658fbf Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 20:45:52 +0530
Subject: [PATCH 07/11] fixing the issue in creating the connected cup
 instance.

---
 modules/distribution/src/analytics/samples/pom.xml              | 2 +-
 .../src/main/java/org/coffeeking/api/ConnectedCupService.java   | 2 +-
 .../distribution/src/core/samples/device-plugins-deployer.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/analytics/samples/pom.xml b/modules/distribution/src/analytics/samples/pom.xml
index c8f3d8d5..509f552e 100644
--- a/modules/distribution/src/analytics/samples/pom.xml
+++ b/modules/distribution/src/analytics/samples/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>analytics-devicetype-feature-installation</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Device Type Plugins - Analytics</name>
+    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - Analytics</name>
     <url>http://wso2.org</url>
 
 
diff --git a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
index 605b92cd..7b868612 100644
--- a/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
+++ b/modules/distribution/src/core/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
@@ -50,7 +50,7 @@ import javax.ws.rs.core.Response;
                 }
         ),
         tags = {
-                @Tag(name = "connectedcup", description = "")
+                @Tag(name = "connectedcup,device_management", description = "")
         }
 )
 @Scopes(
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 5bdb1247..23b5509a 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -29,7 +29,7 @@
     <artifactId>iot-devicetype-feature-installation</artifactId>
     <version>3.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Device Type Plugins - IoT Core</name>
+    <name>Installing Virtual Fire Alarm, Raspberry Pi, Ardino Device Types - IoT Core</name>
     <url>http://wso2.org</url>
 
     <modules>

From 778c8906163d081393ebb89022287818071b60f3 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 21:58:29 +0530
Subject: [PATCH 08/11] Updating the snapshot versions to released versions.

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9eb4f35d..135a085c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1512,7 +1512,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>3.0.8-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.8</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.5-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.0.5</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.94</carbon.api.mgt.version>
@@ -1625,7 +1625,7 @@
         <caramel.version>1.0.1</caramel.version>
 
         <!-- App manager version-->
-        <appmgt.feature.version>1.2.29-SNAPSHOT</appmgt.feature.version>
+        <appmgt.feature.version>1.2.29</appmgt.feature.version>
 
         <!-- Carbon Store version-->
         <carbon.store.version>1.5.1</carbon.store.version>

From eb473cb7ea8faab4ae382d44b6778b76629e7c83 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 22:03:12 +0530
Subject: [PATCH 09/11] Fixing the integration tests with modified
 plugin-deployer.xml name

---
 .../common/extensions/CustomTestServerManager.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
index b296eb5c..81938011 100644
--- a/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
+++ b/modules/integration/tests-common/integration-common/src/main/java/org/wso2/iot/integration/common/extensions/CustomTestServerManager.java
@@ -113,8 +113,8 @@ public class CustomTestServerManager {
                     carbonHome = extractedDir;
                 }
                 // Deploy the plugins.
-                String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "plugins-deployer.xml"};
-                Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "plugins"));
+                String[] cmdArray = new String[] { "mvn", "clean", "install", "-f", "device-plugins-deployer.xml"};
+                Runtime.getRuntime().exec(cmdArray, null, new File(carbonHome + File.separator + "samples"));
                 Thread.sleep(15000);
             } else if (server.equalsIgnoreCase("analytics") || server.equalsIgnoreCase("broker")) {
                 if (extractedDir == null) {

From 099ce78ea35d010ebde4fddb78380351ece4567c Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 22:56:09 +0530
Subject: [PATCH 10/11] Adding missing http push notification extension.

---
 modules/p2-profile/iot-core-profile/pom.xml | 31 +++++++++++++--------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index e5084396..31c84b8e 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -167,6 +167,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of Device Management Features -->
 
                                 <!-- Device Management Plugin Features -->
@@ -1001,6 +1004,10 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2015,6 +2022,10 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -2421,6 +2432,10 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -2654,6 +2669,10 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
@@ -3039,18 +3058,6 @@
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
                                 <!--end required for context.xml-->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>

From c04b8e78724e8c0e34fdc517d07b45d93798af5c Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 22 Jun 2017 23:26:45 +0530
Subject: [PATCH 11/11] Fixing the old references of the plugins-deployer, and
 owsap log in the integration tests.

---
 .../core/conf/security/Owasp.CsrfGuard.Carbon.properties    | 1 +
 .../web/ui/test/samples/SampleInstallationTest.java         | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
index 78c42b0b..d730d644 100644
--- a/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
+++ b/modules/distribution/src/core/conf/security/Owasp.CsrfGuard.Carbon.properties
@@ -477,6 +477,7 @@ org.owasp.csrfguard.unprotected.socialApis=%servletContext%/social/apis/*
 org.owasp.csrfguard.unprotected.appStoreDevices=%servletContext%/store/apps/devices/*
 org.owasp.csrfguard.unprotected.appStoreApis=%servletContext%/store/apis/*
 org.owasp.csrfguard.unprotected.appPortalClient=%servletContext%/portal/apis/*
+org.owasp.csrfguard.unprotected.connectedcupAgent=%servletContext%/connected-cup-agent/*
 
 #carbon
 org.owasp.csrfguard.unprotected.Services=%servletContext%/services/*
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
index 1368e0b1..4aa77954 100644
--- a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
+++ b/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
@@ -108,13 +108,13 @@ public class SampleInstallationTest extends IOTIntegrationUIBaseTestCase {
 
         log.info("CARBON_HOME: " + System.getProperty(Constants.CARBON_HOME));
         File dir = new File(carbonHome);
-        log.info("Sample installation started : mvn clean install -f device-deployer.xml");
+        log.info("Sample installation started : mvn clean install -f device-plugins-deployer.xml");
         try {
             if (System.getProperty(Constants.OS_NAME).toLowerCase().contains("windows")) {
-                commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-deployer.xml"};
+                commands = new String[]{"cmd.exe", "/c", "mvn clean install -f device-plugins-deployer.xml"};
                 tempProcess = Runtime.getRuntime().exec(commands, null, dir);
             } else {
-                commands = new String[]{"mvn", "clean", "install", "-f", "device-deployer.xml"};
+                commands = new String[]{"mvn", "clean", "install", "-f", "device-plugins-deployer.xml"};
                 tempProcess = Runtime.getRuntime().exec(commands, null, dir);
             }
             boolean buildStatus = waitForMessage(tempProcess.getInputStream(), Constants.BUILD_SUCCESS_MSG);