From 58a46a133dfd7caea47d993b3d2c86e447620d45 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Fri, 2 Sep 2016 14:31:57 -0700
Subject: Fix deploy issue in common-tosca-catalog httpserver

Change-Id: I4325af634d104888b26111834a3c02fc3e445862
Issue-id: INT-40
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 catalog-core/httpserver/pom.xml | 53 ++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 14 deletions(-)

(limited to 'catalog-core')

diff --git a/catalog-core/httpserver/pom.xml b/catalog-core/httpserver/pom.xml
index 516aeefe..93900fd0 100644
--- a/catalog-core/httpserver/pom.xml
+++ b/catalog-core/httpserver/pom.xml
@@ -21,17 +21,17 @@
         <artifactId>catalog-core-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>httpserver</artifactId>
     <name>openo/commontosca/catalog/httpserver</name>
     <packaging>pom</packaging>
-    
+
     <properties>
         <tomcat.version>7.0.62</tomcat.version>
         <packagename>http-server</packagename>
     </properties>
-    
+
     <build>
         <plugins>
             <plugin>
@@ -39,17 +39,45 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-tomcat</id>
-                        <phase>package</phase>
+                        <id>unpack-tomcat-to-temporary-dir</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.tomcat</groupId>
+                                    <artifactId>tomcat</artifactId>
+                                    <type>zip</type>
+                                    <outputDirectory>target/tomcat</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-tomcat-resources</id>
+                        <phase>process-resources</phase>
                         <goals>
-                            <goal>unpack-dependencies</goal>
+                            <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <includeGroupIds>org.apache.tomcat</includeGroupIds>
-                            <includeArtifactIds>tomcat</includeArtifactIds>
-                            <outputDirectory>
-                                target/assembly/
-                            </outputDirectory>
+                            <outputDirectory>${project.build.directory}/assembly/tomcat</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                </resource>
+                            </resources>
                         </configuration>
                     </execution>
                 </executions>
@@ -66,9 +94,6 @@
                         </goals>
                         <configuration>
                             <tasks name="${project.artifactId}">
-                                <move todir="target/assembly/tomcat">
-                                    <fileset dir="target/assembly/apache-tomcat-${tomcat.version}"/>
-                                </move>
                                 <copydir src="src/main/assembly/" dest="target/assembly"/>
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
                                     <zipfileset dir="target/assembly" includes="**" />
-- 
cgit 1.2.3-korg