refactored feature artifact ids and folder names

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java

@@ -132,8 +132,8 @@ public abstract class BaseTestCase {
         try {
             conn = this.getDataSource().getConnection();
             stmt = conn.createStatement();
-            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql'");
+            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql'");
-            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql'");
+            stmt.executeUpdate("RUNSCRIPT FROM '../../../features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql'");
 
         } finally {
             TestUtils.cleanupResources(conn, stmt, null);

features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf

@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.analytics.mgt.grafana.proxy.api_${feature.version}/webapps/api#grafana-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#grafana-mgt#v1.0.war,overwrite:true);\

features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf

@@ -1,4 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.analytics.mgt.grafana.proxy.server_${feature.version}/conf/grafana-config.xml,target:${installFolder}/../../conf/grafana-config.xml,overwrite:true);\
-
-instructions.unconfigure = \

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.analytics.mgt.grafana.proxy.api.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra - Grafana Proxy API Feature</name>
     <url>https://entgra.io</url>
@@ -99,7 +99,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.analytics.mgt.grafana.proxy.api</id>
+                            <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api</id>
                             <propertiesFile>../../../etc/feature.properties
                             </propertiesFile>
                             <adviceFile>

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf

@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api_${feature.version}/webapps/api#grafana-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#grafana-mgt#v1.0.war,overwrite:true);\

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.analytics.mgt.grafana.proxy.server.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature</artifactId>
     <packaging>pom</packaging>
 
     <name>Entgra - Grafana Management Server Feature</name>
@@ -104,7 +104,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.analytics.mgt.grafana.proxy.server</id>
+                            <id>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server</id>
                             <propertiesFile>../../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf

@@ -0,0 +1,4 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server_${feature.version}/conf/grafana-config.xml,target:${installFolder}/../../conf/grafana-config.xml,overwrite:true);\
+
+instructions.unconfigure = \

features/analytics-mgt/grafana-mgt/pom.xml

@@ -33,8 +33,8 @@
     <url>http://entgra.io</url>
 
     <modules>
-        <module>io.entgra.analytics.mgt.grafana.proxy.server.feature</module>
+        <module>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature</module>
-        <module>io.entgra.analytics.mgt.grafana.proxy.api.feature</module>
+        <module>io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature</module>
     </modules>
 
 </project>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.application.extension.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Application Extension Feature</name>
     <url>http://wso2.org</url>
@@ -105,7 +105,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.apimgt.application.extension</id>
+                            <id>io.entgra.device.mgt.core.apimgt.application.extension</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/p2.inf

@@ -0,0 +1,5 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.application.extension_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.application.extension_${feature.version}/synapse-configs/default/api/_API_Application_Registration_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/_API_Application_Registration_.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.application.extension_${feature.version}/synapse-configs/default/sequences/_api_registration_fault_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/sequences/_api_registration_fault_.xml,overwrite:true);\

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.keymgt.extension.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.keymgt.extension.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Api Key Mgt Extensions Feature</name>
     <url>http://wso2.org</url>
@@ -104,7 +104,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.apimgt.keymgt.extension</id>
+                            <id>io.entgra.device.mgt.core.apimgt.keymgt.extension</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/p2.inf

@@ -0,0 +1,4 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.keymgt.extension_${feature.version}/webapps/api-key-management.war,target:${installFolder}/../../deployment/server/webapps/api-key-management.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.keymgt.extension_${feature.version}/synapse-configs/default/api/_API_Key_Management_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/_API_Key_Management_.xml,overwrite:true);\

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml

@@ -26,7 +26,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.apimgt.webapp.publisher.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
     <url>http://wso2.org</url>
@@ -123,7 +123,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.apimgt.webapp.publisher</id>
+                            <id>io.entgra.device.mgt.core.apimgt.webapp.publisher</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/p2.inf

@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.webapp.publisher_${feature.version}/conf/webapp-publisher-config.xml,target:${installFolder}/../../conf/etc/webapp-publisher-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.apimgt.webapp.publisher_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\

features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/p2.inf

@@ -1,5 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.application.extension_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.application.extension_${feature.version}/synapse-configs/default/api/_API_Application_Registration_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/_API_Application_Registration_.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.application.extension_${feature.version}/synapse-configs/default/sequences/_api_registration_fault_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/sequences/_api_registration_fault_.xml,overwrite:true);\

features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/p2.inf

@@ -1,4 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.keymgt.extension_${feature.version}/webapps/api-key-management.war,target:${installFolder}/../../deployment/server/webapps/api-key-management.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.keymgt.extension_${feature.version}/synapse-configs/default/api/_API_Key_Management_.xml,target:${installFolder}/../../deployment/server/synapse-configs/default/api/_API_Key_Management_.xml,overwrite:true);\

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/p2.inf

@@ -1,3 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.webapp.publisher_${feature.version}/conf/webapp-publisher-config.xml,target:${installFolder}/../../conf/etc/webapp-publisher-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.apimgt.webapp.publisher_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\

features/apimgt-extensions/pom.xml

@@ -34,9 +34,9 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.apimgt.webapp.publisher.feature</module>
+        <module>io.entgra.device.mgt.core.apimgt.webapp.publisher.feature</module>
-        <module>org.wso2.carbon.apimgt.application.extension.feature</module>
+        <module>io.entgra.device.mgt.core.apimgt.application.extension.feature</module>
-        <module>org.wso2.carbon.apimgt.keymgt.extension.feature</module>
+        <module>io.entgra.device.mgt.core.apimgt.keymgt.extension.feature</module>
         <module>io.entgra.device.mgt.core.apimgt.analytics.extension.feature</module>
     </modules>
 

features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf

@@ -1,5 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf

@@ -1,10 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf/application-mgt.xml,target:${installFolder}/../../conf/application-mgt.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.application.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\
-
-instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/application-mgt-datasources.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/application-mgt);\

features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.application.mgt.api.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.application.mgt.api.feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra - Application Management API Feature</name>
     <url>https://entgra.io</url>
@@ -146,7 +146,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.application.mgt.api</id>
+                            <id>io.entgra.device.mgt.core.application.mgt.api</id>
                             <propertiesFile>../../../features/etc/feature.properties
                             </propertiesFile>
                             <adviceFile>

features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/src/main/resources/p2.inf

@@ -0,0 +1,5 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.api_${feature.version}/webapps/api#application-mgt-publisher#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-publisher#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.api_${feature.version}/webapps/api#application-mgt-store#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt-store#v1.0.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\

features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.application.mgt.server.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.application.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
 
     <name>Entgra - Application Management Server Feature</name>
@@ -137,7 +137,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.application.mgt.server</id>
+                            <id>io.entgra.device.mgt.core.application.mgt.server</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/p2.inf

@@ -0,0 +1,10 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.server_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.server_${feature.version}/conf/application-mgt.xml,target:${installFolder}/../../conf/application-mgt.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.application.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\
+
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/application-mgt-datasources.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/application-mgt);\

features/application-mgt/pom.xml

@@ -33,7 +33,7 @@
     <url>https://entgra.io</url>
 
     <modules>
-        <module>io.entgra.application.mgt.api.feature</module>
+        <module>io.entgra.device.mgt.core.application.mgt.api.feature</module>
-        <module>io.entgra.application.mgt.server.feature</module>
+        <module>io.entgra.device.mgt.core.application.mgt.server.feature</module>
     </modules>
 </project>

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.api.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.api.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management API Feature</name>
     <url>http://wso2.org</url>
@@ -100,7 +100,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.certificate.mgt.api</id>
+                            <id>io.entgra.device.mgt.core.certificate.mgt.api</id>
                             <propertiesFile>../../../features/etc/feature.properties
                             </propertiesFile>
                             <adviceFile>

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/src/main/resources/p2.inf

@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.api_${feature.version}/webapps/api#scep-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v1.0.war,overwrite:true);\

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.cert.admin.api.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Admin Certificate Management API Feature</name>
     <url>http://wso2.org</url>
@@ -100,7 +100,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.certificate.mgt.cert.admin.api</id>
+                            <id>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api</id>
                             <propertiesFile>../../../features/etc/feature.properties
                             </propertiesFile>
                             <adviceFile>

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf

@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api_${feature.version}/webapps/api#certificate-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v1.0.war,overwrite:true);\

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.certificate.mgt.server.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.certificate.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Server Feature</name>
     <url>http://wso2.org</url>
@@ -108,7 +108,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.certificate.mgt.server</id>
+                            <id>io.entgra.device.mgt.core.certificate.mgt.server</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/p2.inf

@@ -0,0 +1,5 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.server_${feature.version}/conf/wso2certs.jks,target:${installFolder}/../../resources/security/wso2certs.jks,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.server_${feature.version}/conf/certificate-config.xml,target:${installFolder}/../../conf/certificate-config.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.server_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.certificate.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\

features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf

@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.api_${feature.version}/webapps/api#scep-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#scep-mgt#v1.0.war,overwrite:true);\

features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf

@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.cert.admin.api_${feature.version}/webapps/api#certificate-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#certificate-mgt#v1.0.war,overwrite:true);\

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf

@@ -1,5 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf/wso2certs.jks,target:${installFolder}/../../resources/security/wso2certs.jks,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf/certificate-config.xml,target:${installFolder}/../../conf/certificate-config.xml,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.certificate.mgt.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\

features/certificate-mgt/pom.xml

@@ -33,9 +33,9 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.certificate.mgt.server.feature</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.server.feature</module>
-        <module>org.wso2.carbon.certificate.mgt.api.feature</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.api.feature</module>
-        <module>org.wso2.carbon.certificate.mgt.cert.admin.api.feature</module>
+        <module>io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature</module>
     </modules>
 
 </project>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.defaultrole.manager.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - Default Role Manager Feature Impl</name>
     <url>http://entgra.io</url>
@@ -82,7 +82,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.device.mgt.extensions.defaultrole.manager</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager</id>
                             <propertiesFile>../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf

@@ -0,0 +1,2 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager_${feature.version}/conf/default-roles-config.xml,target:${installFolder}/../../../repository/conf/default-roles-config.xml,overwrite:true);\

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Type Deployer Feature</name>
     <url>http://wso2.org</url>
@@ -79,7 +79,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.logger.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.logger.feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - Logger Plugin Feature Impl</name>
     <url>http://entgra.io</url>
@@ -82,7 +82,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.device.mgt.extensions.logger</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.logger</id>
                             <propertiesFile>../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - FCM Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
@@ -79,7 +79,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
@@ -79,7 +79,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
@@ -79,7 +79,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
@@ -79,7 +79,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>io.entgra.device.mgt.extensions.stateengine.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature</artifactId>
     <packaging>pom</packaging>
     <name>Entgra IoT - State engine Plugin Feature Impl</name>
     <url>http://entgra.io</url>
@@ -83,7 +83,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>io.entgra.device.mgt.extensions.stateengine</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.extensions.stateengine</id>
                             <propertiesFile>../../etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>

features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf

@@ -1,2 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.extensions.defaultrole.manager_${feature.version}/conf/default-roles-config.xml,target:${installFolder}/../../../repository/conf/default-roles-config.xml,overwrite:true);\

features/device-mgt-extensions/pom.xml

@@ -33,14 +33,14 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature</module>
-		<module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature</module>
+		<module>io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature</module>
-        <module>io.entgra.device.mgt.extensions.defaultrole.manager.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature</module>
-        <module>io.entgra.device.mgt.extensions.logger.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.logger.feature</module>
-        <module>io.entgra.device.mgt.extensions.stateengine.feature</module>
+        <module>io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature</module>
     </modules>
 
 </project>

features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/pom.xml

@@ -27,7 +27,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.api.feature</artifactId>
+    <artifactId>io.entgra.device.mgt.core.device.mgt.api.feature</artifactId>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management API Feature</name>
     <url>http://wso2.org</url>
@@ -123,7 +123,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.api</id>
+                            <id>io.entgra.device.mgt.core.device.mgt.api</id>
                             <propertiesFile>../../../features/etc/feature.properties
                             </propertiesFile>
                             <adviceFile>