From f38b3423a4ce40d8b5801243d682aa423abbd753 Mon Sep 17 00:00:00 2001
From: guochuyicmri <guochuyi@chinamobile.com>
Date: Thu, 30 May 2019 18:52:03 +0800
Subject: Fix UUI frontend docker image creation failure

Change-Id: I717e982d453bb6e30ec4f2b0e278ebb043fcef71
Issue-ID: USECASEUI-273
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
---
 distribution/pom.xml     | 36 +++++++++++++++++++-----------------
 usecaseui-portal/pom.xml | 22 ----------------------
 2 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index a41f6ca5..66c61bae 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -66,67 +66,68 @@
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-resources-portal-linux</id>
+                        <id>copy-tomcat-resources-linux64</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${linux64outputdir}/tomcat/webapps/</outputDirectory>
+                            <outputDirectory>${linux64outputdir}/tomcat</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../usecaseui-portal/</directory>
-                                    <filtering>false</filtering>
+                                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
                                     <includes>
-                                        <include>usecase-ui.war</include>
+                                        <include>**/*</include>
                                     </includes>
+                                    <excludes>
+                                        <exclude>**/*.bat</exclude>
+                                    </excludes>
                                 </resource>
                             </resources>
-                            <overwrite>true</overwrite>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>copy-resources-linux64</id>
+                        <id>copy-resources-portal-linux</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${linux64outputdir}</outputDirectory>
+                            <outputDirectory>${linux64outputdir}/tomcat/webapps/usecase-ui</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>src/main/assembly/</directory>
+                                    <directory>${basedir}/../usecaseui-portal/usecase-ui</directory>
                                     <filtering>false</filtering>
                                     <includes>
                                         <include>**/*</include>
                                     </includes>
-                                    <excludes>
-                                        <exclude>**/*.bat</exclude>
-                                    </excludes>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>copy-tomcat-resources-linux64</id>
+                        <id>copy-resources-linux64</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${linux64outputdir}/tomcat</outputDirectory>
+                            <outputDirectory>${linux64outputdir}</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
+                                    <directory>src/main/assembly/</directory>
+                                    <filtering>false</filtering>
                                     <includes>
                                         <include>**/*</include>
                                     </includes>
                                     <excludes>
                                         <exclude>**/*.bat</exclude>
+                                        <exclude>Dockerfile</exclude>
                                     </excludes>
                                 </resource>
                             </resources>
+                            <overwrite>true</overwrite>
                         </configuration>
                     </execution>
                     <execution>
@@ -154,6 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.8</version>
                 <executions>
                     <execution>
                         <id>distribution</id>
@@ -162,7 +164,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target name="distribution">
+                            <tasks name="${project.artifactId}">
                                 <tar destfile="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
                                     <tarfileset dir="${linux64outputdir}" filemode="0644" dirmode="0755">
                                         <exclude name="**/*.sh"/>
@@ -172,7 +174,7 @@
                                     </tarfileset>
                                 </tar>
                                 <attachartifact file="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/>
-                            </target>
+                            </tasks>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/usecaseui-portal/pom.xml b/usecaseui-portal/pom.xml
index d8c9b241..c23f5283 100644
--- a/usecaseui-portal/pom.xml
+++ b/usecaseui-portal/pom.xml
@@ -97,28 +97,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-
-                    <execution>
-                        <id>distribution</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target name="distribution">
-                                <zip destfile="./usecase-ui.war" update="true">
-                                    <zipfileset dir="./usecase-ui" includes="**"/>
-                                </zip>
-                                <attachartifact file="./usecase-ui.war" classifier="win64" type="zip"/>
-                            </target>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>
-- 
cgit 1.2.3-korg