Try to fix the daily builed failed bug.

change the esr catagory name to portal, Fix the pom definition.

Change-Id: I21861aba0fe9b7d0528c5ffcb220d6e6096efcc4
Issue-ID: AAI-224
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

diff --git a/common/pom.xml b/common/pom.xml
index ed1eec2..934a97d 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -17,12 +17,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.onap.aai.esr-gui</groupId>
-    <artifactId>esr-gui</artifactId>
+    <artifactId>aai-esr-gui-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>common</artifactId>
+  <artifactId>esr-gui-common</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
   <name>esr-gui/common</name>

diff --git a/integration/pom.xml b/integration/pom.xml
index 4bf3fb9..4f737cb 100644 (file)
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -17,12 +17,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.onap.aai.esr-gui</groupId>
-        <artifactId>esr-gui</artifactId>
+        <artifactId>aai-esr-gui-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>integration</artifactId>
+    <artifactId>aai-esr-gui-integration</artifactId>
     <packaging>war</packaging>
     <name>esr-gui/integration</name>
 

diff --git a/pom.xml b/pom.xml
index 5ac0dbf..78c5d34 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (C) 2017 CMCC, Inc. and others. All rights reserved.
+    Copyright 2016-2017 ZTE Corporation.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+        http://www.apache.org/licenses/LICENSE-2.0
 
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
@@ -21,18 +21,17 @@
       <groupId>org.onap.oparent</groupId>
       <artifactId>oparent</artifactId>
       <version>1.0.0-SNAPSHOT</version>
-      <relativePath>../oparent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aai.esr-gui</groupId>
-    <artifactId>esr-gui</artifactId>
+    <artifactId>aai-esr-gui-parent</artifactId>
     <packaging>pom</packaging>
-    <name>esr-gui</name>
+    <name>aai-esr-gui-parent</name>
 
     <modules>
         <module>common</module>
-        <module>esr</module>
+        <module>portal</module>
                <module>integration</module>
     </modules>
 </project>

diff --git a/esr/pom.xml b/portal/pom.xml
similarity index 91%
rename from esr/pom.xml
rename to portal/pom.xml
index 278f307..aa63a25 100644 (file)
--- a/esr/pom.xml
+++ b/portal/pom.xml
@@ -19,14 +19,14 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.onap.aai.esr-gui</groupId>
-        <artifactId>esr-gui</artifactId>
+        <artifactId>aai-esr-gui-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>esr</artifactId>
+    <artifactId>aai-esr-gui-portal</artifactId>
        <version>1.0.0-SNAPSHOT</version>
     <packaging>war</packaging>
-    <name>esr-gui/esr</name>
+    <name>esr-gui/portal</name>
     <build>
         <plugins>
             <plugin>

diff --git a/esr/src/main/webapp/extsys/ems/css/animate.min.css b/portal/src/main/webapp/extsys/ems/css/animate.min.css
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/css/animate.min.css
rename to portal/src/main/webapp/extsys/ems/css/animate.min.css

diff --git a/esr/src/main/webapp/extsys/ems/css/ems.css b/portal/src/main/webapp/extsys/ems/css/ems.css
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/css/ems.css
rename to portal/src/main/webapp/extsys/ems/css/ems.css

diff --git a/esr/src/main/webapp/extsys/ems/emsView.html b/portal/src/main/webapp/extsys/ems/emsView.html
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/emsView.html
rename to portal/src/main/webapp/extsys/ems/emsView.html

diff --git a/esr/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-en-US.properties b/portal/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-en-US.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-en-US.properties
rename to portal/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-en-US.properties

diff --git a/esr/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-zh-CN.properties b/portal/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-zh-CN.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-zh-CN.properties
rename to portal/src/main/webapp/extsys/ems/i18n/nfv-nso-iui-i18n-zh-CN.properties

diff --git a/esr/src/main/webapp/extsys/ems/js/commonUtil.js b/portal/src/main/webapp/extsys/ems/js/commonUtil.js
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/js/commonUtil.js
rename to portal/src/main/webapp/extsys/ems/js/commonUtil.js

diff --git a/esr/src/main/webapp/extsys/ems/js/ems-validate.js b/portal/src/main/webapp/extsys/ems/js/ems-validate.js
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/js/ems-validate.js
rename to portal/src/main/webapp/extsys/ems/js/ems-validate.js

diff --git a/esr/src/main/webapp/extsys/ems/js/emsController.js b/portal/src/main/webapp/extsys/ems/js/emsController.js
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/js/emsController.js
rename to portal/src/main/webapp/extsys/ems/js/emsController.js

diff --git a/esr/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js
rename to portal/src/main/webapp/extsys/ems/js/loadi18n_nsoc.js

diff --git a/esr/src/main/webapp/extsys/ems/mock-data/ems.json b/portal/src/main/webapp/extsys/ems/mock-data/ems.json
similarity index 100%
rename from esr/src/main/webapp/extsys/ems/mock-data/ems.json
rename to portal/src/main/webapp/extsys/ems/mock-data/ems.json

diff --git a/esr/src/main/webapp/extsys/sdncontroller/css/animate.min.css b/portal/src/main/webapp/extsys/sdncontroller/css/animate.min.css
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/css/animate.min.css
rename to portal/src/main/webapp/extsys/sdncontroller/css/animate.min.css

diff --git a/esr/src/main/webapp/extsys/sdncontroller/css/sdnc.css b/portal/src/main/webapp/extsys/sdncontroller/css/sdnc.css
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/css/sdnc.css
rename to portal/src/main/webapp/extsys/sdncontroller/css/sdnc.css

diff --git a/esr/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-en-US.properties b/portal/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-en-US.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-en-US.properties
rename to portal/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-en-US.properties

diff --git a/esr/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-zh-CN.properties b/portal/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-zh-CN.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-zh-CN.properties
rename to portal/src/main/webapp/extsys/sdncontroller/i18n/nfv-nso-iui-i18n-zh-CN.properties

diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/commonUtil.js b/portal/src/main/webapp/extsys/sdncontroller/js/commonUtil.js
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/js/commonUtil.js
rename to portal/src/main/webapp/extsys/sdncontroller/js/commonUtil.js

diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js
rename to portal/src/main/webapp/extsys/sdncontroller/js/loadi18n_nsoc.js

diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/sdnc-validate.js b/portal/src/main/webapp/extsys/sdncontroller/js/sdnc-validate.js
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/js/sdnc-validate.js
rename to portal/src/main/webapp/extsys/sdncontroller/js/sdnc-validate.js

diff --git a/esr/src/main/webapp/extsys/sdncontroller/js/sdncController.js b/portal/src/main/webapp/extsys/sdncontroller/js/sdncController.js
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/js/sdncController.js
rename to portal/src/main/webapp/extsys/sdncontroller/js/sdncController.js

diff --git a/esr/src/main/webapp/extsys/sdncontroller/mock-data/sdnc.json b/portal/src/main/webapp/extsys/sdncontroller/mock-data/sdnc.json
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/mock-data/sdnc.json
rename to portal/src/main/webapp/extsys/sdncontroller/mock-data/sdnc.json

diff --git a/esr/src/main/webapp/extsys/sdncontroller/sdncView.html b/portal/src/main/webapp/extsys/sdncontroller/sdncView.html
similarity index 100%
rename from esr/src/main/webapp/extsys/sdncontroller/sdncView.html
rename to portal/src/main/webapp/extsys/sdncontroller/sdncView.html

diff --git a/esr/src/main/webapp/extsys/vim/css/bootstrap.css b/portal/src/main/webapp/extsys/vim/css/bootstrap.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/css/bootstrap.css
rename to portal/src/main/webapp/extsys/vim/css/bootstrap.css

diff --git a/esr/src/main/webapp/extsys/vim/css/skill.css b/portal/src/main/webapp/extsys/vim/css/skill.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/css/skill.css
rename to portal/src/main/webapp/extsys/vim/css/skill.css

diff --git a/esr/src/main/webapp/extsys/vim/css/vim.css b/portal/src/main/webapp/extsys/vim/css/vim.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/css/vim.css
rename to portal/src/main/webapp/extsys/vim/css/vim.css

diff --git a/esr/src/main/webapp/extsys/vim/css/vimChart.css b/portal/src/main/webapp/extsys/vim/css/vimChart.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/css/vimChart.css
rename to portal/src/main/webapp/extsys/vim/css/vimChart.css

diff --git a/esr/src/main/webapp/extsys/vim/i18n/loadi18nApp.js b/portal/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
rename to portal/src/main/webapp/extsys/vim/i18n/loadi18nApp.js

diff --git a/esr/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties b/portal/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
rename to portal/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties

diff --git a/esr/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties b/portal/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties
rename to portal/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-zh-CN.properties

diff --git a/esr/src/main/webapp/extsys/vim/js/client-cometd.js b/portal/src/main/webapp/extsys/vim/js/client-cometd.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/client-cometd.js
rename to portal/src/main/webapp/extsys/vim/js/client-cometd.js

diff --git a/esr/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js b/portal/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js
rename to portal/src/main/webapp/extsys/vim/js/jqBootstrapValidation.js

diff --git a/esr/src/main/webapp/extsys/vim/js/vim-validate.js b/portal/src/main/webapp/extsys/vim/js/vim-validate.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/vim-validate.js
rename to portal/src/main/webapp/extsys/vim/js/vim-validate.js

diff --git a/esr/src/main/webapp/extsys/vim/js/vimChart.js b/portal/src/main/webapp/extsys/vim/js/vimChart.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/vimChart.js
rename to portal/src/main/webapp/extsys/vim/js/vimChart.js

diff --git a/esr/src/main/webapp/extsys/vim/js/vimChartController.js b/portal/src/main/webapp/extsys/vim/js/vimChartController.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/vimChartController.js
rename to portal/src/main/webapp/extsys/vim/js/vimChartController.js

diff --git a/esr/src/main/webapp/extsys/vim/js/vimController.js b/portal/src/main/webapp/extsys/vim/js/vimController.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/vimController.js
rename to portal/src/main/webapp/extsys/vim/js/vimController.js

diff --git a/esr/src/main/webapp/extsys/vim/js/vimUtil.js b/portal/src/main/webapp/extsys/vim/js/vimUtil.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/js/vimUtil.js
rename to portal/src/main/webapp/extsys/vim/js/vimUtil.js

diff --git a/esr/src/main/webapp/extsys/vim/mock-data/vim.json b/portal/src/main/webapp/extsys/vim/mock-data/vim.json
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/mock-data/vim.json
rename to portal/src/main/webapp/extsys/vim/mock-data/vim.json

diff --git a/esr/src/main/webapp/extsys/vim/vimChart.html b/portal/src/main/webapp/extsys/vim/vimChart.html
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/vimChart.html
rename to portal/src/main/webapp/extsys/vim/vimChart.html

diff --git a/esr/src/main/webapp/extsys/vim/vimView.html b/portal/src/main/webapp/extsys/vim/vimView.html
similarity index 100%
rename from esr/src/main/webapp/extsys/vim/vimView.html
rename to portal/src/main/webapp/extsys/vim/vimView.html

diff --git a/esr/src/main/webapp/extsys/vnfm/css/animate.min.css b/portal/src/main/webapp/extsys/vnfm/css/animate.min.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/css/animate.min.css
rename to portal/src/main/webapp/extsys/vnfm/css/animate.min.css

diff --git a/esr/src/main/webapp/extsys/vnfm/css/vnfm.css b/portal/src/main/webapp/extsys/vnfm/css/vnfm.css
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/css/vnfm.css
rename to portal/src/main/webapp/extsys/vnfm/css/vnfm.css

diff --git a/esr/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties b/portal/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
rename to portal/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties

diff --git a/esr/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties b/portal/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties
rename to portal/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-zh-CN.properties

diff --git a/esr/src/main/webapp/extsys/vnfm/js/commonUtil.js b/portal/src/main/webapp/extsys/vnfm/js/commonUtil.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/js/commonUtil.js
rename to portal/src/main/webapp/extsys/vnfm/js/commonUtil.js

diff --git a/esr/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js b/portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js
rename to portal/src/main/webapp/extsys/vnfm/js/loadi18n_nsoc.js

diff --git a/esr/src/main/webapp/extsys/vnfm/js/vnfm-validate.js b/portal/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/js/vnfm-validate.js
rename to portal/src/main/webapp/extsys/vnfm/js/vnfm-validate.js

diff --git a/esr/src/main/webapp/extsys/vnfm/js/vnfmController.js b/portal/src/main/webapp/extsys/vnfm/js/vnfmController.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/js/vnfmController.js
rename to portal/src/main/webapp/extsys/vnfm/js/vnfmController.js

diff --git a/esr/src/main/webapp/extsys/vnfm/js/vnfmUtil.js b/portal/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/js/vnfmUtil.js
rename to portal/src/main/webapp/extsys/vnfm/js/vnfmUtil.js

diff --git a/esr/src/main/webapp/extsys/vnfm/vnfmView.html b/portal/src/main/webapp/extsys/vnfm/vnfmView.html
similarity index 100%
rename from esr/src/main/webapp/extsys/vnfm/vnfmView.html
rename to portal/src/main/webapp/extsys/vnfm/vnfmView.html