diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java index 85f585f076..13464675f9 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/BaseTestCase.java +++ b/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/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/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/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql'"); } finally { TestUtils.cleanupResources(conn, stmt, null); diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf b/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf deleted file mode 100644 index ca042b5b3e..0000000000 --- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf b/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf deleted file mode 100644 index f269b204c4..0000000000 --- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -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 = \ \ No newline at end of file diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml similarity index 96% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml index bb839dff34..c71390e03f 100644 --- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml +++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.analytics.mgt.grafana.proxy.api.feature + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature pom Entgra - Grafana Proxy API Feature https://entgra.io @@ -99,7 +99,7 @@ p2-feature-gen - io.entgra.analytics.mgt.grafana.proxy.api + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api ../../../etc/feature.properties diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/build.properties b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/src/main/resources/build.properties similarity index 100% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/src/main/resources/build.properties rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/src/main/resources/build.properties diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..2f0869f4f3 --- /dev/null +++ b/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);\ diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml similarity index 96% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml index b1562b37f5..e02b33dfe4 100644 --- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml +++ b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.analytics.mgt.grafana.proxy.server.feature + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature pom Entgra - Grafana Management Server Feature @@ -104,7 +104,7 @@ p2-feature-gen - io.entgra.analytics.mgt.grafana.proxy.server + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server ../../../etc/feature.properties diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/build.properties b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/build.properties similarity index 100% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/build.properties rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/build.properties diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf/grafana-config.xml b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf/grafana-config.xml similarity index 100% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf/grafana-config.xml rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf/grafana-config.xml diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf_templates.templates.repository.conf/grafana-config.xml.j2 b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf_templates.templates.repository.conf/grafana-config.xml.j2 similarity index 100% rename from features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf_templates.templates.repository.conf/grafana-config.xml.j2 rename to features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/conf_templates.templates.repository.conf/grafana-config.xml.j2 diff --git a/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf b/features/analytics-mgt/grafana-mgt/io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..cece6a3606 --- /dev/null +++ b/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 = \ \ No newline at end of file diff --git a/features/analytics-mgt/grafana-mgt/pom.xml b/features/analytics-mgt/grafana-mgt/pom.xml index 5d425d68f4..a55db83922 100644 --- a/features/analytics-mgt/grafana-mgt/pom.xml +++ b/features/analytics-mgt/grafana-mgt/pom.xml @@ -33,8 +33,8 @@ http://entgra.io - io.entgra.analytics.mgt.grafana.proxy.server.feature - io.entgra.analytics.mgt.grafana.proxy.api.feature + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.server.feature + io.entgra.device.mgt.core.analytics.mgt.grafana.proxy.api.feature diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml similarity index 96% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml index 90284bc64d..684d60aba0 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - org.wso2.carbon.apimgt.application.extension.feature + io.entgra.device.mgt.core.apimgt.application.extension.feature pom WSO2 Carbon - API Management Application Extension Feature http://wso2.org @@ -105,7 +105,7 @@ p2-feature-gen - org.wso2.carbon.apimgt.application.extension + io.entgra.device.mgt.core.apimgt.application.extension ../../../features/etc/feature.properties diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/build.properties b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/build.properties similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/build.properties rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/build.properties diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/p2.inf b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..a770171050 --- /dev/null +++ b/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);\ diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/api/_API_Application_Registration_.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/api/_API_Application_Registration_.xml similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/api/_API_Application_Registration_.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/api/_API_Application_Registration_.xml diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/sequences/_api_registration_fault_.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/sequences/_api_registration_fault_.xml similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/sequences/_api_registration_fault_.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.application.extension.feature/src/main/resources/synapse-configs/default/sequences/_api_registration_fault_.xml diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml similarity index 97% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/pom.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml index 125674ace0..47192cf201 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - org.wso2.carbon.apimgt.keymgt.extension.feature + io.entgra.device.mgt.core.apimgt.keymgt.extension.feature pom WSO2 Carbon - Api Key Mgt Extensions Feature http://wso2.org @@ -104,7 +104,7 @@ p2-feature-gen - org.wso2.carbon.apimgt.keymgt.extension + io.entgra.device.mgt.core.apimgt.keymgt.extension ../../../features/etc/feature.properties diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/build.properties b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/build.properties similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/build.properties rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/build.properties diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/p2.inf b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..834cf7770c --- /dev/null +++ b/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);\ diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/synapse-configs/default/api/_API_Key_Management_.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/synapse-configs/default/api/_API_Key_Management_.xml similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/synapse-configs/default/api/_API_Key_Management_.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.keymgt.extension.feature/src/main/resources/synapse-configs/default/api/_API_Key_Management_.xml diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml similarity index 97% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml index f8c79d71b4..57f9aef0d7 100644 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml +++ b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - org.wso2.carbon.apimgt.webapp.publisher.feature + io.entgra.device.mgt.core.apimgt.webapp.publisher.feature pom WSO2 Carbon - API Management Webapp Publisher Feature http://wso2.org @@ -123,7 +123,7 @@ p2-feature-gen - org.wso2.carbon.apimgt.webapp.publisher + io.entgra.device.mgt.core.apimgt.webapp.publisher ../../../features/etc/feature.properties diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/build.properties b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/build.properties similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/build.properties rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/build.properties diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/conf/webapp-publisher-config.xml diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-publisher-config.xml.j2 b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-publisher-config.xml.j2 similarity index 100% rename from features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-publisher-config.xml.j2 rename to features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-publisher-config.xml.j2 diff --git a/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/p2.inf b/features/apimgt-extensions/io.entgra.device.mgt.core.apimgt.webapp.publisher.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..41f6285ba2 --- /dev/null +++ b/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);\ diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/p2.inf b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/p2.inf deleted file mode 100644 index 61654c2892..0000000000 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/p2.inf b/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/p2.inf deleted file mode 100644 index fa1ab939b0..0000000000 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/p2.inf b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/p2.inf deleted file mode 100644 index 8b5d94e410..0000000000 --- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml index 9d87f2acd0..bf4e7eb9b0 100644 --- a/features/apimgt-extensions/pom.xml +++ b/features/apimgt-extensions/pom.xml @@ -34,9 +34,9 @@ http://wso2.org - org.wso2.carbon.apimgt.webapp.publisher.feature - org.wso2.carbon.apimgt.application.extension.feature - org.wso2.carbon.apimgt.keymgt.extension.feature + io.entgra.device.mgt.core.apimgt.webapp.publisher.feature + io.entgra.device.mgt.core.apimgt.application.extension.feature + io.entgra.device.mgt.core.apimgt.keymgt.extension.feature io.entgra.device.mgt.core.apimgt.analytics.extension.feature diff --git a/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf deleted file mode 100644 index cc35cf26a1..0000000000 --- a/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf deleted file mode 100644 index 480343ebef..0000000000 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml similarity index 97% rename from features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml index 8d1bca601d..dfb8e42e4a 100644 --- a/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.application.mgt.api.feature + io.entgra.device.mgt.core.application.mgt.api.feature pom Entgra - Application Management API Feature https://entgra.io @@ -146,7 +146,7 @@ p2-feature-gen - io.entgra.application.mgt.api + io.entgra.device.mgt.core.application.mgt.api ../../../features/etc/feature.properties diff --git a/features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/build.properties b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/src/main/resources/build.properties similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.api.feature/src/main/resources/build.properties rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/src/main/resources/build.properties diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..cc66149599 --- /dev/null +++ b/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);\ diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml similarity index 97% rename from features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml index a4fcb9a6b2..2986d2c1e3 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml +++ b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.application.mgt.server.feature + io.entgra.device.mgt.core.application.mgt.server.feature pom Entgra - Application Management Server Feature @@ -137,7 +137,7 @@ p2-feature-gen - io.entgra.application.mgt.server + io.entgra.device.mgt.core.application.mgt.server ../../../features/etc/feature.properties diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/build.properties b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/build.properties similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/build.properties rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/build.properties diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf/identity-service-provider-config.xml diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/application-mgt.xml.j2 diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/application-mgt-datasources.xml.j2 diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/identity-service-provider-config.xml.j2 diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql similarity index 100% rename from features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql rename to features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql diff --git a/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/io.entgra.device.mgt.core.application.mgt.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..8a7f0cc9c8 --- /dev/null +++ b/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);\ diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index f75ff2d18f..95b7eed92f 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -33,7 +33,7 @@ https://entgra.io - io.entgra.application.mgt.api.feature - io.entgra.application.mgt.server.feature + io.entgra.device.mgt.core.application.mgt.api.feature + io.entgra.device.mgt.core.application.mgt.server.feature diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml similarity index 96% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml index 27f9f45cb3..13ba2e1055 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml +++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.certificate.mgt.api.feature + io.entgra.device.mgt.core.certificate.mgt.api.feature pom WSO2 Carbon - Certificate Management API Feature http://wso2.org @@ -100,7 +100,7 @@ p2-feature-gen - org.wso2.carbon.certificate.mgt.api + io.entgra.device.mgt.core.certificate.mgt.api ../../../features/etc/feature.properties diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/build.properties b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/src/main/resources/build.properties similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/build.properties rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/src/main/resources/build.properties diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..05a67d1266 --- /dev/null +++ b/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);\ diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml similarity index 96% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml index 9e72a6dad4..d119473aba 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml +++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.certificate.mgt.cert.admin.api.feature + io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature pom WSO2 Carbon - Admin Certificate Management API Feature http://wso2.org @@ -100,7 +100,7 @@ p2-feature-gen - org.wso2.carbon.certificate.mgt.cert.admin.api + io.entgra.device.mgt.core.certificate.mgt.cert.admin.api ../../../features/etc/feature.properties diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/build.properties b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/src/main/resources/build.properties similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/build.properties rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/src/main/resources/build.properties diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..6a2b123cd4 --- /dev/null +++ b/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);\ diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml similarity index 97% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml index 2797c8c36e..5bde95eef8 100644 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml +++ b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.certificate.mgt.server.feature + io.entgra.device.mgt.core.certificate.mgt.server.feature pom WSO2 Carbon - Certificate Management Server Feature http://wso2.org @@ -108,7 +108,7 @@ p2-feature-gen - org.wso2.carbon.certificate.mgt.server + io.entgra.device.mgt.core.certificate.mgt.server ../../../features/etc/feature.properties diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/build.properties b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/build.properties similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/build.properties rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/build.properties diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf/certificate-config.xml diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf/wso2certs.jks diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/certificate-config.xml.j2 b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/certificate-config.xml.j2 similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/certificate-config.xml.j2 rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/conf_templates/templates/repository/conf/certificate-config.xml.j2 diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/h2.sql b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/h2.sql similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/h2.sql rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/h2.sql diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mysql.sql b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mysql.sql similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mysql.sql rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mysql.sql diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/oracle.sql b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/oracle.sql similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/oracle.sql rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/oracle.sql diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/postgresql.sql b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/postgresql.sql similarity index 100% rename from features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/postgresql.sql rename to features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/postgresql.sql diff --git a/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/p2.inf b/features/certificate-mgt/io.entgra.device.mgt.core.certificate.mgt.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..34fa4f3f5b --- /dev/null +++ b/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);\ diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf deleted file mode 100644 index 6b93638af4..0000000000 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf deleted file mode 100644 index c66894d7fc..0000000000 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf deleted file mode 100644 index 345f751daa..0000000000 --- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/certificate-mgt/pom.xml b/features/certificate-mgt/pom.xml index e89f51e7bc..8999232efa 100644 --- a/features/certificate-mgt/pom.xml +++ b/features/certificate-mgt/pom.xml @@ -33,9 +33,9 @@ http://wso2.org - org.wso2.carbon.certificate.mgt.server.feature - org.wso2.carbon.certificate.mgt.api.feature - org.wso2.carbon.certificate.mgt.cert.admin.api.feature + io.entgra.device.mgt.core.certificate.mgt.server.feature + io.entgra.device.mgt.core.certificate.mgt.api.feature + io.entgra.device.mgt.core.certificate.mgt.cert.admin.api.feature diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml index 39f7c0a612..3e470ec36a 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.defaultrole.manager.feature + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature pom Entgra IoT - Default Role Manager Feature Impl http://entgra.io @@ -82,7 +82,7 @@ p2-feature-gen - io.entgra.device.mgt.extensions.defaultrole.manager + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager ../../etc/feature.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/conf/default-roles-config.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/conf/default-roles-config.xml similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/conf/default-roles-config.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/conf/default-roles-config.xml diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..31681a093e --- /dev/null +++ b/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);\ diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml index f3201fa1c3..85a73f88c9 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature pom WSO2 Carbon - Device Type Deployer Feature http://wso2.org @@ -79,7 +79,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions.device.type.deployer + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer ../../../features/etc/feature.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml similarity index 96% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml index 30a215ed23..5a819e1bfd 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.logger.feature + io.entgra.device.mgt.core.device.mgt.extensions.logger.feature pom Entgra IoT - Logger Plugin Feature Impl http://entgra.io @@ -82,7 +82,7 @@ p2-feature-gen - io.entgra.device.mgt.extensions.logger + io.entgra.device.mgt.core.device.mgt.extensions.logger ../../etc/feature.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.logger.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml index dc085fd158..2e9b228a10 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature pom WSO2 Carbon - FCM Based Push Notification Provider Feature http://wso2.org @@ -79,7 +79,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm ../../../features/etc/feature.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml index abe99698c8..99cf358d36 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature pom WSO2 Carbon - MQTT Based Push Notification Provider Feature http://wso2.org @@ -79,7 +79,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http ../../../features/etc/feature.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml index f0dc60c355..1b4e2e3a8c 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature pom WSO2 Carbon - MQTT Based Push Notification Provider Feature http://wso2.org @@ -79,7 +79,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt ../../../features/etc/feature.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml index e6c7cf1663..195650ae47 100644 --- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature pom WSO2 Carbon - XMPP Based Push Notification Provider Feature http://wso2.org @@ -79,7 +79,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp ../../../features/etc/feature.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/pom.xml b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml similarity index 95% rename from features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/pom.xml rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml index e236ad4601..be29603cb0 100644 --- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/pom.xml +++ b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.device.mgt.extensions.stateengine.feature + io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature pom Entgra IoT - State engine Plugin Feature Impl http://entgra.io @@ -83,7 +83,7 @@ p2-feature-gen - io.entgra.device.mgt.extensions.stateengine + io.entgra.device.mgt.core.device.mgt.extensions.stateengine ../../etc/feature.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/build.properties b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/build.properties rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/src/main/resources/build.properties diff --git a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/src/main/resources/p2.inf rename to features/device-mgt-extensions/io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature/src/main/resources/p2.inf diff --git a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf b/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf deleted file mode 100644 index e5a5f28b87..0000000000 --- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/src/main/resources/p2.inf +++ /dev/null @@ -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);\ diff --git a/features/device-mgt-extensions/pom.xml b/features/device-mgt-extensions/pom.xml index a27c3d662e..0f0c542f6c 100644 --- a/features/device-mgt-extensions/pom.xml +++ b/features/device-mgt-extensions/pom.xml @@ -33,14 +33,14 @@ http://wso2.org - org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature - org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature - org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature - org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature - org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature - io.entgra.device.mgt.extensions.defaultrole.manager.feature - io.entgra.device.mgt.extensions.logger.feature - io.entgra.device.mgt.extensions.stateengine.feature + io.entgra.device.mgt.core.device.mgt.extensions.device.type.deployer.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.fcm.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.mqtt.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.xmpp.feature + io.entgra.device.mgt.core.device.mgt.extensions.push.notification.provider.http.feature + io.entgra.device.mgt.core.device.mgt.extensions.defaultrole.manager.feature + io.entgra.device.mgt.core.device.mgt.extensions.logger.feature + io.entgra.device.mgt.core.device.mgt.extensions.stateengine.feature diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/pom.xml similarity index 97% rename from features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/pom.xml index 95799e533a..bf2294e015 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.api.feature + io.entgra.device.mgt.core.device.mgt.api.feature pom WSO2 Carbon - Device Management API Feature http://wso2.org @@ -123,7 +123,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.api + io.entgra.device.mgt.core.device.mgt.api ../../../features/etc/feature.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/build.properties b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/build.properties rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/src/main/resources/build.properties diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/src/main/resources/p2.inf b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..50b15c9f08 --- /dev/null +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.api.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.device.mgt.api_${feature.version}/webapps/api#device-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v1.0.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.api_${feature.version}/webapps/api#device-mgt-config#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt-config#v1.0.war,overwrite:true);\ diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml similarity index 97% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml index e2ce175aae..cf5693f1b9 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.basics.feature + io.entgra.device.mgt.core.device.mgt.basics.feature pom WSO2 Carbon - Device Management Basics Feature http://wso2.org @@ -84,7 +84,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.basics + io.entgra.device.mgt.core.device.mgt.basics ../../../features/etc/feature.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/apis/admin--OAuth2TokenManagement.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/apis/admin--UserManagementValidateUser.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/build.properties b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/build.properties rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/build.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/datasources/cdm-datasources.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/reporting-mgt-datasources.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/datasources/reporting-mgt-datasources.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/datasources/reporting-mgt-datasources.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/datasources/reporting-mgt-datasources.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/license-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/license-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/license-config.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/license-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/remote-appmanager-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/remote-appmanager-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/remote-appmanager-config.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/remote-appmanager-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/reporting-mgt.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/reporting-mgt.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/reporting-mgt.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/reporting-mgt.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf/traccar-config.xml diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/cdm-datasources.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/reporting-mgt-datasources.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/reporting-mgt-datasources.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/reporting-mgt-datasources.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/reporting-mgt-datasources.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/license-config.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/license-config.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/license-config.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/license-config.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/remote-appmanager-config.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/remote-appmanager-config.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/remote-appmanager-config.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/etc/remote-appmanager-config.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/reporting-mgt.xml.j2 b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/reporting-mgt.xml.j2 similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/reporting-mgt.xml.j2 rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/reporting-mgt.xml.j2 diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/mysql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/mysql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/mysql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/postgresql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/postgresql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/postgresql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/archival/postgresql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/h2.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mssql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/mysql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/postgresql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mssql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mssql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mssql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mssql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mysql.sql b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mysql.sql similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mysql.sql rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cleanup-scripts/mysql.sql diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/email/templates/user-registration.vm diff --git a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/p2.inf b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..e861fe0e56 --- /dev/null +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/p2.inf @@ -0,0 +1,15 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/datasources/cdm-datasources.xml,target:${installFolder}/../../conf/datasources/cdm-datasources.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/datasources/reporting-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/reporting-mgt-datasources.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/mdm-ui-config.xml,target:${installFolder}/../../conf/mdm-ui-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/reporting-mgt.xml,target:${installFolder}/../../conf/reporting-mgt.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/remote-appmanager-config.xml,target:${installFolder}/../../conf/etc/remote-appmanager-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/dbscripts/cleanup-scripts,target:${installFolder}/../../../dbscripts/cleanup-scripts,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/email-templates);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.device.mgt.basics_${feature.version}/conf/traccar-config.xml,target:${installFolder}/../../conf/traccar-config.xml,overwrite:true);\ diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/rxts/license.rxt b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/rxts/license.rxt similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/rxts/license.rxt rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/rxts/license.rxt diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml similarity index 96% rename from features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml index df9a7ed3a3..8c3d8a7658 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.extensions.feature + io.entgra.device.mgt.core.device.mgt.extensions.feature pom WSO2 Carbon - Device Management Extensions Feature http://wso2.org @@ -66,7 +66,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.extensions + io.entgra.device.mgt.core.device.mgt.extensions ../../../features/etc/feature.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/src/main/resources/build.properties b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/src/main/resources/build.properties similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/src/main/resources/build.properties rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/src/main/resources/build.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/src/main/resources/p2.inf b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/src/main/resources/p2.inf similarity index 100% rename from features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/src/main/resources/p2.inf rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.extensions.feature/src/main/resources/p2.inf diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml similarity index 96% rename from features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml index 106e0b5286..9b951a6b5e 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.feature + io.entgra.device.mgt.core.device.mgt.feature pom WSO2 Carbon - Device Management Aggregate Feature http://wso2.org @@ -66,7 +66,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt + io.entgra.device.mgt.core.device.mgt ../../../etc/feature.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml similarity index 97% rename from features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml rename to features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml index 9ce33a4898..1ad082a505 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.device.mgt.server.feature + io.entgra.device.mgt.core.device.mgt.server.feature pom WSO2 Carbon - Device Management Server Feature http://wso2.org @@ -97,7 +97,7 @@ p2-feature-gen - org.wso2.carbon.device.mgt.server + io.entgra.device.mgt.core.device.mgt.server ../../../features/etc/feature.properties diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf deleted file mode 100644 index a313782a24..0000000000 --- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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.device.mgt.api_${feature.version}/webapps/api#device-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt#v1.0.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.api_${feature.version}/webapps/api#device-mgt-config#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#device-mgt-config#v1.0.war,overwrite:true);\ diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/p2.inf deleted file mode 100644 index eead893499..0000000000 --- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,15 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/datasources/cdm-datasources.xml,target:${installFolder}/../../conf/datasources/cdm-datasources.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/datasources/reporting-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/reporting-mgt-datasources.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/mdm-ui-config.xml,target:${installFolder}/../../conf/mdm-ui-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/reporting-mgt.xml,target:${installFolder}/../../conf/reporting-mgt.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/license-config.xml,target:${installFolder}/../../conf/etc/license-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/remote-appmanager-config.xml,target:${installFolder}/../../conf/etc/remote-appmanager-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/dbscripts/cdm,target:${installFolder}/../../../dbscripts/cdm,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/dbscripts/cleanup-scripts,target:${installFolder}/../../../dbscripts/cleanup-scripts,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/rxts/license.rxt,target:${installFolder}/../../../repository/resources/rxts/license.rxt,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/resources/email-templates);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.basics_${feature.version}/conf/traccar-config.xml,target:${installFolder}/../../conf/traccar-config.xml,overwrite:true);\ diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index e9c9099d6f..bc43a95417 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -33,11 +33,11 @@ http://wso2.org - org.wso2.carbon.device.mgt.basics.feature - org.wso2.carbon.device.mgt.server.feature - org.wso2.carbon.device.mgt.api.feature - org.wso2.carbon.device.mgt.feature - org.wso2.carbon.device.mgt.extensions.feature + io.entgra.device.mgt.core.device.mgt.basics.feature + io.entgra.device.mgt.core.device.mgt.server.feature + io.entgra.device.mgt.core.device.mgt.api.feature + io.entgra.device.mgt.core.device.mgt.feature + io.entgra.device.mgt.core.device.mgt.extensions.feature diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml similarity index 97% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml index 606265141a..4b216342e2 100644 --- a/features/heartbeat-management/io.entgra.server.heart.beat.feature/pom.xml +++ b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.server.heart.beat.feature + io.entgra.device.mgt.core.server.heart.beat.feature pom Entgra IoT - Heart Beat Feature http://entgra.io @@ -115,7 +115,7 @@ p2-feature-gen - io.entgra.server.heart.beat + io.entgra.device.mgt.core.server.heart.beat ../../../../features/etc/feature.properties diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/build.properties b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/build.properties similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/build.properties rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/build.properties diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf/heart-beat-config.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf/heart-beat-config.xml similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf/heart-beat-config.xml rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf/heart-beat-config.xml diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/heart-beat-datasources.xml.j2 b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/heart-beat-datasources.xml.j2 similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/heart-beat-datasources.xml.j2 rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/datasources/heart-beat-datasources.xml.j2 diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/heart-beat-config.xml.j2 b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/heart-beat-config.xml.j2 similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/heart-beat-config.xml.j2 rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/conf_templates/templates/repository/conf/heart-beat-config.xml.j2 diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/datasources/heart-beat-datasources.xml b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/datasources/heart-beat-datasources.xml similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/datasources/heart-beat-datasources.xml rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/datasources/heart-beat-datasources.xml diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/h2.sql b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/h2.sql similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/h2.sql rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/h2.sql diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mssql.sql b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mssql.sql similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mssql.sql rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mssql.sql diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mysql.sql b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mysql.sql similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mysql.sql rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/mysql.sql diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/oracle.sql b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/oracle.sql similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/oracle.sql rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/oracle.sql diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/postgresql.sql b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/postgresql.sql similarity index 100% rename from features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/postgresql.sql rename to features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/dbscripts/heart-beat/postgresql.sql diff --git a/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/p2.inf b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..e396a08b9b --- /dev/null +++ b/features/heartbeat-management/io.entgra.device.mgt.core.server.heart.beat.feature/src/main/resources/p2.inf @@ -0,0 +1,9 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.server.heart.beat_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.server.heart.beat_${feature.version}/conf/heart-beat-config.xml,target:${installFolder}/../../conf/heart-beat-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.server.heart.beat_${feature.version}/dbscripts/heart-beat/,target:${installFolder}/../../../dbscripts/heart-beat,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.server.heart.beat_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ + +instructions.unconfigure = \ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/heart-beat-datasources.xml);\ +org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/heart-beat);\ diff --git a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/p2.inf b/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/p2.inf deleted file mode 100644 index 55584ad49a..0000000000 --- a/features/heartbeat-management/io.entgra.server.heart.beat.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,9 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.server.heart.beat_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.server.heart.beat_${feature.version}/conf/heart-beat-config.xml,target:${installFolder}/../../conf/heart-beat-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.server.heart.beat_${feature.version}/dbscripts/heart-beat/,target:${installFolder}/../../../dbscripts/heart-beat,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.server.heart.beat_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ - -instructions.unconfigure = \ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../conf/datasources/heart-beat-datasources.xml);\ -org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/heart-beat);\ diff --git a/features/heartbeat-management/pom.xml b/features/heartbeat-management/pom.xml index 274c5e14f0..6cb70b919b 100644 --- a/features/heartbeat-management/pom.xml +++ b/features/heartbeat-management/pom.xml @@ -34,7 +34,7 @@ http://entgra.io - io.entgra.server.heart.beat.feature + io.entgra.device.mgt.core.server.heart.beat.feature diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml similarity index 96% rename from features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml rename to features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml index fd25910d68..8eb71945f7 100644 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml +++ b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - org.wso2.carbon.identity.jwt.client.extension.feature + io.entgra.device.mgt.core.identity.jwt.client.extension.feature pom WSO2 Carbon - JWT Client Feature http://wso2.org @@ -86,7 +86,7 @@ p2-feature-gen - org.wso2.carbon.identity.jwt.client.extension + io.entgra.device.mgt.core.identity.jwt.client.extension ../../../features/etc/feature.properties diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/build.properties b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/build.properties similarity index 100% rename from features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/build.properties rename to features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/build.properties diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/jwt.properties similarity index 100% rename from features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/jwt.properties rename to features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/jwt.properties diff --git a/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/p2.inf b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..038d56f855 --- /dev/null +++ b/features/jwt-client/io.entgra.device.mgt.core.identity.jwt.client.extension.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.identity.jwt.client.extension_${feature.version}/jwt.properties,target:${installFolder}/../../conf/etc/jwt.properties,overwrite:true);\ diff --git a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/p2.inf b/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/p2.inf deleted file mode 100644 index 5678ff874e..0000000000 --- a/features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.jwt.client.extension_${feature.version}/jwt.properties,target:${installFolder}/../../conf/etc/jwt.properties,overwrite:true);\ diff --git a/features/jwt-client/pom.xml b/features/jwt-client/pom.xml index e4aec8d1ce..59a5fcd0bf 100644 --- a/features/jwt-client/pom.xml +++ b/features/jwt-client/pom.xml @@ -34,7 +34,7 @@ http://wso2.org - org.wso2.carbon.identity.jwt.client.extension.feature + io.entgra.device.mgt.core.identity.jwt.client.extension.feature diff --git a/features/logger/io.entgra.notification.logger.feature/pom.xml b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml similarity index 96% rename from features/logger/io.entgra.notification.logger.feature/pom.xml rename to features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml index f4157670db..8a6c45ed74 100644 --- a/features/logger/io.entgra.notification.logger.feature/pom.xml +++ b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - io.entgra.notification.logger.feature + io.entgra.device.mgt.core.notification.logger.feature pom Entgra - Notification logger http://entgra.io @@ -94,7 +94,7 @@ p2-feature-gen - io.entgra.notification.logger + io.entgra.device.mgt.core.notification.logger ../../../features/etc/feature.properties diff --git a/features/logger/io.entgra.notification.logger.feature/src/main/resources/build.properties b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/src/main/resources/build.properties similarity index 100% rename from features/logger/io.entgra.notification.logger.feature/src/main/resources/build.properties rename to features/logger/io.entgra.device.mgt.core.notification.logger.feature/src/main/resources/build.properties diff --git a/features/logger/io.entgra.notification.logger.feature/src/main/resources/p2.inf b/features/logger/io.entgra.device.mgt.core.notification.logger.feature/src/main/resources/p2.inf similarity index 100% rename from features/logger/io.entgra.notification.logger.feature/src/main/resources/p2.inf rename to features/logger/io.entgra.device.mgt.core.notification.logger.feature/src/main/resources/p2.inf diff --git a/features/logger/pom.xml b/features/logger/pom.xml index d0496c01e5..367189d47a 100644 --- a/features/logger/pom.xml +++ b/features/logger/pom.xml @@ -34,7 +34,7 @@ http://entgra.io - io.entgra.notification.logger.feature + io.entgra.device.mgt.core.notification.logger.feature diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/pom.xml b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml similarity index 96% rename from features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/pom.xml rename to features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml index 91d491b1a6..3eb6ffc36a 100644 --- a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/pom.xml +++ b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/pom.xml @@ -29,7 +29,7 @@ 4.0.0 - io.entgra.device.mgt.operation.template.feature + io.entgra.device.mgt.core.operation.template.feature pom Entgra IoT - Operation Template Management Feature Impl http://entgra.io @@ -83,7 +83,7 @@ p2-feature-gen - io.entgra.device.mgt.operation.template + io.entgra.device.mgt.core.operation.template ../../etc/feature.properties diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/src/resources/build.properties b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/src/resources/build.properties similarity index 100% rename from features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/src/resources/build.properties rename to features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/src/resources/build.properties diff --git a/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/src/resources/p2.inf b/features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/src/resources/p2.inf similarity index 100% rename from features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.operation.template.feature/src/resources/p2.inf rename to features/operation-template-mgt-plugin-feature/io.entgra.device.mgt.core.operation.template.feature/src/resources/p2.inf diff --git a/features/operation-template-mgt-plugin-feature/pom.xml b/features/operation-template-mgt-plugin-feature/pom.xml index 94b1b938d5..cded6240b9 100644 --- a/features/operation-template-mgt-plugin-feature/pom.xml +++ b/features/operation-template-mgt-plugin-feature/pom.xml @@ -35,7 +35,7 @@ http://entgra.io - io.entgra.device.mgt.operation.template.feature + io.entgra.device.mgt.core.operation.template.feature \ No newline at end of file diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml similarity index 97% rename from features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml rename to features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml index 0cab934bf7..44e47430f7 100644 --- a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml +++ b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/pom.xml @@ -28,7 +28,7 @@ 4.0.0 - org.wso2.carbon.policy.mgt.server.feature + io.entgra.device.mgt.core.policy.mgt.server.feature pom WSO2 Carbon - Policy Management Server Feature http://wso2.org @@ -97,7 +97,7 @@ p2-feature-gen - org.wso2.carbon.policy.mgt.server + io.entgra.device.mgt.core.policy.mgt.server ../../../features/etc/feature.properties diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/src/main/resources/build.properties b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/src/main/resources/build.properties similarity index 100% rename from features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/src/main/resources/build.properties rename to features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/src/main/resources/build.properties diff --git a/features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/src/main/resources/p2.inf b/features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/src/main/resources/p2.inf similarity index 100% rename from features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/src/main/resources/p2.inf rename to features/policy-mgt/io.entgra.device.mgt.core.policy.mgt.server.feature/src/main/resources/p2.inf diff --git a/features/policy-mgt/pom.xml b/features/policy-mgt/pom.xml index a6930cf836..0b9372a42e 100644 --- a/features/policy-mgt/pom.xml +++ b/features/policy-mgt/pom.xml @@ -35,7 +35,7 @@ http://wso2.org - org.wso2.carbon.policy.mgt.server.feature + io.entgra.device.mgt.core.policy.mgt.server.feature diff --git a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml similarity index 96% rename from features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml rename to features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml index 8496f57652..8537a46111 100644 --- a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/pom.xml +++ b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.device.mgt.subtype.mgt.feature + io.entgra.device.mgt.core.subtype.mgt.feature pom Entgra IoT - Subtype Management Feature Impl http://entgra.io @@ -81,7 +81,7 @@ p2-feature-gen - io.entgra.device.mgt.subtype.mgt + io.entgra.device.mgt.core.subtype.mgt ../../etc/feature.properties diff --git a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/src/main/resources/build.properties b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/src/main/resources/build.properties similarity index 100% rename from features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/src/main/resources/build.properties rename to features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/src/main/resources/build.properties diff --git a/features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/src/main/resources/p2.inf b/features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/src/main/resources/p2.inf similarity index 100% rename from features/subtype-mgt/io.entgra.device.mgt.subtype.mgt.feature/src/main/resources/p2.inf rename to features/subtype-mgt/io.entgra.device.mgt.core.subtype.mgt.feature/src/main/resources/p2.inf diff --git a/features/subtype-mgt/pom.xml b/features/subtype-mgt/pom.xml index c1901ef71a..5cc0971566 100644 --- a/features/subtype-mgt/pom.xml +++ b/features/subtype-mgt/pom.xml @@ -33,7 +33,7 @@ http://entgra.io - io.entgra.device.mgt.subtype.mgt.feature + io.entgra.device.mgt.core.subtype.mgt.feature diff --git a/features/task-mgt/io.entgra.task.mgt.feature/pom.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml similarity index 96% rename from features/task-mgt/io.entgra.task.mgt.feature/pom.xml rename to features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml index f8627f8b0f..1325658984 100755 --- a/features/task-mgt/io.entgra.task.mgt.feature/pom.xml +++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - io.entgra.task.mgt.feature + io.entgra.device.mgt.core.task.mgt.feature pom Entgra IoT - Task Manager Feature http://wso2.org @@ -81,7 +81,7 @@ p2-feature-gen - io.entgra.task.mgt + io.entgra.device.mgt.core.task.mgt ../../../features/etc/feature.properties diff --git a/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/build.properties b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/build.properties similarity index 100% rename from features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/build.properties rename to features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/build.properties diff --git a/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/conf/task-mgt-config.xml b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/conf/task-mgt-config.xml similarity index 100% rename from features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/conf/task-mgt-config.xml rename to features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/conf/task-mgt-config.xml diff --git a/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/conf_templates/templates/repository/conf/task-mgt-config.xml.j2 b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/conf_templates/templates/repository/conf/task-mgt-config.xml.j2 similarity index 100% rename from features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/conf_templates/templates/repository/conf/task-mgt-config.xml.j2 rename to features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/conf_templates/templates/repository/conf/task-mgt-config.xml.j2 diff --git a/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/p2.inf b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.feature/src/main/resources/p2.inf new file mode 100755 index 0000000000..d3137907fa --- /dev/null +++ b/features/task-mgt/io.entgra.device.mgt.core.task.mgt.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.task.mgt_${feature.version}/conf/task-mgt-config.xml,target:${installFolder}/../../../repository/conf/task-mgt-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.task.mgt_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ \ No newline at end of file diff --git a/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/p2.inf b/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/p2.inf deleted file mode 100755 index 58012d9c01..0000000000 --- a/features/task-mgt/io.entgra.task.mgt.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,3 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.task.mgt_${feature.version}/conf/task-mgt-config.xml,target:${installFolder}/../../../repository/conf/task-mgt-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.task.mgt_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ \ No newline at end of file diff --git a/features/task-mgt/pom.xml b/features/task-mgt/pom.xml index 317a0768dd..9451476a03 100755 --- a/features/task-mgt/pom.xml +++ b/features/task-mgt/pom.xml @@ -32,7 +32,7 @@ http://entgra.io - io.entgra.task.mgt.feature + io.entgra.device.mgt.core.task.mgt.feature diff --git a/features/tenant-mgt/io.entgra.tenant.mgt.server.feature/pom.xml b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml similarity index 96% rename from features/tenant-mgt/io.entgra.tenant.mgt.server.feature/pom.xml rename to features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml index 59af9d9c61..0fa4ed6dce 100644 --- a/features/tenant-mgt/io.entgra.tenant.mgt.server.feature/pom.xml +++ b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - io.entgra.tenant.mgt.server.feature + io.entgra.device.mgt.core.tenant.mgt.server.feature Entgra IoT - Tenant Management Server Feature Entgra IoT - Tenant Management Server Feature pom @@ -80,7 +80,7 @@ p2-feature-gen - io.entgra.tenant.mgt.server + io.entgra.device.mgt.core.tenant.mgt.server ../../etc/feature.properties diff --git a/features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/build.properties b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/src/main/resources/build.properties similarity index 100% rename from features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/build.properties rename to features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/src/main/resources/build.properties diff --git a/features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/p2.inf b/features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/src/main/resources/p2.inf similarity index 100% rename from features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/p2.inf rename to features/tenant-mgt/io.entgra.device.mgt.core.tenant.mgt.server.feature/src/main/resources/p2.inf diff --git a/features/tenant-mgt/pom.xml b/features/tenant-mgt/pom.xml index 603405ad77..98ab437a80 100644 --- a/features/tenant-mgt/pom.xml +++ b/features/tenant-mgt/pom.xml @@ -31,6 +31,6 @@ Entgra IoT - Tenant Management Feature - io.entgra.tenant.mgt.server.feature + io.entgra.device.mgt.core.tenant.mgt.server.feature \ No newline at end of file diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml similarity index 96% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml index ac1dc53bc0..f36f5205ea 100644 --- a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/pom.xml +++ b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.email.sender.feature + io.entgra.device.mgt.core.email.sender.feature pom WSO2 Carbon - Email Sender Feature http://wso2.org @@ -85,7 +85,7 @@ p2-feature-gen - org.wso2.carbon.email.sender + io.entgra.device.mgt.core.email.sender ../../../etc/feature.properties diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/build.properties similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/build.properties rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/build.properties diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/conf/email-sender-config.xml similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf/email-sender-config.xml rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/conf/email-sender-config.xml diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf_templates/templates/repository/conf/etc/email-sender-config.xml.j2 b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/conf_templates/templates/repository/conf/etc/email-sender-config.xml.j2 similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/conf_templates/templates/repository/conf/etc/email-sender-config.xml.j2 rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/conf_templates/templates/repository/conf/etc/email-sender-config.xml.j2 diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/default-enrollment-invitation.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/default.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/default.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/default.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/enrollment-guide.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/enrollment-guide.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/enrollment-guide.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/enrollment-guide.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/policy-violating-notifier.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/share-product-download-url.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/share-product-download-url.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/share-product-download-url.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/share-product-download-url.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-enrollment.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-registration.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-registration.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-registration.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-verify.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-verify.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-verify.vm diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-welcome.vm similarity index 100% rename from features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/email/templates/user-welcome.vm rename to features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/email/templates/user-welcome.vm diff --git a/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/p2.inf b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..8f0c29c5f3 --- /dev/null +++ b/features/transport-mgt/email-sender/io.entgra.device.mgt.core.email.sender.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.email.sender_${feature.version}/conf/email-sender-config.xml,target:${installFolder}/../../conf/etc/email-sender-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.email.sender_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.email.sender_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ diff --git a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf b/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf deleted file mode 100644 index 03d6cc09f9..0000000000 --- a/features/transport-mgt/email-sender/org.wso2.carbon.email.sender.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,4 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.email.sender_${feature.version}/conf/email-sender-config.xml,target:${installFolder}/../../conf/etc/email-sender-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.email.sender_${feature.version}/email/templates,target:${installFolder}/../../../repository/resources/email-templates,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.email.sender_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ diff --git a/features/transport-mgt/email-sender/pom.xml b/features/transport-mgt/email-sender/pom.xml index 838dbebde7..aa3b05ee62 100644 --- a/features/transport-mgt/email-sender/pom.xml +++ b/features/transport-mgt/email-sender/pom.xml @@ -34,7 +34,7 @@ http://wso2.org - org.wso2.carbon.email.sender.feature + io.entgra.device.mgt.core.email.sender.feature diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml similarity index 96% rename from features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml rename to features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml index c8cd7879db..5912af2341 100644 --- a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.transport.mgt.sms.handler.api.feature + io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature pom Entgra - SMS Handler API Feature https://entgra.io @@ -99,7 +99,7 @@ p2-feature-gen - io.entgra.transport.mgt.sms.handler.api + io.entgra.device.mgt.core.transport.mgt.sms.handler.api ../../../etc/feature.properties diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties similarity index 100% rename from features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties rename to features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/src/main/resources/build.properties diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..d307543943 --- /dev/null +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.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.transport.mgt.sms.handler.api_${feature.version}/webapps/api#sms-handler#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#sms-handler#v1.0.war,overwrite:true);\ diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml similarity index 96% rename from features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml rename to features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml index e1078892e8..c34e0867ee 100644 --- a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/pom.xml +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - io.entgra.transport.mgt.sms.handler.server.feature + io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature pom Entgra - SMS Handler Server Feature https://entgra.io @@ -84,7 +84,7 @@ p2-feature-gen - io.entgra.transport.mgt.sms.handler.server + io.entgra.device.mgt.core.transport.mgt.sms.handler.server ../../../etc/feature.properties diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml similarity index 100% rename from features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml rename to features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf/sms-config.xml diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 similarity index 100% rename from features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 rename to features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/conf_templates/templates/repository/conf/sms-config.xml.j2 diff --git a/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..b860e78a95 --- /dev/null +++ b/features/transport-mgt/sms-handler/io.entgra.device.mgt.core.transport.mgt.sms.handler.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.transport.mgt.sms.handler.server_${feature.version}/conf/sms-config.xml,target:${installFolder}/../../conf/sms-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.transport.mgt.sms.handler.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ + +instructions.unconfigure = \ diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf deleted file mode 100644 index ee42576e14..0000000000 --- a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api.feature/src/main/resources/p2.inf +++ /dev/null @@ -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.transport.mgt.sms.handler.api_${feature.version}/webapps/api#sms-handler#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#sms-handler#v1.0.war,overwrite:true);\ diff --git a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf b/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf deleted file mode 100644 index 958e75d3ab..0000000000 --- a/features/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,5 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.transport.mgt.sms.handler.server_${feature.version}/conf/sms-config.xml,target:${installFolder}/../../conf/sms-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.transport.mgt.sms.handler.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ - -instructions.unconfigure = \ diff --git a/features/transport-mgt/sms-handler/pom.xml b/features/transport-mgt/sms-handler/pom.xml index fcfd881018..e96d8ea539 100644 --- a/features/transport-mgt/sms-handler/pom.xml +++ b/features/transport-mgt/sms-handler/pom.xml @@ -33,8 +33,8 @@ http://entgra.io - io.entgra.transport.mgt.sms.handler.server.feature - io.entgra.transport.mgt.sms.handler.api.feature + io.entgra.device.mgt.core.transport.mgt.sms.handler.server.feature + io.entgra.device.mgt.core.transport.mgt.sms.handler.api.feature diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml similarity index 96% rename from features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml rename to features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml index 5c77cd533a..68f8c8399f 100644 --- a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml +++ b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/pom.xml @@ -25,7 +25,7 @@ 4.0.0 - io.entgra.ui.request.interceptor.feature + io.entgra.device.mgt.core.ui.request.interceptor.feature Entgra - UI Request Interceptor Feature Proxy servlet to handle requests generated from UI applications to communicate with backend @@ -98,7 +98,7 @@ p2-feature-gen - io.entgra.ui.request.interceptor + io.entgra.device.mgt.core.ui.request.interceptor ../../../features/etc/feature.properties diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/build.properties b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/build.properties similarity index 100% rename from features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/build.properties rename to features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/build.properties diff --git a/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/p2.inf b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..df48e94eb2 --- /dev/null +++ b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/p2.inf @@ -0,0 +1,7 @@ +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.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/publisher-ui-request-handler.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/store-ui-request-handler.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/entgra-ui-request-handler.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/mdm-reports-ui-request-handler.war,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.ui.request.interceptor_${feature.version}/payloads/,target:${installFolder}/../../resources/payloads/,overwrite:true);\ diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/payloads/get-app-request.xml b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/payloads/get-app-request.xml similarity index 100% rename from features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/payloads/get-app-request.xml rename to features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/payloads/get-app-request.xml diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/payloads/update-app-request.xml b/features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/payloads/update-app-request.xml similarity index 100% rename from features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/payloads/update-app-request.xml rename to features/ui-request-interceptor/io.entgra.device.mgt.core.ui.request.interceptor.feature/src/main/resources/payloads/update-app-request.xml diff --git a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf deleted file mode 100644 index d44e4112ef..0000000000 --- a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,7 +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.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/publisher-ui-request-handler.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/store-ui-request-handler.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/entgra-ui-request-handler.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/mdm-reports-ui-request-handler.war,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/payloads/,target:${installFolder}/../../resources/payloads/,overwrite:true);\ diff --git a/features/ui-request-interceptor/pom.xml b/features/ui-request-interceptor/pom.xml index 04ce2e51a6..9f96ff460c 100644 --- a/features/ui-request-interceptor/pom.xml +++ b/features/ui-request-interceptor/pom.xml @@ -35,6 +35,6 @@ pom - io.entgra.ui.request.interceptor.feature + io.entgra.device.mgt.core.ui.request.interceptor.feature diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml similarity index 95% rename from features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml rename to features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml index 331a2ca489..19f31c205b 100644 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml +++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/pom.xml @@ -27,7 +27,7 @@ 4.0.0 - org.wso2.carbon.webapp.authenticator.framework.server.feature + io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature pom WSO2 Carbon - Webapp Authenticator Framework Server Feature http://wso2.org @@ -80,7 +80,7 @@ p2-feature-gen - org.wso2.carbon.webapp.authenticator.framework.server + io.entgra.device.mgt.core.webapp.authenticator.framework.server ../../../features/etc/feature.properties diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/build.properties b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/build.properties similarity index 100% rename from features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/build.properties rename to features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/build.properties diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml similarity index 100% rename from features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml rename to features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 similarity index 100% rename from features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 rename to features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/conf_templates/templates/repository/conf/etc/webapp-authenticator-config.xml.j2 diff --git a/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..cfcf93f5da --- /dev/null +++ b/features/webapp-authenticator-framework/io.entgra.device.mgt.core.webapp.authenticator.framework.server.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.webapp.authenticator.framework.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.device.mgt.core.webapp.authenticator.framework.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ diff --git a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf b/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf deleted file mode 100644 index a526d71269..0000000000 --- a/features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/p2.inf +++ /dev/null @@ -1,3 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.webapp.authenticator.framework.server_${feature.version}/conf/webapp-authenticator-config.xml,target:${installFolder}/../../conf/etc/webapp-authenticator-config.xml,overwrite:true);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.webapp.authenticator.framework.server_${feature.version}/conf_templates/,target:${installFolder}/../../resources/conf/,overwrite:true);\ diff --git a/features/webapp-authenticator-framework/pom.xml b/features/webapp-authenticator-framework/pom.xml index 8baec23ce1..baa7ba13e1 100644 --- a/features/webapp-authenticator-framework/pom.xml +++ b/features/webapp-authenticator-framework/pom.xml @@ -34,7 +34,7 @@ http://wso2.org - org.wso2.carbon.webapp.authenticator.framework.server.feature + io.entgra.device.mgt.core.webapp.authenticator.framework.server.feature diff --git a/pom.xml b/pom.xml index 5255c8c77a..933b53b30b 100644 --- a/pom.xml +++ b/pom.xml @@ -284,12 +284,6 @@ zip ${carbon.device.mgt.version} - - io.entgra.device.mgt.core - org.wso2.carbon.device.mgt.v09.api.feature - zip - ${carbon.device.mgt.version} - io.entgra.device.mgt.core org.wso2.carbon.apimgt.application.extension @@ -310,30 +304,7 @@ org.wso2.carbon.apimgt.application.extension.api ${carbon.device.mgt.version} - - io.entgra.device.mgt.core - io.entgra.analytics.mgt.grafana.proxy.api.feature - zip - ${carbon.device.mgt.version} - - - io.entgra.device.mgt.core - io.entgra.analytics.mgt.grafana.proxy.server.feature - zip - ${carbon.device.mgt.version} - - - io.entgra.device.mgt.core - io.entgra.application.mgt.server.feature - zip - ${carbon.device.mgt.version} - - - io.entgra.device.mgt.core - io.entgra.application.mgt.api.feature - zip - ${carbon.device.mgt.version} - + io.entgra.device.mgt.core io.entgra.server.bootup.heartbeat.beacon @@ -409,12 +380,7 @@ io.entgra.task.mgt.watcher ${carbon.device.mgt.version} - - io.entgra.device.mgt.core - io.entgra.task.mgt.feature - zip - ${carbon.device.mgt.version} - + @@ -422,12 +388,7 @@ io.entgra.device.mgt.subtype.mgt ${carbon.device.mgt.version} - - io.entgra.device.mgt.core - io.entgra.device.mgt.subtype.mgt.feature - zip - ${carbon.device.mgt.version} - +