From 9a3c2cc3988d4ac4ad58a5787374590ce5913307 Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 29 Nov 2016 15:12:23 -0800
Subject: Standardize POM project naming

Change-Id: I5622421adf12fd969de0cc9fd7d02b8a5ded2d9e
Issue-id: INT-67
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 catalog-core/catalog-mgr/pom.xml                     | 2 +-
 catalog-core/distribution/catalog-all/pom.xml        | 2 +-
 catalog-core/distribution/catalog-standalone/pom.xml | 2 +-
 catalog-core/distribution/pom.xml                    | 2 +-
 catalog-core/httpserver/pom.xml                      | 4 ++--
 catalog-core/pom.xml                                 | 2 +-
 catalog-parent/catalogparent-lite/pom.xml            | 2 +-
 catalog-parent/catalogparent/pom.xml                 | 2 +-
 catalog-parent/pom.xml                               | 2 +-
 pom.xml                                              | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/catalog-core/catalog-mgr/pom.xml b/catalog-core/catalog-mgr/pom.xml
index 304624e5..23411d8b 100644
--- a/catalog-core/catalog-mgr/pom.xml
+++ b/catalog-core/catalog-mgr/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-mgr</artifactId>
-    <name>openo/commontosca/catalog/catalog-mgr</name>
+    <name>common-tosca-catalog/catalog-core/catalog-mgr</name>
     <packaging>jar</packaging>
 	<properties>
 		<httpclient.version>4.4.1</httpclient.version>
diff --git a/catalog-core/distribution/catalog-all/pom.xml b/catalog-core/distribution/catalog-all/pom.xml
index 5b5e0f7b..9ce872e1 100644
--- a/catalog-core/distribution/catalog-all/pom.xml
+++ b/catalog-core/distribution/catalog-all/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-all</artifactId>
-    <name>openo/commontosca/catalog/distribution/catalog-all</name>
+    <name>common-tosca-catalog/catalog-core/distribution/catalog-all</name>
     <packaging>pom</packaging>
 
     <build>
diff --git a/catalog-core/distribution/catalog-standalone/pom.xml b/catalog-core/distribution/catalog-standalone/pom.xml
index e912f8ae..605b9d50 100644
--- a/catalog-core/distribution/catalog-standalone/pom.xml
+++ b/catalog-core/distribution/catalog-standalone/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-standalone</artifactId>
-    <name>openo/commontosca/catalog/distribution/catalog-standalone</name>
+    <name>common-tosca-catalog/catalog-core/distribution/catalog-standalone</name>
     <packaging>pom</packaging>
 
     <build>
diff --git a/catalog-core/distribution/pom.xml b/catalog-core/distribution/pom.xml
index 7cbc12e1..f86f1c72 100644
--- a/catalog-core/distribution/pom.xml
+++ b/catalog-core/distribution/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>distribution</artifactId>
-    <name>openo/commontosca/catalog/distribution</name>
+    <name>common-tosca-catalog/catalog-core/distribution</name>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/catalog-core/httpserver/pom.xml b/catalog-core/httpserver/pom.xml
index 828a9c38..86f43947 100644
--- a/catalog-core/httpserver/pom.xml
+++ b/catalog-core/httpserver/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>httpserver</artifactId>
-    <name>openo/commontosca/catalog/httpserver</name>
+    <name>common-tosca-catalog/catalog-core/httpserver</name>
     <packaging>pom</packaging>
 
     <properties>
@@ -96,7 +96,7 @@
                             <tasks name="${project.artifactId}">
                                 <delete file="target/assembly/tomcat/conf/server.xml"/>
                                 <delete file="target/assembly/tomcat/conf/web.xml"/>
-                                <copydir src="src/main/assembly/" dest="target/assembly" />
+                                <copydir src="src/main/assembly/" dest="target/assembly"/>
                                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
                                     <zipfileset dir="target/assembly" includes="**"/>
                                 </zip>
diff --git a/catalog-core/pom.xml b/catalog-core/pom.xml
index 94246bfe..660fca19 100644
--- a/catalog-core/pom.xml
+++ b/catalog-core/pom.xml
@@ -25,7 +25,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-core-parent</artifactId>
-    <name>openo/commontosca/catalog/catalog-core-parent</name>
+    <name>common-tosca-catalog/catalog-core</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/catalog-parent/catalogparent-lite/pom.xml b/catalog-parent/catalogparent-lite/pom.xml
index b7c34805..36238a3e 100644
--- a/catalog-parent/catalogparent-lite/pom.xml
+++ b/catalog-parent/catalogparent-lite/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openo.common-tosca.catalog</groupId>
     <artifactId>catalogparent-lite</artifactId>
-    <name>openo/commontosca/catalog/catalogparent-lite</name>
+    <name>common-tosca-catalog/catalog-parent/catalogparent-lite</name>
     <packaging>pom</packaging>
 
     <build>
diff --git a/catalog-parent/catalogparent/pom.xml b/catalog-parent/catalogparent/pom.xml
index a4bac251..c87c6559 100644
--- a/catalog-parent/catalogparent/pom.xml
+++ b/catalog-parent/catalogparent/pom.xml
@@ -26,7 +26,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalogparent</artifactId>
-    <name>openo/commontosca/catalog/catalogparent</name>
+    <name>common-tosca-catalog/catalog-parent/catalogparent</name>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/catalog-parent/pom.xml b/catalog-parent/pom.xml
index b65a1635..05146a63 100644
--- a/catalog-parent/pom.xml
+++ b/catalog-parent/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openo.common-tosca.catalog</groupId>
     <artifactId>catalogparent-aggregator</artifactId>
-    <name>openo/commontosca/catalog/catalogparent-aggregator</name>
+    <name>common-tosca-catalog/catalog-parent</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/pom.xml b/pom.xml
index a079246a..469285b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>catalog-root</artifactId>
-    <name>openo/commontosca/catalog/catalog-root</name>
+    <name>common-tosca-catalog</name>
     <packaging>pom</packaging>
 
     <modules>
-- 
cgit 1.2.3-korg