1. The publish package name add system type

2. Parameter tasks is deprecated, use target instead
3. Format pom.xml
4. Modify .gitignore
5. Change groupId

Change-Id: I7e2664e7c4ed582ceb8cca128af8f1ed9f0b252c
Issue-id: OCS-59
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

4 files changed, 30 insertions, 30 deletions

diff --git a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
index 1c0a794..1b5275a 100644
--- a/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/distribution/pom.xml
@@ -17,14 +17,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.openo.common-services.common-utilities</groupId>
+        <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
         <artifactId>wso2bpel-core-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>distribution</artifactId>
-    <!--name>openo/commonservice/commonutilities/distribution</name-->
+    <name>openo/commonservice/commonutilities/distribution</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
index efc892c..3e7e4fd 100644
--- a/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/distribution/standalone/pom.xml
@@ -18,7 +18,7 @@
 -->
 <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">
     <parent>
-        <groupId>org.openo.common-services.common-utilities</groupId>
+        <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
         <artifactId>distribution</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
@@ -103,7 +103,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.openo.common-services.common-utilities</groupId>
+                                    <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
                                     <artifactId>wso2bpel-mgr</artifactId>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
@@ -122,7 +122,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.openo.common-services.common-utilities</groupId>
+                                    <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
                                     <artifactId>wso2bpel-mgr</artifactId>
                                     <type>jar</type>
                                     <overWrite>true</overWrite>
@@ -145,7 +145,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <tasks name="distribution">
+                            <target name="distribution">
                                 <copy todir="target/assembly/linux64/lib">
                                     <fileset dir="../../wso2bpel-mgr/lib">
                                         <include name="*" />
@@ -156,7 +156,7 @@
                                         <include name="*" />
                                     </fileset>
                                 </copy>
-                                <tar destfile="${version.output}/${packagename}-${project.version}.tar.gz" longfile="posix" compression="gzip">
+                                <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>
@@ -164,12 +164,12 @@
                                         <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">
+                                <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}.zip" classifier="win64" type="zip"/>
-                            </tasks>
+                                <attachartifact file="${version.output}/${packagename}-${project.version}-win64.zip" classifier="win64" type="zip"/>
+                            </target>
                         </configuration>
                     </execution>
                 </executions>
@@ -179,7 +179,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.openo.common-services.common-utilities</groupId>
+            <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
             <artifactId>wso2bpel-mgr</artifactId>
             <version>${project.version}</version>
         </dependency>
diff --git a/wso2bpel-ext/wso2bpel-core/pom.xml b/wso2bpel-ext/wso2bpel-core/pom.xml
index 44b92c3..734c52b 100644
--- a/wso2bpel-ext/wso2bpel-core/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/pom.xml
@@ -17,14 +17,14 @@
 -->
 <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">
     <parent>
-        <groupId>org.openo.common-services.common-utilities</groupId>
+        <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
         <artifactId>wso2bpel-root</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2bpel-core-parent</artifactId>
-    <!--name>openo/commonservice/commonutilities/wso2bpel-core-parent</name-->
+    <name>openo/commonservice/commonutilities/wso2bpel-core-parent</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
index d4b6e9f..8a9c3ad 100644
--- a/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
+++ b/wso2bpel-ext/wso2bpel-core/wso2bpel-mgr/pom.xml
@@ -18,36 +18,36 @@
 <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">
 
     <parent>
-        <groupId>org.openo.common-services.common-utilities</groupId>
+        <groupId>org.openo.common-services.common-utilities.wso2bpel-ext</groupId>
         <artifactId>wso2bpel-core-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>wso2bpel-mgr</artifactId>
-    <!--name>openo/commonservice/commonutilities/wso2bpel-mgr</name-->
+    <name>openo/commonservice/commonutilities/wso2bpel-mgr</name>
     <packaging>jar</packaging>
 
     <build>
         <plugins>
-			<plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-					<source>1.7</source>
-					<target>1.7</target>
-					<encoding>UTF-8</encoding>
-					<compilerArgs> 
-						<arg>-verbose</arg>
-						<arg>-Xlint:unchecked</arg>
-						<arg>-Xlint:deprecation</arg>
-						<arg>-bootclasspath</arg>
-						<arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
-						<arg>-extdirs</arg> 
-						<arg>${project.basedir}/lib</arg>
-					</compilerArgs> 
-				</configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <encoding>UTF-8</encoding>
+                    <compilerArgs> 
+                        <arg>-verbose</arg>
+                        <arg>-Xlint:unchecked</arg>
+                        <arg>-Xlint:deprecation</arg>
+                        <arg>-bootclasspath</arg>
+                        <arg>${env.JAVA_HOME}/jre/lib/rt.jar</arg>
+                        <arg>-extdirs</arg> 
+                        <arg>${project.basedir}/lib</arg>
+                    </compilerArgs> 
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.eclipse.m2e</groupId>