From 5f4ed2ff186ac16921e6a09f8698519e7ad04c15 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Sat, 15 Sep 2018 22:30:17 +0530
Subject: [PATCH] Adding the changes for the product

---
 modules/distribution/pom.xml                | 116 +++---
 modules/distribution/src/assembly/bin.xml   |  36 +-
 modules/p2-profile/iot-core-profile/pom.xml | 391 ++++++++++++--------
 pom.xml                                     |   6 +-
 4 files changed, 324 insertions(+), 225 deletions(-)

diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 9be6598e..0b8cde03 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -534,76 +534,76 @@
 								<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
 								<property name="userid" value="wso2carbon" />
 								<property name="password" value="wso2carbon" />
-								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
+								<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_APPM_DB;DB_CLOSE_ON_EXIT=FALSE" />
 
 								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
 									<classpath refid="maven.dependency.classpath" />
 									<classpath refid="maven.compile.classpath" />
 									<classpath refid="maven.runtime.classpath" />
 
-									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/appmgt/h2.sql" />
+									<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/cdm/application-mgt/h2.sql" />
 								</sql>
 								<echo message="##################### END ####################" />
 							</tasks>
 						</configuration>
 					</execution>
 
-					<execution>
-                        <!-- Creating JAGH2 schema -->
-                        <id>create-JAGH2-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="########### Create JAGH2 Schema ###########" />
-
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
-                                <property name="userid" value="wso2carbon" />
-                                <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />
-                                <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />-->
-
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
-
-                                    <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />
-                                </sql>
-                                <echo message="##################### END ####################" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <!-- Creating Social DB schema -->
-                        <id>create-social-db-schema</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo message="########### Create Social Plugin H2 Schema ###########" />
-
-                                <property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />
-                                <property name="userid" value="wso2carbon" />
-                                <property name="password" value="wso2carbon" />
-                                <property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />
-
-                                <sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">
-                                    <classpath refid="maven.dependency.classpath" />
-                                    <classpath refid="maven.compile.classpath" />
-                                    <classpath refid="maven.runtime.classpath" />
-
-                                    <fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />
-                                </sql>
-                                <echo message="##################### END ####################" />
-                            </tasks>
-                        </configuration>
-                    </execution>
+					<!--<execution>-->
+                        <!--&lt;!&ndash; Creating JAGH2 schema &ndash;&gt;-->
+                        <!--<id>create-JAGH2-schema</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<echo message="########### Create JAGH2 Schema ###########" />-->
+
+                                <!--<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />-->
+                                <!--<property name="userid" value="wso2carbon" />-->
+                                <!--<property name="password" value="wso2carbon" />-->
+                                <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/ES_STORAGE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000" />-->
+                                <!--&lt;!&ndash;<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2DM_DB;DB_CLOSE_ON_EXIT=FALSE" />&ndash;&gt;-->
+
+                                <!--<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">-->
+                                    <!--<classpath refid="maven.dependency.classpath" />-->
+                                    <!--<classpath refid="maven.compile.classpath" />-->
+                                    <!--<classpath refid="maven.runtime.classpath" />-->
+
+                                    <!--<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/storage/h2/h2.sql" />-->
+                                <!--</sql>-->
+                                <!--<echo message="##################### END ####################" />-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+
+                    <!--<execution>-->
+                        <!--&lt;!&ndash; Creating Social DB schema &ndash;&gt;-->
+                        <!--<id>create-social-db-schema</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>run</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<tasks>-->
+                                <!--<echo message="########### Create Social Plugin H2 Schema ###########" />-->
+
+                                <!--<property name="db.dir" value="target/wso2carbon-core-${carbon.kernel.version}/repository/database" />-->
+                                <!--<property name="userid" value="wso2carbon" />-->
+                                <!--<property name="password" value="wso2carbon" />-->
+                                <!--<property name="dbURL" value="jdbc:h2:file:${basedir}/${db.dir}/WSO2_SOCIAL_DB;DB_CLOSE_ON_EXIT=FALSE" />-->
+
+                                <!--<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}" password="${password}" autocommit="true" onerror="continue">-->
+                                    <!--<classpath refid="maven.dependency.classpath" />-->
+                                    <!--<classpath refid="maven.compile.classpath" />-->
+                                    <!--<classpath refid="maven.runtime.classpath" />-->
+
+                                    <!--<fileset file="${basedir}/../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/dbscripts/social/h2/resource.sql" />-->
+                                <!--</sql>-->
+                                <!--<echo message="##################### END ####################" />-->
+                            <!--</tasks>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
 					<execution>
 						<!-- Creating Android Mobile Plugin Management schema -->
 						<id>create-mobile-android-plugin-mgt-schema</id>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index 80a6852c..e64a7a2e 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -1433,10 +1433,10 @@
         <!-- Copying H2 database related files corresponding to default App management repository schema -->
         <file>
             <source>
-                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2APPM_DB.h2.db
+                target/wso2carbon-core-${carbon.kernel.version}/repository/database/WSO2DM_APPM_DB.h2.db
             </source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/database</outputDirectory>
-            <destName>WSO2APPM_DB.h2.db</destName>
+            <destName>WSO2DM_APPM_DB.h2.db</destName>
             <fileMode>644</fileMode>
         </file>
         <!-- Copying H2 database related files corresponding to default Device management repository schema -->
@@ -1701,14 +1701,14 @@
                 ${pom.artifactId}-${pom.version}/conf/
             </outputDirectory>
         </file>
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml
-            </source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/conf/
-            </outputDirectory>
-        </file>
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/social.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>-->
+                <!--${pom.artifactId}-${pom.version}/conf/-->
+            <!--</outputDirectory>-->
+        <!--</file>-->
         <file>
             <source>
                 ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/entitlement.properties
@@ -1717,14 +1717,14 @@
                 ${pom.artifactId}-${pom.version}/conf/identity
             </outputDirectory>
         </file>
-        <file>
-            <source>
-                ../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml
-            </source>
-            <outputDirectory>
-                ${pom.artifactId}-${pom.version}/repository/resources/lifecycles
-            </outputDirectory>
-        </file>
+        <!--<file>-->
+            <!--<source>-->
+                <!--../p2-profile/iot-core-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources/lifecycles/MobileAppLifeCycle.xml-->
+            <!--</source>-->
+            <!--<outputDirectory>-->
+                <!--${pom.artifactId}-${pom.version}/repository/resources/lifecycles-->
+            <!--</outputDirectory>-->
+        <!--</file>-->
         <file>
             <source>src/core/samples/connectedcup-samples-deployer.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/samples/</outputDirectory>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 1478f926..7548018a 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -454,49 +454,70 @@
                                 </featureArtifactDef>
 
                                 <!-- Mobile Device Management Features -->
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}-->
+                                <!--</featureArtifactDef>-->
                                 <!-- Mobile Device Management Features END -->
 
                                 <!-- APPM Features -->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}-->
+                                <!--</featureArtifactDef>-->
+                                <!--<featureArtifactDef>-->
+                                    <!--org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}-->
+                                <!--</featureArtifactDef>-->
+								<!--<featureArtifactDef>-->
+									<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.oauth.feature:${appmgt.feature.version}-->
+								<!--</featureArtifactDef>-->
+								<!--<featureArtifactDef>-->
+									<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.store.feature:${appmgt.feature.version}-->
+								<!--</featureArtifactDef>-->
+								<!--<featureArtifactDef>-->
+									<!--org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.publisher.feature:${appmgt.feature.version}-->
+								<!--</featureArtifactDef>-->
+                                <!-- APPM Features END -->
+
+
+                                <!-- New App Manager Features-->
+
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
-                                </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
-                                    org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.store.ui.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.oauth.feature:${appmgt.feature.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.store.feature:${appmgt.feature.version}
-								</featureArtifactDef>
-								<featureArtifactDef>
-									org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.rest.api.publisher.feature:${appmgt.feature.version}
-								</featureArtifactDef>
-                                <!-- APPM Features END -->
+
+                                <!-- End of New App Manager Features-->
 
                                 <!-- Dashboards Features -->
                                 <featureArtifactDef>
@@ -912,62 +933,91 @@
                                 </feature>
                                 <!-- End of IoTServer Features -->
                                 <!-- Mobile Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
                                 <!-- End of Mobile Features -->
 
                                 <!-- App management features-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mobile.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.publisher.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.services.api.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.store.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.store.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.social.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.oauth.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+                                <!-- End of app management features-->
+
+                                <!-- New App Manager Features-->
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.store.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.social.feature.group</id>
-                                    <version>${carbon.store.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.oauth.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-                                <!-- End of app management features-->
+
+                                <!-- End of New App Manager Features-->
 
                                 <!-- Device Management Features -->
                                 <feature>
@@ -1997,43 +2047,72 @@
                                 </feature>
                                 <!-- End of IoTServer Features -->
                                 <!-- App management features-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mobile.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.services.api.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+								<!--<feature>-->
+									<!--<id>org.wso2.carbon.appmgt.oauth.feature.group</id>-->
+									<!--<version>${appmgt.feature.version}</version>-->
+								<!--</feature>-->
+                                <!-- End of app management features-->
+
+                                <!-- New App Manager Features-->
+
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.device.application.mgt.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.device.application.mgt.publisher.ui.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.rest.api.store.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.rest.api.publisher.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-								<feature>
-									<id>org.wso2.carbon.appmgt.oauth.feature.group</id>
-									<version>${appmgt.feature.version}</version>
-								</feature>
-                                <!-- End of app management features-->
+
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.device.application.mgt.store.ui.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
+
+                                <!-- End of New App Manager Features-->
 
                                 <!-- Dashboard Features -->
                                 <feature>
@@ -2271,10 +2350,10 @@
                                     <id>org.wso2.carbon.service.mgt.server.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.social.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.social.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
                                 <feature>
                                     <id>org.wso2.carbon.registry.core.feature.group</id>
                                     <version>${carbon.registry.version}</version>
@@ -2654,49 +2733,69 @@
                                     <id>org.wso2.iot.core.styles.feature.group</id>
                                     <version>${project.version}</version>
                                 </feature>
-                                <!-- End of IoTServer Features -->
 
-                                <!-- App management features-->
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.store.feature.group</id>
-                                    <version>${carbon.store.version}</version>
-                                </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.appmgt.store.feature.group</id>
-                                    <version>${appmgt.feature.version}</version>
-                                </feature>
+                                <!-- New App Manager Features-->
+
                                 <feature>
-                                    <id>org.wso2.carbon.social.feature.group</id>
-                                    <version>${carbon.store.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
                                 <feature>
-                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                    <id>org.wso2.carbon.device.application.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
                                 </feature>
+
+                                <!-- End of New App Manager Features-->
+
+                                <!-- End of IoTServer Features -->
+
+                                <!-- App management features-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.core.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mobile.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.publisher.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.services.api.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.store.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.store.feature.group</id>-->
+                                    <!--<version>${appmgt.feature.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.social.feature.group</id>-->
+                                    <!--<version>${carbon.store.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
+                                <!--<feature>-->
+                                    <!--<id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>-->
+                                    <!--<version>${carbon.device.mgt.plugin.version}</version>-->
+                                <!--</feature>-->
                                 <!-- End of app management features-->
 
                                 <feature>
diff --git a/pom.xml b/pom.xml
index fd22ede4..fa0283c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <module>modules/cxf-filters</module>
         <module>modules/p2-profile</module>
         <module>modules/distribution</module>
-        <module>modules/integration</module>
+        <!--<module>modules/integration</module>-->
     </modules>
 
     <dependencyManagement>
@@ -1528,14 +1528,14 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.37</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.40-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>4.1.8</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>4.1.9-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>