From 1f46ffc705728c5f1463743b4b255043b535026b Mon Sep 17 00:00:00 2001
From: “shentao” <shentao@chinamobile.com>
Date: Tue, 27 Sep 2016 21:26:27 +0800
Subject: modify pom.xml files to integrate all modules for deployment
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: If6280da49537495620b0032ca6bd578f66f315a7
Signed-off-by: “shentao” <shentao@chinamobile.com>
---
 openo-portal/portal-package/pom.xml                | 46 ++++++++++++++++++----
 .../portal-package/src/main/webapp/WEB-INF/web.xml |  3 ++
 2 files changed, 41 insertions(+), 8 deletions(-)

(limited to 'openo-portal/portal-package')

diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index 75567b52..666f6446 100644
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -17,7 +17,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/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.openo.gso.gui</groupId>
+    <groupId>org.openo.portal</groupId>
     <artifactId>openo-portal</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
@@ -28,27 +28,45 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.openo.gso.gui</groupId>
+      <groupId>org.openo.portal</groupId>
       <artifactId>portal-common</artifactId>
       <version>1.0.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.openo.gso.gui</groupId>
+      <groupId>org.openo.portal</groupId>
+      <artifactId>portal-resmgr</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openo.portal</groupId>
       <artifactId>portal-extsys</artifactId>
       <version>1.0.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.openo.gso.gui</groupId>
+      <groupId>org.openo.portal</groupId>
       <artifactId>portal-catalog</artifactId>
       <version>1.0.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.openo.portal</groupId>
+      <artifactId>portal-auth</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openo.portal</groupId>
+      <artifactId>portal-lifecyclemgr</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <build>
-    <finalName>open-portal</finalName>
+    <finalName>openo-portal</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -57,17 +75,29 @@
           <packagingExcludes>WEB-INF/web.xml</packagingExcludes>
           <overlays>
             <overlay>
-              <groupId>org.openo.gso.gui</groupId>
+              <groupId>org.openo.portal</groupId>
               <artifactId>portal-common</artifactId>
             </overlay>
             <overlay>
-              <groupId>org.openo.gso.gui</groupId>
+              <groupId>org.openo.portal</groupId>
+              <artifactId>portal-resmgr</artifactId>
+            </overlay>
+            <overlay>
+              <groupId>org.openo.portal</groupId>
               <artifactId>portal-extsys</artifactId>
             </overlay>
             <overlay>
-              <groupId>org.openo.gso.gui</groupId>
+              <groupId>org.openo.portal</groupId>
               <artifactId>portal-catalog</artifactId>
             </overlay>
+            <overlay>
+              <groupId>org.openo.portal</groupId>
+              <artifactId>portal-auth</artifactId>
+            </overlay>
+            <overlay>
+              <groupId>org.openo.portal</groupId>
+              <artifactId>portal-lifecyclemgr</artifactId>
+            </overlay>
           </overlays>
         </configuration>
       </plugin>
diff --git a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
index 887f7dfd..071ba46b 100644
--- a/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
+++ b/openo-portal/portal-package/src/main/webapp/WEB-INF/web.xml
@@ -16,4 +16,7 @@
 -->
 <web-app>
   <display-name>OPEN-O Web Application</display-name>
+  <welcome-file-list>
+    <welcome-file>common/login.html</welcome-file>
+  </welcome-file-list>
 </web-app>
-- 
cgit 1.2.3-korg