modify usecase-ui pom files

Change-Id: Ic45a790160522047e6dbcf868a7fcf0363008c49
Issue-ID: USECASEUI-259
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

1 files changed, 197 insertions, 270 deletions

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 2d1f452f..a41f6ca5 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -16,290 +16,217 @@
 -->
 <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/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
         <groupId>org.onap.usecase-ui</groupId>
-        <artifactId>usecase-ui</artifactId>
-        <version>2.0.1</version>
+        <artifactId>usecase-ui-parent</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>distribution</artifactId>
+    <artifactId>usecase-ui-distribution</artifactId>
     <packaging>pom</packaging>
-    <name>usecase-ui/distribution</name>
+    <name>usecase-ui-distribution</name>
+    <description>distribution for usecase-ui portal</description>
 
     <properties>
-        <packagename>usecase-ui</packagename>
-        <version.logback>1.1.2</version.logback>
-        <version.slf4j>1.7.6</version.slf4j>
-        <linux64id>linux64</linux64id>
-        <win64id>win64</win64id>
-        <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
-        <win64outputdir>target/assembly/${win64id}</win64outputdir>
-        <version.output>target/version</version.output>
         <usecaseui.version>2.0.1</usecaseui.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <linux64outputdir>target/assembly/linux64</linux64outputdir>
+        <dockeroutput>target/version/${usecaseui.version}</dockeroutput>
     </properties>
 
     <build>
-      <finalName>usecse-ui</finalName>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <executions>
-            <execution>
-              <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>
-          <artifactId>maven-resources-plugin</artifactId>
-          <executions>
-            <execution>
-              <id>copy-resources-portal-linux</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${linux64outputdir}/tomcat/webapps/</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>../usecaseui-portal/</directory>
-                    <filtering>false</filtering>
-                    <includes>
-                      <include>usecase-ui.war</include>
-                    </includes>
-                  </resource>
-                </resources>
-                <overwrite>true</overwrite>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-resources-${linux64id}</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${linux64outputdir}</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>src/main/assembly/</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-${linux64id}</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${linux64outputdir}/tomcat</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
-                    <includes>
-                      <include>**/*</include>
-                    </includes>
-                    <excludes>
-                      <exclude>**/*.bat</exclude>
-                    </excludes>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-resources-portal-win</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${win64outputdir}/tomcat/webapps/</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>../usecaseui-portal/</directory>
-                    <filtering>false</filtering>
-                    <includes>
-                      <include>usecase-ui.war</include>
-                    </includes>
-                  </resource>
-                </resources>
-                <overwrite>true</overwrite>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-resources-${win64id}</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${win64outputdir}</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>src/main/assembly/</directory>
-                    <filtering>false</filtering>
-                    <includes>
-                      <include>**/*</include>
-                    </includes>
-                    <excludes>
-                      <exclude>**/*.sh</exclude>
-                    </excludes>
-                  </resource>
-                </resources>
-                <overwrite>true</overwrite>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-tomcat-resources-${win64id}</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${win64outputdir}/tomcat</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
-                    <includes>
-                      <include>**/*</include>
-                    </includes>
-                    <excludes>
-                      <exclude>**/*.sh</exclude>
-                    </excludes>
-                  </resource>
-                </resources>
-              </configuration>
-            </execution>
-            <execution>
-              <id>copy-dockerfile</id>
-              <phase>process-resources</phase>
-              <goals>
-                <goal>copy-resources</goal>
-              </goals>
-              <configuration>
-                <outputDirectory>${version.output}</outputDirectory>
-                <resources>
-                  <resource>
-                    <directory>src/main/assembly/</directory>
-                    <filtering>false</filtering>
-                    <includes>
-                      <include>Dockerfile</include>
-                    </includes>
-                  </resource>
-                </resources>
-                <overwrite>true</overwrite>
-              </configuration>
-            </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">
-                  <tar destfile="${version.output}/${packagename}-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
-                    <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755">
-                      <exclude name="**/*.sh"/>
-                    </tarfileset>
-                    <tarfileset dir="target/assembly/linux64" filemode="0755" dirmode="0755">
-                      <include name="**/*.sh"/>
-                    </tarfileset>
-                  </tar>
-                  <attachartifact file="${version.output}/${packagename}-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/>
-                  <zip destfile="${version.output}/${packagename}-${project.version}-win64.zip" update="true">
-                    <zipfileset dir="target/assembly/win64" includes="**"/>
-                  </zip>
-                  <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/>
-                </target>
-              </configuration>
-            </execution>
-          </executions>
-        </plugin>
-      </plugins>
+        <finalName>usecse-ui</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                 <executions>
+                    <execution>
+                        <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>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources-portal-linux</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${linux64outputdir}/tomcat/webapps/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>../usecaseui-portal/</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>usecase-ui.war</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-resources-linux64</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${linux64outputdir}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/assembly/</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>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${linux64outputdir}/tomcat</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/target/tomcat/apache-tomcat-${tomcat.version}</directory>
+                                    <includes>
+                                        <include>**/*</include>
+                                    </includes>
+                                    <excludes>
+                                        <exclude>**/*.bat</exclude>
+                                    </excludes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-dockerfile</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${dockeroutput}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/assembly/</directory>
+                                    <filtering>false</filtering>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                            <overwrite>true</overwrite>
+                        </configuration>
+                    </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">
+                                <tar destfile="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" longfile="posix" compression="gzip">
+                                    <tarfileset dir="${linux64outputdir}" filemode="0644" dirmode="0755">
+                                        <exclude name="**/*.sh"/>
+                                    </tarfileset>
+                                    <tarfileset dir="${linux64outputdir}" filemode="0755" dirmode="0755">
+                                        <include name="**/*.sh"/>
+                                    </tarfileset>
+                                </tar>
+                                <attachartifact file="${dockeroutput}/usecase-ui-${project.version}-linux64.tar.gz" classifier="linux64" type="tar.gz"/>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
-      <profile>
-        <id>docker</id>
-        <build>
-          <plugins>
-            <plugin>
-              <groupId>io.fabric8</groupId>
-              <artifactId>docker-maven-plugin</artifactId>
-              <version>0.16.5</version>
-              <inherited>false</inherited>
-              <configuration>
-                <images>
-                  <image>
-                    <name>onap/usecase-ui</name>
-                    <build>
-                      <cleanup>try</cleanup>
-                      <dockerFileDir>${basedir}/${version.output}</dockerFileDir>
-                      <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
-                      <tags>
-                        <tag>${usecaseui.version}-SNAPSHOT-latest</tag>
-                        <tag>${usecaseui.version}-STAGING-latest</tag>
-                        <tag>${usecaseui.version}-STAGING-${maven.build.timestamp}</tag>
-                      </tags>
-                    </build>
-                  </image>
-                </images>
-              </configuration>
-              <executions>
-                <execution>
-                  <id>generate-images</id>
-                  <phase>package</phase>
-                  <goals>
-                    <goal>build</goal>
-                  </goals>
-                </execution>
-                <execution>
-                  <id>push-images</id>
-                  <phase>deploy</phase>
-                  <goals>
-                    <goal>build</goal>
-                    <goal>push</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-          </plugins>
-        </build>
-      </profile>
+        <profile>
+            <id>docker</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.16.5</version>
+                        <inherited>false</inherited>
+                        <configuration>
+                            <images>
+                                <image>
+                                    <name>onap/usecase-ui</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${basedir}/${dockeroutput}</dockerFileDir>
+                                        <dockerFile>${basedir}/${dockeroutput}/Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${usecaseui.version}-SNAPSHOT-latest</tag>
+                                            <tag>${usecaseui.version}-STAGING-latest</tag>
+                                            <tag>${usecaseui.version}-STAGING-${maven.build.timestamp}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>generate-images</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>push-images</id>
+                                <phase>deploy</phase>
+                                <goals>
+                                    <goal>build</goal>
+                                    <goal>push</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
-
 </project>