summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2017-09-14 15:01:07 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2017-09-14 15:01:07 +0800
commit94f0257da4ada7adcbbf362381a07f52e9463894 (patch)
treea799c6c605dd3218f9ad37742954846d88406dc1
parent92a98cb3564e72b8a273e88e5840923050ae6d17 (diff)
Including Holmes into the UUI Project
Change the project structure to include Holmes while compiling Change the base url from /holmes/ to /usecase-ui/holmes/ Change the name of i18n files Change-Id: I5580fc979757120bae1dbcf380ee4a4bf87ff349 Issue-ID: HOLMES-50 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
-rw-r--r--.gitignore36
-rw-r--r--pom.xml2
-rw-r--r--usecaseui-common/pom.xml10
-rw-r--r--usecaseui-holmes/pom.xml6
-rw-r--r--usecaseui-holmes/src/main/webapp/alarm/index.html3
-rw-r--r--usecaseui-holmes/src/main/webapp/i18n/en.json (renamed from usecaseui-holmes/src/main/webapp/i18n/en-US.json)0
-rw-r--r--usecaseui-holmes/src/main/webapp/i18n/zh.json (renamed from usecaseui-holmes/src/main/webapp/i18n/zh-CN.json)0
7 files changed, 51 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..d3557889
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+# Ignore Mac temp files
+.DS_Store
+
+# Ignore Vim temporary files
+.*.sw?
+
+# Ignore changes to the JJB Configuration File
+jenkins.ini
+
+# We don't want .netrc files since they're credential files
+.netrc
+
+# Maven
+target/
+
+# Vagrant
+.vagrant
+
+# IntelliJ
+.idea/
+*.iml
+
+# Eclipse
+.project
+/.pydevproject
+
+# Python
+.tox/
+__pycache__/
+*.pyc
+
+# node
+node/
+node_modules/
+foo/
+holmes/
diff --git a/pom.xml b/pom.xml
index a69805dd..d9a411c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,9 +30,9 @@
<name>ONAP USECASE UI</name>
<modules>
+ <module>usecaseui-holmes</module>
<module>usecaseui-common</module>
<module>usecaseui-monitor</module>
<module>usecaseui-lcm</module>
- <module>usecaseui-holmes</module>
</modules>
</project> \ No newline at end of file
diff --git a/usecaseui-common/pom.xml b/usecaseui-common/pom.xml
index 5a37c929..0b004de6 100644
--- a/usecaseui-common/pom.xml
+++ b/usecaseui-common/pom.xml
@@ -48,6 +48,12 @@
<version>1.0.0-SNAPSHOT</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.onap.usecase-ui</groupId>
+ <artifactId>usecaseui-holmes</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
<dependency>
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-jsp</artifactId>
@@ -82,6 +88,10 @@
<groupId>org.onap.usecase-ui</groupId>
<artifactId>usecaseui-lcm</artifactId>
</overlay>
+ <overlay>
+ <groupId>org.onap.usecase-ui</groupId>
+ <artifactId>usecaseui-holmes</artifactId>
+ </overlay>
</overlays>
</configuration>
</plugin>
diff --git a/usecaseui-holmes/pom.xml b/usecaseui-holmes/pom.xml
index 5ed5f50f..3795fbc2 100644
--- a/usecaseui-holmes/pom.xml
+++ b/usecaseui-holmes/pom.xml
@@ -24,10 +24,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>holmes</artifactId>
+ <artifactId>usecaseui-holmes</artifactId>
<packaging>war</packaging>
- <version>1.1.0-SNAPSHOT</version>
- <name>usecase-ui/holmes</name>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>usecase-ui/usecaseui-holmes</name>
<build>
<plugins>
diff --git a/usecaseui-holmes/src/main/webapp/alarm/index.html b/usecaseui-holmes/src/main/webapp/alarm/index.html
index 8c1c32e2..bd82c49d 100644
--- a/usecaseui-holmes/src/main/webapp/alarm/index.html
+++ b/usecaseui-holmes/src/main/webapp/alarm/index.html
@@ -17,7 +17,7 @@
<html>
<head>
- <base href="/holmes/">
+ <base href="/usecase-ui/holmes/">
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<!--<script src="../public/thirdparty/js/jquery_1.12.4.min.js"></script>
@@ -36,7 +36,6 @@
<body style="overflow: auto">
<remote-config>Loading...</remote-config>
-
</body>
</html> \ No newline at end of file
diff --git a/usecaseui-holmes/src/main/webapp/i18n/en-US.json b/usecaseui-holmes/src/main/webapp/i18n/en.json
index 5d824fe5..5d824fe5 100644
--- a/usecaseui-holmes/src/main/webapp/i18n/en-US.json
+++ b/usecaseui-holmes/src/main/webapp/i18n/en.json
diff --git a/usecaseui-holmes/src/main/webapp/i18n/zh-CN.json b/usecaseui-holmes/src/main/webapp/i18n/zh.json
index 565c4578..565c4578 100644
--- a/usecaseui-holmes/src/main/webapp/i18n/zh-CN.json
+++ b/usecaseui-holmes/src/main/webapp/i18n/zh.json