From e9954dab4bdace57167800f6b86242de87e52783 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Sun, 27 Mar 2016 17:11:31 +0530 Subject: [PATCH] merging device.mgt.ui feature --- .../pom.xml | 123 ++++++++++++++++++ .../src/main/resources/build.properties | 1 + .../src/main/resources/p2.inf | 3 + features/device-mgt/pom.xml | 1 + pom.xml | 5 + 5 files changed, 133 insertions(+) create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/build.properties create mode 100644 features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/p2.inf diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml new file mode 100644 index 0000000000..883cc9f3c3 --- /dev/null +++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml @@ -0,0 +1,123 @@ + + + + + + + org.wso2.carbon.devicemgt + device-mgt-feature + 1.1.0-SNAPSHOT + ../pom.xml + + + 4.0.0 + org.wso2.carbon.device.mgt.ui.feature + pom + WSO2 Carbon - Device Management Base UI Feature + http://wso2.org + This feature contains the base UI required for Device Management + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack + package + + unpack + + + + + org.wso2.carbon.devicemgt + org.wso2.carbon.device.mgt.ui + + ${project.version} + zip + true + + ${project.build.directory}/maven-shared-archive-resources/jaggeryapps/devicemgt-cdmf + + **/* + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + generate-resources + + copy-resources + + + src/main/resources + + + resources + + build.properties + p2.inf + + + + + + + + + org.wso2.maven + carbon-p2-plugin + + + p2-feature-generation + package + + p2-feature-gen + + + org.wso2.carbon.device.mgt.ui + ../../../features/etc/feature.properties + + + + org.wso2.carbon.p2.category.type:server + + org.eclipse.equinox.p2.type.group:false + + + + + + + + + + + diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/build.properties b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/build.properties new file mode 100644 index 0000000000..9c86577d76 --- /dev/null +++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/build.properties @@ -0,0 +1 @@ +custom = true diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/p2.inf new file mode 100644 index 0000000000..fe2cbf1e96 --- /dev/null +++ b/features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/src/main/resources/p2.inf @@ -0,0 +1,3 @@ +instructions.configure = \ +org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/devicemgt-cdmf);\ +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.devicemgt.ui_${feature.version}/jaggeryapps/devicemgt-cdmf,target:${installFolder}/../../deployment/server/jaggeryapps/devicemgt-cdmf,overwrite:true);\ \ No newline at end of file diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index a754752d10..8ab63d2138 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -36,6 +36,7 @@ org.wso2.carbon.device.mgt.server.feature + org.wso2.carbon.device.mgt.ui.feature org.wso2.carbon.device.mgt.extensions.feature org.wso2.carbon.device.mgt.analytics.data.publisher.feature diff --git a/pom.xml b/pom.xml index d478f04809..c4b62cad54 100644 --- a/pom.xml +++ b/pom.xml @@ -1515,6 +1515,11 @@ maven-resources-plugin 2.6 + + org.wso2.maven + carbon-p2-plugin + ${carbon.p2.plugin.version} +