From 94f0257da4ada7adcbbf362381a07f52e9463894 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Thu, 14 Sep 2017 15:01:07 +0800 Subject: [PATCH] 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 --- .gitignore | 36 ++++++++++++++++++++++ pom.xml | 2 +- usecaseui-common/pom.xml | 10 ++++++ usecaseui-holmes/pom.xml | 6 ++-- usecaseui-holmes/src/main/webapp/alarm/index.html | 3 +- .../src/main/webapp/i18n/{en-US.json => en.json} | 0 .../src/main/webapp/i18n/{zh-CN.json => zh.json} | 0 7 files changed, 51 insertions(+), 6 deletions(-) create mode 100644 .gitignore rename usecaseui-holmes/src/main/webapp/i18n/{en-US.json => en.json} (100%) rename usecaseui-holmes/src/main/webapp/i18n/{zh-CN.json => zh.json} (100%) 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 @@ ONAP USECASE UI + usecaseui-holmes usecaseui-common usecaseui-monitor usecaseui-lcm - usecaseui-holmes \ 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 @@ -47,6 +47,12 @@ usecaseui-lcm 1.0.0-SNAPSHOT war + + + org.onap.usecase-ui + usecaseui-holmes + 1.0.0-SNAPSHOT + war org.apache.tiles @@ -81,6 +87,10 @@ org.onap.usecase-ui usecaseui-lcm + + + org.onap.usecase-ui + usecaseui-holmes 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 @@ 4.0.0 - holmes + usecaseui-holmes war - 1.1.0-SNAPSHOT - usecase-ui/holmes + 1.0.0-SNAPSHOT + usecase-ui/usecaseui-holmes 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 @@ - +