From 31b545d8d7f7277706afb1298fa5eda85c78fe0f Mon Sep 17 00:00:00 2001
From: Gary Wu <gary.i.wu@huawei.com>
Date: Tue, 29 Nov 2016 15:12:37 -0800
Subject: [PATCH] Standardize POM project naming

Change-Id: I9919b14ba3934c4d4914e9f417c57f86c6f3123a
Issue-id: INT-67
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
---
 openo-portal/pom.xml                     | 2 +-
 openo-portal/portal-auth/pom.xml         | 2 +-
 openo-portal/portal-catalog/pom.xml      | 2 +-
 openo-portal/portal-common/pom.xml       | 2 +-
 openo-portal/portal-extsys/pom.xml       | 5 ++---
 openo-portal/portal-lifecyclemgr/pom.xml | 5 ++---
 openo-portal/portal-monitor/pom.xml      | 2 +-
 openo-portal/portal-package/pom.xml      | 5 ++---
 openo-portal/portal-performance/pom.xml  | 2 +-
 openo-portal/portal-resmgr/pom.xml       | 5 ++---
 pom.xml                                  | 2 +-
 servicegateway/deployment/pom.xml        | 2 +-
 servicegateway/pom.xml                   | 6 +++---
 servicegateway/service/pom.xml           | 5 ++---
 14 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml
index 164ffc13..c8dcb52e 100644
--- a/openo-portal/pom.xml
+++ b/openo-portal/pom.xml
@@ -27,7 +27,7 @@
     <artifactId>openo-portal</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>portal</name>
+    <name>gso-gui/openo-portal</name>
 
     <modules>
         <module>portal-package</module>
diff --git a/openo-portal/portal-auth/pom.xml b/openo-portal/portal-auth/pom.xml
index aea52ec3..f4142c04 100644
--- a/openo-portal/portal-auth/pom.xml
+++ b/openo-portal/portal-auth/pom.xml
@@ -37,4 +37,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-auth</name></project>
diff --git a/openo-portal/portal-catalog/pom.xml b/openo-portal/portal-catalog/pom.xml
index 3e962ee4..e1974d56 100644
--- a/openo-portal/portal-catalog/pom.xml
+++ b/openo-portal/portal-catalog/pom.xml
@@ -38,4 +38,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+<name>gso-gui/openo-portal/portal-catalog</name></project>
diff --git a/openo-portal/portal-common/pom.xml b/openo-portal/portal-common/pom.xml
index 4ce967af..a955daa8 100644
--- a/openo-portal/portal-common/pom.xml
+++ b/openo-portal/portal-common/pom.xml
@@ -37,4 +37,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-common</name></project>
diff --git a/openo-portal/portal-extsys/pom.xml b/openo-portal/portal-extsys/pom.xml
index 1f55dab3..566b1cc9 100644
--- a/openo-portal/portal-extsys/pom.xml
+++ b/openo-portal/portal-extsys/pom.xml
@@ -16,8 +16,7 @@
     limitations under the License.
 
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.openo.gso.gui</groupId>
@@ -38,4 +37,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+<name>gso-gui/openo-portal/portal-extsys</name></project>
diff --git a/openo-portal/portal-lifecyclemgr/pom.xml b/openo-portal/portal-lifecyclemgr/pom.xml
index 6087735a..19d33806 100644
--- a/openo-portal/portal-lifecyclemgr/pom.xml
+++ b/openo-portal/portal-lifecyclemgr/pom.xml
@@ -16,8 +16,7 @@
     limitations under the License.
 
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.openo.gso.gui</groupId>
         <artifactId>openo-portal</artifactId>
@@ -41,4 +40,4 @@
         </plugins>
     </build>
 
-</project>
+<name>gso-gui/openo-portal/portal-lifecyclemgr</name></project>
diff --git a/openo-portal/portal-monitor/pom.xml b/openo-portal/portal-monitor/pom.xml
index ad5d900b..b725fad7 100644
--- a/openo-portal/portal-monitor/pom.xml
+++ b/openo-portal/portal-monitor/pom.xml
@@ -37,4 +37,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-monitor</name></project>
diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index ac309936..b3d30951 100644
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -14,8 +14,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<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">
+<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">
   <parent>
     <groupId>org.openo.gso.gui</groupId>
     <artifactId>openo-portal</artifactId>
@@ -217,4 +216,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-package</name></project>
diff --git a/openo-portal/portal-performance/pom.xml b/openo-portal/portal-performance/pom.xml
index 83128301..2661f3a8 100644
--- a/openo-portal/portal-performance/pom.xml
+++ b/openo-portal/portal-performance/pom.xml
@@ -37,4 +37,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-performance</name></project>
diff --git a/openo-portal/portal-resmgr/pom.xml b/openo-portal/portal-resmgr/pom.xml
index 7f81dc0f..8205153e 100644
--- a/openo-portal/portal-resmgr/pom.xml
+++ b/openo-portal/portal-resmgr/pom.xml
@@ -16,8 +16,7 @@
     limitations under the License.
 
 -->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.openo.gso.gui</groupId>
         <artifactId>openo-portal</artifactId>
@@ -40,4 +39,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+<name>gso-gui/openo-portal/portal-resmgr</name></project>
diff --git a/pom.xml b/pom.xml
index 55c51859..10a28045 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.openo.gso.gui</groupId>
     <artifactId>gso-gui</artifactId>
     <packaging>pom</packaging>
-    <name>gui</name>
+    <name>gso-gui</name>
     <modules>
         <module>openo-portal</module>
         <module>servicegateway</module>
diff --git a/servicegateway/deployment/pom.xml b/servicegateway/deployment/pom.xml
index 5fb82b88..8f1b086a 100644
--- a/servicegateway/deployment/pom.xml
+++ b/servicegateway/deployment/pom.xml
@@ -23,7 +23,7 @@
     </parent>
 
     <artifactId>service-gateway-deployment</artifactId>
-    <name>ServiceGatewayRootDeployment</name>
+    <name>gso-gui/servicegateway/deployment</name>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/servicegateway/pom.xml b/servicegateway/pom.xml
index 670d4de4..46c2432d 100644
--- a/servicegateway/pom.xml
+++ b/servicegateway/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
   Copyright 2016 Huawei Technologies Co., Ltd.
  
@@ -13,8 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
       <groupId>org.openo.gso.gui</groupId>
@@ -24,7 +24,7 @@
     <groupId>org.openo.gso.gui</groupId>
     <artifactId>service-gateway-root</artifactId>
     <version>1.1.0-SNAPSHOT</version>
-    <name>ServiceGatewayRoot</name>
+    <name>gso-gui/servicegateway</name>
     <packaging>pom</packaging>
 
     <properties>
diff --git a/servicegateway/service/pom.xml b/servicegateway/service/pom.xml
index cb737263..66cec613 100644
--- a/servicegateway/service/pom.xml
+++ b/servicegateway/service/pom.xml
@@ -14,8 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
     <parent> 
         <groupId>org.openo.gso.gui</groupId>
@@ -24,7 +23,7 @@
     </parent>
 
     <artifactId>service-gateway-service</artifactId>
-    <name>ServiceGatewayService</name>
+    <name>gso-gui/servicegateway/service</name>
     <packaging>war</packaging>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
2.16.6