Including Holmes into the UUI Project 73/12373/1
authorGuangrong Fu <fu.guangrong@zte.com.cn>
Thu, 14 Sep 2017 07:01:07 +0000 (15:01 +0800)
committerGuangrong Fu <fu.guangrong@zte.com.cn>
Thu, 14 Sep 2017 07:01:07 +0000 (15:01 +0800)
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>
.gitignore [new file with mode: 0644]
pom.xml
usecaseui-common/pom.xml
usecaseui-holmes/pom.xml
usecaseui-holmes/src/main/webapp/alarm/index.html
usecaseui-holmes/src/main/webapp/i18n/en.json [moved from usecaseui-holmes/src/main/webapp/i18n/en-US.json with 100% similarity]
usecaseui-holmes/src/main/webapp/i18n/zh.json [moved from usecaseui-holmes/src/main/webapp/i18n/zh-CN.json with 100% similarity]

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..d355788
--- /dev/null
@@ -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 a69805d..d9a411c 100644 (file)
--- 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
index 5a37c92..0b004de 100644 (file)
             <artifactId>usecaseui-lcm</artifactId>
             <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>
                         <overlay>
                             <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>
index 5ed5f50..3795fbc 100644 (file)
     </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>
index 8c1c32e..bd82c49 100644 (file)
@@ -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