From 5537ee5cd0a95c6a6f04ca15904d80f4051668af Mon Sep 17 00:00:00 2001 From: megala21 Date: Mon, 18 Sep 2017 14:48:24 +0530 Subject: [PATCH] Adding publisher ui feature --- .../pom.xml | 4 +- .../pom.xml | 88 +++++++++---------- .../src/main/resources/p2.inf | 3 +- features/application-mgt/pom.xml | 4 +- pom.xml | 2 +- 5 files changed, 46 insertions(+), 55 deletions(-) diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml index 913e58579a..2bc9d23ed0 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml @@ -42,7 +42,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.ui.feature + org.wso2.carbon.device.application.mgt.publisher.ui.feature zip @@ -77,7 +77,7 @@ org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version} - org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.ui.feature:${carbon.device.mgt.version} + org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version} javax.servlet.jsp:javax.servlet.jsp-api diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml index d57429efb8..4b83c8e705 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml @@ -19,51 +19,26 @@ - 4.0.0 - org.wso2.carbon.devicemgt application-mgt-feature 3.0.46-SNAPSHOT + ../pom.xml + + 4.0.0 org.wso2.carbon.device.application.mgt.publisher.ui.feature 3.0.46-SNAPSHOT + pom + WSO2 Carbon - Application Management Publisher UI Feature + http://wso2.org + This feature contains Application Management publisher UI - - - org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.publisher.ui - - - - maven-resources-plugin - - - copy-p2-info - generate-resources - - copy-resources - - - ${basedir}/target/maven-shared-archive-resources - - - resources - - p2.inf - - - - - - - org.apache.maven.plugins maven-dependency-plugin - false unpack @@ -76,33 +51,58 @@ org.wso2.carbon.devicemgt org.wso2.carbon.device.application.mgt.publisher.ui + ${project.version} jar true - ${basedir}/target/maven-shared-archive-resources/ + + ${project.build.directory}/maven-shared-archive-resources - - publisher/public/** - + **/* + + 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 - ${carbon.p2.plugin.version} - 4-p2-feature-generation + p2-feature-generation package p2-feature-gen - org.wso2.carbon.device.application.mgt - ../../etc/feature.properties + org.wso2.carbon.device.application.mgt.publisher.ui + ../../../features/etc/feature.properties + org.wso2.carbon.p2.category.type:server @@ -116,14 +116,6 @@ - - - src/main/resources - - - ${project.build.directory} - - diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf index 18f28aaa8d..53d522af6e 100644 --- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf +++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/src/main/resources/p2.inf @@ -1,5 +1,4 @@ instructions.configure = \ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps);\ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/publisher/);\ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application -.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/webapps/publisher/,overwrite:true);\ \ No newline at end of file +org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.publisher.ui_${feature.version}/publisher/public/,target:${installFolder}/../../deployment/server/webapps/publisher/,overwrite:true);\ \ No newline at end of file diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index f70cb75863..fc0e07a23a 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -35,10 +35,10 @@ org.wso2.carbon.device.application.mgt.api.feature + org.wso2.carbon.device.application.mgt.server.feature + org.wso2.carbon.device.application.mgt.publisher.ui.feature org.wso2.carbon.device.application.mgt.feature - org.wso2.carbon.device.application.mgt.server.feature - org.wso2.carbon.device.application.mgt.publisher.ui.feature \ No newline at end of file diff --git a/pom.xml b/pom.xml index 21c1a231fd..dcb5432ce8 100644 --- a/pom.xml +++ b/pom.xml @@ -331,7 +331,7 @@ org.wso2.carbon.devicemgt - org.wso2.carbon.device.application.mgt.ui.feature + org.wso2.carbon.device.application.mgt.publisher.ui.feature zip ${carbon.device.mgt.version}