diff options
| author |   GuangrongFu <fu.guangrong@zte.com.cn> | 2017-03-24 14:31:03 +0800 |
|---|---|---|
| committer | GuangrongFu <fu.guangrong@zte.com.cn> | 2017-03-28 08:53:49 +0800 |
| commit | ec40c069a208d3afec31f8e9b2845b5605c4071c (patch) | |
| tree | b604c2a5f3f8c807dc5e5eaa0540f056161e8ea7 | |
| parent | 2fb855601a82a92d0e206a1f32850dc1f536fffb (diff) | |
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>
| -rw-r--r-- | alarm-analysis/pom.xml | 1 | ||||
| -rw-r--r-- | alarm-analysis/src/main/webapp/alarm/app/correlation-modal/modal.component.ts | 2 | ||||
| -rw-r--r-- | integration/pom.xml | 12 | ||||
| -rw-r--r-- | pom.xml | 1 |
4 files changed, 15 insertions, 1 deletions
diff --git a/alarm-analysis/pom.xml b/alarm-analysis/pom.xml index 8c20995a..be817e88 100644 --- 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 7afc5280..6c9f432c 100644 --- 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 0ce32b69..862931f9 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -134,6 +134,12 @@ <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> <artifactId>vnfmarket</artifactId> @@ -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> @@ -41,6 +41,7 @@ <module>monitor</module> <module>performance</module> <module>resmgr</module> + <module>alarm-analysis</module> <module>vnfmarket</module> </modules> </project> |