Integrate Catalog&ESR

Change-Id: I15eea95225ed4f078999aac7fc3ed8a56b2a6d57
Signed-off-by: huangjian <huang.jian12@zte.com.cn>

diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml
index 2cbc32f..28dba21 100644 (file)
--- a/openo-portal/pom.xml
+++ b/openo-portal/pom.xml
@@ -33,8 +33,8 @@
       <module>portal-common</module>
       <module>portal-resmgr</module>
       <module>portal-extsys</module>
+      <module>portal-catalog</module>
       <module>portal-auth</module>
       <module>portal-lifecyclemgr</module>
-      <module>portal-catalog</module>
     </modules>
 </project>

diff --git a/openo-portal/portal-catalog/pom.xml b/openo-portal/portal-catalog/pom.xml
index 9c6d7da..5ce6acd 100644 (file)
--- a/openo-portal/portal-catalog/pom.xml
+++ b/openo-portal/portal-catalog/pom.xml
@@ -23,21 +23,20 @@
         <artifactId>openo-portal</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
-       
+
     <modelVersion>4.0.0</modelVersion>
     <artifactId>portal-catalog</artifactId>
-       <version>1.0.0-SNAPSHOT</version>
-       <packaging>war</packaging>
-       
-       <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <packaging>war</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index e94ecbc..75567b5 100644 (file)
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -33,6 +33,18 @@
       <version>1.0.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
+    <dependency>
+      <groupId>org.openo.gso.gui</groupId>
+      <artifactId>portal-extsys</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.openo.gso.gui</groupId>
+      <artifactId>portal-catalog</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
   </dependencies>
 
   <build>
@@ -48,6 +60,14 @@
               <groupId>org.openo.gso.gui</groupId>
               <artifactId>portal-common</artifactId>
             </overlay>
+            <overlay>
+              <groupId>org.openo.gso.gui</groupId>
+              <artifactId>portal-extsys</artifactId>
+            </overlay>
+            <overlay>
+              <groupId>org.openo.gso.gui</groupId>
+              <artifactId>portal-catalog</artifactId>
+            </overlay>
           </overlays>
         </configuration>
       </plugin>