From 5537ee5cd0a95c6a6f04ca15904d80f4051668af Mon Sep 17 00:00:00 2001
From: megala21 <ktumegala@yahoo.com>
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 @@
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.ui.feature</artifactId>
+            <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
             <type>zip</type>
         </dependency>
         <dependency>
@@ -77,7 +77,7 @@
                             </adviceFile>
                             <includedFeatures>
                                 <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}</includedFeatureDef>
-                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.ui.feature:${carbon.device.mgt.version}</includedFeatureDef>
+                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.publisher.ui.feature:${carbon.device.mgt.version}</includedFeatureDef>
                             </includedFeatures>
                             <bundles>
                                 <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
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 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>application-mgt-feature</artifactId>
         <version>3.0.46-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
+    <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
     <version>3.0.46-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Application Management Publisher UI Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains Application Management publisher UI</description>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui</artifactId>
-        </dependency>
-    </dependencies>
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-p2-info</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/maven-shared-archive-resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>p2.inf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <inherited>false</inherited>
                 <executions>
                     <execution>
                         <id>unpack</id>
@@ -76,33 +51,58 @@
                                 <artifactItem>
                                     <groupId>org.wso2.carbon.devicemgt</groupId>
                                     <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui</artifactId>
+                                    <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${basedir}/target/maven-shared-archive-resources/
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources
                                     </outputDirectory>
-                                    <includes>
-                                        publisher/public/**
-                                    </includes>
+                                    <includes>**/*</includes>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
-                <version>${carbon.p2.plugin.version}</version>
                 <executions>
                     <execution>
-                        <id>4-p2-feature-generation</id>
+                        <id>p2-feature-generation</id>
                         <phase>package</phase>
                         <goals>
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.application.mgt</id>
-                            <propertiesFile>../../etc/feature.properties</propertiesFile>
+                            <id>org.wso2.carbon.device.application.mgt.publisher.ui</id>
+                            <propertiesFile>../../../features/etc/feature.properties
+                            </propertiesFile>
                             <adviceFile>
                                 <properties>
                                     <propertyDef>org.wso2.carbon.p2.category.type:server
@@ -116,14 +116,6 @@
                 </executions>
             </plugin>
         </plugins>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>${project.build.directory}</directory>
-            </resource>
-        </resources>
     </build>
 
 </project>
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 @@
 
     <modules>
         <module>org.wso2.carbon.device.application.mgt.api.feature</module>
+        <module>org.wso2.carbon.device.application.mgt.server.feature</module>
+        <module>org.wso2.carbon.device.application.mgt.publisher.ui.feature</module>
         <!--<module>org.wso2.carbon.device.application.mgt.ui.feature</module>-->
         <module>org.wso2.carbon.device.application.mgt.feature</module>
         <!--<module>org.wso2.carbon.device.application.mgt.extensions.feature</module>-->
-        <module>org.wso2.carbon.device.application.mgt.server.feature</module>
-        <module>org.wso2.carbon.device.application.mgt.publisher.ui.feature</module>
     </modules>
 </project>
\ 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 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.application.mgt.ui.feature</artifactId>
+                <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
                 <type>zip</type>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>