Add Holmes as a Module of Client

Add some dependencies to integration
Add Holmes as a module of Client
Change the name of alarm-analysis to client-gui/holmes in pom.xml
Change the import path from ./Msg to ./msg

Change-Id: I00a3d37fa705aef297921325f22b4d9ccba5def0
Issue-ID: CLIENT-164
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/alarm-analysis/pom.xml b/alarm-analysis/pom.xml
index 8c20995..be817e8 100644 (file)
--- a/alarm-analysis/pom.xml
+++ b/alarm-analysis/pom.xml
@@ -27,6 +27,7 @@
     <artifactId>holmes</artifactId>
     <packaging>war</packaging>
     <version>1.1.0-SNAPSHOT</version>
+       <name>client-gui/holmes</name>
 
 <build>
 <plugins>

diff --git a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts
index 7afc528..6c9f432 100644 (file)
--- a/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts
+++ b/alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts
@@ -15,7 +15,7 @@
 */
 import { Component, Input, OnInit } from '@angular/core';
 import { ModalService } from './modal.service';
-import { Msg } from './Msg';
+import { Msg } from './msg';
 declare var $: any;
 @Component({
 

diff --git a/integration/pom.xml b/integration/pom.xml
index 0ce32b6..862931f 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -133,6 +133,12 @@
             <artifactId>resmgr</artifactId>
             <version>1.1.0-SNAPSHOT</version>
             <type>war</type>
+        </dependency>
+               <dependency>
+            <groupId>org.openo.client.gui</groupId>
+            <artifactId>holmes</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+            <type>war</type>
         </dependency>
         <dependency>
             <groupId>org.openo.client.gui</groupId>
@@ -187,6 +193,12 @@
                             <groupId>org.openo.client.gui</groupId>
                             <artifactId>resmgr</artifactId>
                         </overlay>
+
+
+                                               <overlay>
+                            <groupId>org.openo.client.gui</groupId>
+                            <artifactId>holmes</artifactId>
+                        </overlay>
                         <overlay>
                             <groupId>org.openo.client.gui</groupId>
                             <artifactId>vnfmarket</artifactId>

diff --git a/pom.xml b/pom.xml
index 88cdfa7..9c214db 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
         <module>monitor</module>
         <module>performance</module>
         <module>resmgr</module>
+        <module>alarm-analysis</module>
         <module>vnfmarket</module>
     </modules>
 </project>