GSO-102

Change-Id: Iabd63832ff4682eff83b37fa07481bcdd91c6b30
Signed-off-by: “shentao” <shentao@chinamobile.com>

2 files changed, 31 insertions, 11 deletions

diff --git a/openo-portal/portal-package/pom.xml b/openo-portal/portal-package/pom.xml
index 5f9896ec..baf14fb9 100644
--- a/openo-portal/portal-package/pom.xml
+++ b/openo-portal/portal-package/pom.xml
@@ -27,7 +27,7 @@
   <packaging>war</packaging>
 
   <properties>
-    <packagename>openo-portal</packagename>
+    <packagename>openoui</packagename>
   </properties>
 
   <dependencies>
@@ -80,6 +80,12 @@
       <type>war</type>
     </dependency>
     <dependency>
+      <groupId>org.openo.gso.gui</groupId>
+      <artifactId>portal-monitor</artifactId>
+      <version>1.1.0-SNAPSHOT</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
       <version>1.6.1</version>
@@ -103,7 +109,7 @@
   </dependencies>
 
   <build>
-    <finalName>openo-portal</finalName>
+    <finalName>openoui</finalName>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -139,6 +145,10 @@
               <groupId>org.openo.gso.gui</groupId>
               <artifactId>portal-performance</artifactId>
             </overlay>
+            <overlay>
+              <groupId>org.openo.gso.gui</groupId>
+              <artifactId>portal-monitor</artifactId>
+            </overlay>
           </overlays>
         </configuration>
       </plugin>
@@ -155,7 +165,7 @@
             <configuration>
               <tasks name="${project.artifactId}">
                 <zip destfile="target/${packagename}-${project.version}.zip" update="true">
-                  <zipfileset dir="target" includes="*.war"/>
+                  <zipfileset dir="target/openoui" includes="**"/>
                 </zip>
               </tasks>
             </configuration>
diff --git a/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml
index b0a94acd..092af8e2 100644
--- a/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml
+++ b/openo-portal/portal-package/src/main/resources/portalConfig/msb_register.xml
@@ -24,7 +24,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/common</url>
+            <url>/openoui/common</url>
             <serviceName>common</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -34,7 +34,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/catalog</url>
+            <url>/openoui/catalog</url>
             <serviceName>catalog</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -44,7 +44,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/extsys</url>
+            <url>/openoui/extsys</url>
             <serviceName>extsys</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -54,7 +54,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/performance</url>
+            <url>/openoui/performance</url>
             <serviceName>performance</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -64,7 +64,17 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/lifecyclemgr</url>
+            <url>/openoui/monitor</url>
+            <serviceName>monitor</serviceName>
+            <protocol>UI</protocol>
+            <visualRange>1</visualRange>
+            <lb_policy>hash</lb_policy>
+            <ttl>0</ttl>
+        </registerInfo>
+        <registerInfo>
+            <ip>127.0.0.1</ip>
+            <port>8300</port>
+            <url>/openoui/lifecyclemgr</url>
             <serviceName>lifecyclemgr</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -74,7 +84,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/resmgr-nfv</url>
+            <url>/openoui/resmgr-nfv</url>
             <serviceName>resmgr-nfv</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -84,7 +94,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/resmgr-sdn</url>
+            <url>/openoui/resmgr-sdn</url>
             <serviceName>resmgr-sdn</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>
@@ -94,7 +104,7 @@
         <registerInfo>
             <ip>127.0.0.1</ip>
             <port>8300</port>
-            <url>/openo-portal/user</url>
+            <url>/openoui/user</url>
             <serviceName>user</serviceName>
             <protocol>UI</protocol>
             <visualRange>1</visualRange>