Output Linux distribution package

Change-Id: I359b251d96076718c704b3d68127c9401e345643
Issue-id: TOSCA-63
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/catalog-core/distribution/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
index 341a070..315ba12 100644 (file)
--- a/catalog-core/distribution/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -27,23 +27,43 @@
     <artifactId>catalog-all</artifactId>
     <name>openo/commontosca/catalog/distribution/catalog-all</name>
     <packaging>pom</packaging>
-    
-    <properties>
-        <packagename>openo-commontosca-catalog</packagename>
-    </properties>
+
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-resources</id>
+                        <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-resources-${win64id}</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>target/assembly/</outputDirectory>
+                            <outputDirectory>${win64outputdir}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/assembly/</directory>
@@ -51,6 +71,9 @@
                                     <includes>
                                         <include>**/*</include>
                                     </includes>
+                                    <excludes>
+                                        <exclude>**/*.sh</exclude>
+                                    </excludes>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -64,72 +87,125 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-catalog</id>
-                        <phase>package</phase>
+                        <id>unpack-catalog-${linux64id}</id>
                         <goals>
-                            <goal>unpack-dependencies</goal>
+                            <goal>unpack</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
-                            <includeGroupIds>org.openo.common-tosca.catalog</includeGroupIds>
-                            <includeArtifactIds>catalog-standalone</includeArtifactIds>
-                            <outputDirectory>
-                                target/assembly/catalog
-                            </outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openo.common-tosca.catalog</groupId>
+                                    <artifactId>catalog-standalone</artifactId>
+                                    <type>tar.gz</type>
+                                    <classifier>linux64</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>**/*.bat,*.cmd</excludes>
+                            <outputDirectory>${linux64outputdir}/catalog</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>unpack-httpserver</id>
-                        <phase>package</phase>
+                        <id>unpack-httpserver-${linux64id}</id>
                         <goals>
-                            <goal>unpack-dependencies</goal>
+                            <goal>unpack</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
-                            <includeGroupIds>org.openo.common-tosca.catalog</includeGroupIds>
-                            <includeArtifactIds>httpserver</includeArtifactIds>
-                            <outputDirectory>
-                                target/assembly/
-                            </outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openo.common-tosca.catalog</groupId>
+                                    <artifactId>httpserver</artifactId>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>**/*.bat,*.cmd</excludes>
+                            <outputDirectory>${linux64outputdir}</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
                     <execution>
-                        <id>zip</id>
-                        <phase>package</phase>
+                        <id>unpack-catalog-${win64id}</id>
                         <goals>
-                            <goal>run</goal>
+                            <goal>unpack</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
-                            <tasks name="${project.artifactId}">
-                                <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                                    <zipfileset dir="target/assembly" includes="**"/>
-                                </zip>
-                            </tasks>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openo.common-tosca.catalog</groupId>
+                                    <artifactId>catalog-standalone</artifactId>
+                                    <type>zip</type>
+                                    <classifier>win64</classifier>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>*.sh,*/*.sh,*/*/*.sh</excludes>
+                            <outputDirectory>${win64outputdir}/catalog</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>unpack-httpserver-${win64id}</id>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openo.common-tosca.catalog</groupId>
+                                    <artifactId>httpserver</artifactId>
+                                    <type>zip</type>
+                                </artifactItem>
+                            </artifactItems>
+                            <excludes>*.sh,*/*.sh,*/*/*.sh</excludes>
+                            <outputDirectory>${win64outputdir}</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <outputAbsoluteArtifactFilename>true</outputAbsoluteArtifactFilename>
                         </configuration>
                     </execution>
                 </executions>
-            </plugin> 
+            </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>attach-artifacts</id>
+                        <id>distribution</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attach-artifact</goal>
+                            <goal>run</goal>
                         </goals>
                         <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/${packagename}-${project.version}.zip</file>
-                                    <type>zip</type>
-                                </artifact>
-                            </artifacts>
+                            <target name="distribution">
+                                <tar destfile="${version.output}/${packagename}-${project.version}.tar.gz" longfile="posix" compression="gzip">
+                                    <tarfileset dir="target/assembly/linux64" filemode="0644" dirmode="0755">
+                                        <exclude name="**/*.sh"/>
+                                        <exclude name="openresty/nginx/sbin/nginx"/>
+                                        <exclude name="redis/redis-*"/>
+                                    </tarfileset>
+                                    <tarfileset dir="target/assembly/linux64" filemode="0755" dirmode="0755">
+                                        <include name="**/*.sh"/>
+                                        <include name="openresty/nginx/sbin/nginx"/>
+                                        <include name="redis/redis-*"/>
+                                    </tarfileset>
+                                </tar>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}.tar.gz" classifier="linux64" type="tar.gz"/>
+
+
+                                <zip destfile="${version.output}/${packagename}-${project.version}.zip" update="true">
+                                    <zipfileset dir="target/assembly/win64" includes="**"/>
+                                </zip>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}.zip" classifier="win64" type="zip"/>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>
@@ -142,6 +218,14 @@
             <artifactId>catalog-standalone</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
+            <classifier>win64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.openo.common-tosca.catalog</groupId>
+            <artifactId>catalog-standalone</artifactId>
+            <version>${project.version}</version>
+            <type>tar.gz</type>
+            <classifier>linux64</classifier>
         </dependency>
         <dependency>
             <groupId>org.openo.common-tosca.catalog</groupId>

diff --git a/catalog-core/distribution/catalog-standalone/pom.xml b/catalog-core/distribution/catalog-standalone/pom.xml
index e06a6bc..c873d40 100644 (file)
--- a/catalog-core/distribution/catalog-standalone/pom.xml
+++ b/catalog-core/distribution/catalog-standalone/pom.xml
@@ -22,29 +22,25 @@
         <artifactId>distribution</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-    
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-standalone</artifactId>
     <name>openo/commontosca/catalog/distribution/catalog-standalone</name>
     <packaging>pom</packaging>
 
-    <properties>
-        <packagename>openo-catalog</packagename>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-resources</id>
+                        <id>copy-resources-${linux64id}</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/assembly/</outputDirectory>
+                            <outputDirectory>${linux64outputdir}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>src/main/assembly/</directory>
@@ -52,6 +48,32 @@
                                     <includes>
                                         <include>**/*</include>
                                     </includes>
+                                    <excludes>
+                                        <exclude>**/*.bat</exclude>
+                                    </excludes>
+                                </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>
@@ -64,7 +86,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-jar</id>
+                        <id>copy-jar-${linux64id}</id>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -76,51 +98,59 @@
                                     <artifactId>catalog-mgr</artifactId>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>target/assembly/</outputDirectory>
+                                    <outputDirectory>${linux64outputdir}</outputDirectory>
                                     <destFileName>catalog-service.jar</destFileName>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
                     <execution>
-                        <id>zip</id>
-                        <phase>package</phase>
+                        <id>copy-jar-${win64id}</id>
                         <goals>
-                            <goal>run</goal>
+                            <goal>copy</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
-                            <tasks name="${project.artifactId}">
-                                <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                                    <zipfileset dir="target/assembly" includes="**"/>
-                                </zip>
-                            </tasks>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.openo.common-tosca.catalog</groupId>
+                                    <artifactId>catalog-mgr</artifactId>
+                                    <type>jar</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${win64outputdir}</outputDirectory>
+                                    <destFileName>catalog-service.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>attach-artifacts</id>
+                        <id>distribution</id>
                         <phase>package</phase>
                         <goals>
-                            <goal>attach-artifact</goal>
+                            <goal>run</goal>
                         </goals>
                         <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>target/${packagename}-${project.version}.zip</file>
-                                    <type>zip</type>
-                                </artifact>
-                            </artifacts>
+                            <tasks name="distribution">
+                                <tar destfile="${version.output}/${packagename}-${project.version}.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}.tar.gz" classifier="linux64" type="tar.gz"/>
+                                <zip destfile="${version.output}/${packagename}-${project.version}.zip" update="true">
+                                    <zipfileset dir="target/assembly/win64" includes="**"/>
+                                </zip>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}.zip" classifier="win64" type="zip"/>
+                            </tasks>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/catalog-core/distribution/pom.xml b/catalog-core/distribution/pom.xml
index 6d6d0b0..11f78f0 100644 (file)
--- a/catalog-core/distribution/pom.xml
+++ b/catalog-core/distribution/pom.xml
@@ -28,6 +28,15 @@
     <name>openo/commontosca/catalog/distribution</name>
     <packaging>pom</packaging>
 
+    <properties>
+        <packagename>openo-commontosca-catalog</packagename>
+        <linux64id>linux64</linux64id>
+        <win64id>win64</win64id>
+        <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
+        <win64outputdir>target/assembly/${win64id}</win64outputdir>
+        <version.output>target/version</version.output>
+    </properties>
+
     <modules>
         <module>catalog-standalone</module>
         <module>catalog-all</module>

diff --git a/catalog-parent/catalogparent-lite/pom.xml b/catalog-parent/catalogparent-lite/pom.xml
index 3cf4371..5d5dc64 100644 (file)
--- a/catalog-parent/catalogparent-lite/pom.xml
+++ b/catalog-parent/catalogparent-lite/pom.xml
@@ -111,6 +111,10 @@
                     <artifactId>license-maven-plugin</artifactId>
                     <version>3.0.rc1</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>