From: lizi00164331 Date: Thu, 7 Sep 2017 07:34:26 +0000 (+0800) Subject: Simplify esr-server project level. X-Git-Tag: v1.0.0~86 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=commitdiff_plain;h=fa6dd60a45a093205ae55065f6de044c91493e60 Simplify esr-server project level. Remove the esr-core level and distribution level, Remove database related script. Change-Id: I0204e9fcc5dabd2b6c9eb630e8bd7841b32c0b1b Issue-ID: AAI-269 Signed-off-by: lizi00164331 --- diff --git a/esr-core/distribution/pom.xml b/esr-core/distribution/pom.xml deleted file mode 100644 index 26678a8..0000000 --- a/esr-core/distribution/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - org.onap.aai.esr-server - esr-core-parent - 1.0.0-SNAPSHOT - - - 4.0.0 - distribution - esr-server/esr-core/distribution - pom - - - standalone - - diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat b/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat deleted file mode 100644 index dde251c..0000000 --- a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat +++ /dev/null @@ -1,34 +0,0 @@ -@REM -@REM Copyright 2016-2017 ZTE Corporation. -@REM -@REM Licensed under the Apache License, Version 2.0 (the "License"); -@REM you may not use this file except in compliance with the License. -@REM You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, software -@REM distributed under the License is distributed on an "AS IS" BASIS, -@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@REM See the License for the specific language governing permissions and -@REM limitations under the License. -@REM - -@echo off -set HOME=%~dp0 -set user=%1 -set password=%2 -set port=%3 -set host=%4 -echo start init esr db -echo HOME=%HOME% -set main_path=%HOME%..\ -cd /d %main_path% -mysql -u%user% -p%password% -P%port% -h%host% < dbscripts\mysql\onap-aai-esr-createobj.sql -set "err=%errorlevel%" -if "%err%"=="0" ( - echo init esr db success - ) else ( - echo failed init esr db - pause - ) \ No newline at end of file diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh b/esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh deleted file mode 100644 index 60f7be0..0000000 --- a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# 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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -DIRNAME=`dirname $0` -HOME=`cd $DIRNAME/; pwd` -user=$1 -password=$2 -port=$3 -host=$4 -echo "start init esr db" -main_path=$HOME/../ -mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/onap-aai-esr-createobj.sql -sql_result=$? -if [ $sql_result != 0 ] ; then - echo "failed to init esr database!" - exit 1 -fi -echo "init esr database success!" -exit 0 - diff --git a/esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql b/esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql deleted file mode 100644 index c489c0e..0000000 --- a/esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql +++ /dev/null @@ -1,91 +0,0 @@ --- --- 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 --- --- Unless required by applicable law or agreed to in writing, software --- distributed under the License is distributed on an "AS IS" BASIS, --- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. --- See the License for the specific language governing permissions and --- limitations under the License. --- - -/******************drop old database and user***************************/ -use mysql; -drop database IF EXISTS extsys; -delete from user where User='extsys'; -FLUSH PRIVILEGES; - -/******************create new database and user***************************/ -create database extsys CHARACTER SET utf8; - -GRANT ALL PRIVILEGES ON extsys.* TO 'extsys'@'%' IDENTIFIED BY 'extsys' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'extsys'@'%' IDENTIFIED BY 'extsys' WITH GRANT OPTION; - -GRANT ALL PRIVILEGES ON extsys.* TO 'extsys'@'localhost' IDENTIFIED BY 'extsys' WITH GRANT OPTION; -GRANT ALL PRIVILEGES ON mysql.* TO 'extsys'@'localhost' IDENTIFIED BY 'extsys' WITH GRANT OPTION; -FLUSH PRIVILEGES; - -use extsys; -set Names 'utf8'; -/******************drop old table and create new***************************/ -DROP TABLE IF EXISTS extsys_base_table; -CREATE TABLE extsys_base_table ( - ID VARCHAR(200) NOT NULL, - NAME VARCHAR(200) NULL, - TYPE VARCHAR(200) NULL, - VENDOR VARCHAR(100) NULL, - VERSION VARCHAR(100) NULL, - DESCRIPTION VARCHAR(100) NULL, - CREATETIME VARCHAR(200) NULL, - CATAGORY VARCHAR(200) NULL, - CONSTRAINT extsys_base_table PRIMARY KEY(ID) -); -DROP TABLE IF EXISTS extsys_ems_table; -CREATE TABLE extsys_ems_table ( - EMSID VARCHAR(200) NOT NULL, - URL VARCHAR(100) NULL, - PRODUCTNAME VARCHAR(100) NULL, - USERNAME VARCHAR(100) NULL, - PASSWORD VARCHAR(100) NULL, - CONSTRAINT extsys_ems_table PRIMARY KEY(EMSID) -); - -DROP TABLE IF EXISTS extsys_sdnc_table; -CREATE TABLE extsys_sdnc_table ( - SDNCONTROLLERID VARCHAR(200) NOT NULL, - URL VARCHAR(100) NULL, - USERNAME VARCHAR(100) NULL, - PASSWORD VARCHAR(100) NULL, - PRODUCTNAME VARCHAR(100) NULL, - PROTOCOL VARCHAR(100) NULL, - CONSTRAINT extsys_sdnc_table PRIMARY KEY(SDNCONTROLLERID) -); - -DROP TABLE IF EXISTS extsys_vim_table; -CREATE TABLE extsys_vim_table ( - VIMID VARCHAR(200) NOT NULL, - URL VARCHAR(100) NULL, - USERNAME VARCHAR(100) NULL, - PASSWORD VARCHAR(100) NULL, - DOMAIN VARCHAR(100) NULL, - TENANT VARCHAR(100) NULL, - CONSTRAINT extsys_vim_table PRIMARY KEY(VIMID) -); - -DROP TABLE IF EXISTS extsys_vnfm_table; -CREATE TABLE extsys_vnfm_table ( - VNFMID VARCHAR(200) NOT NULL, - URL VARCHAR(200) NULL, - USERNAME VARCHAR(100) NULL, - PASSWORD VARCHAR(100) NULL, - VIMID VARCHAR(100) NULL, - CERTIFICATEURL VARCHAR(200) NULL, - CONSTRAINT extsys_vnfm_table PRIMARY KEY(VNFMID) -); - - diff --git a/esr-core/pom.xml b/esr-core/pom.xml deleted file mode 100644 index 807a30f..0000000 --- a/esr-core/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - org.onap.aai.esr-server - aai-esr-server-parent - 1.0.0-SNAPSHOT - - - 4.0.0 - esr-core-parent - esr-server/esr-core - 1.0.0-SNAPSHOT - pom - - - esr-mgr - distribution - - diff --git a/esr-core/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml similarity index 94% rename from esr-core/esr-mgr/dependency-reduced-pom.xml rename to esr-mgr/dependency-reduced-pom.xml index 92b69ff..e2448bd 100644 --- a/esr-core/esr-mgr/dependency-reduced-pom.xml +++ b/esr-mgr/dependency-reduced-pom.xml @@ -1,13 +1,14 @@ - esr-core-parent + aai-esr-server-parent org.onap.aai.esr-server 1.0.0-SNAPSHOT 4.0.0 esr-mgr - esr-server/esr-core/esr-mgr + esr-server/esr-mgr + 1.0.0-SNAPSHOT diff --git a/esr-core/esr-mgr/pom.xml b/esr-mgr/pom.xml similarity index 96% rename from esr-core/esr-mgr/pom.xml rename to esr-mgr/pom.xml index f54c8fd..c524f03 100644 --- a/esr-core/esr-mgr/pom.xml +++ b/esr-mgr/pom.xml @@ -18,16 +18,17 @@ --> - - org.onap.aai.esr-server - esr-core-parent - 1.0.0-SNAPSHOT - - - 4.0.0 - esr-mgr - esr-server/esr-core/esr-mgr - jar + + org.onap.aai.esr-server + aai-esr-server-parent + 1.0.0-SNAPSHOT + + + 4.0.0 + esr-mgr + esr-server/esr-mgr + 1.0.0-SNAPSHOT + jar diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java rename to esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java b/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java rename to esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java rename to esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java rename to esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java rename to esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java b/esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java rename to esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java b/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java rename to esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java b/esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java rename to esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java rename to esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java rename to esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java rename to esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java rename to esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java b/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java rename to esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java rename to esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java rename to esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java rename to esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java rename to esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java rename to esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java similarity index 100% rename from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java rename to esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF b/esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF rename to esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml b/esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml rename to esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/css/reset.css b/esr-mgr/src/main/resources/api-doc/css/reset.css similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/css/reset.css rename to esr-mgr/src/main/resources/api-doc/css/reset.css diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/css/screen.css b/esr-mgr/src/main/resources/api-doc/css/screen.css similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/css/screen.css rename to esr-mgr/src/main/resources/api-doc/css/screen.css diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/css/typography.css b/esr-mgr/src/main/resources/api-doc/css/typography.css similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/css/typography.css rename to esr-mgr/src/main/resources/api-doc/css/typography.css diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 b/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 rename to esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/images/explorer_icons.png b/esr-mgr/src/main/resources/api-doc/images/explorer_icons.png similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/images/explorer_icons.png rename to esr-mgr/src/main/resources/api-doc/images/explorer_icons.png diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/images/logo_small.png b/esr-mgr/src/main/resources/api-doc/images/logo_small.png similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/images/logo_small.png rename to esr-mgr/src/main/resources/api-doc/images/logo_small.png diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/images/pet_store_api.png b/esr-mgr/src/main/resources/api-doc/images/pet_store_api.png similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/images/pet_store_api.png rename to esr-mgr/src/main/resources/api-doc/images/pet_store_api.png diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/images/throbber.gif b/esr-mgr/src/main/resources/api-doc/images/throbber.gif similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/images/throbber.gif rename to esr-mgr/src/main/resources/api-doc/images/throbber.gif diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/images/wordnik_api.png b/esr-mgr/src/main/resources/api-doc/images/wordnik_api.png similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/images/wordnik_api.png rename to esr-mgr/src/main/resources/api-doc/images/wordnik_api.png diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/index.html b/esr-mgr/src/main/resources/api-doc/index.html similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/index.html rename to esr-mgr/src/main/resources/api-doc/index.html diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/backbone-min.js b/esr-mgr/src/main/resources/api-doc/lib/backbone-min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/backbone-min.js rename to esr-mgr/src/main/resources/api-doc/lib/backbone-min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js b/esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js rename to esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js b/esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js rename to esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js b/esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js rename to esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js b/esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js rename to esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js b/esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js rename to esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js b/esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js rename to esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/marked.js b/esr-mgr/src/main/resources/api-doc/lib/marked.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/marked.js rename to esr-mgr/src/main/resources/api-doc/lib/marked.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js b/esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js rename to esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/shred/content.js b/esr-mgr/src/main/resources/api-doc/lib/shred/content.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/shred/content.js rename to esr-mgr/src/main/resources/api-doc/lib/shred/content.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-client.js b/esr-mgr/src/main/resources/api-doc/lib/swagger-client.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-client.js rename to esr-mgr/src/main/resources/api-doc/lib/swagger-client.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js b/esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js rename to esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/lib/underscore-min.js b/esr-mgr/src/main/resources/api-doc/lib/underscore-min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/lib/underscore-min.js rename to esr-mgr/src/main/resources/api-doc/lib/underscore-min.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/o2c.html b/esr-mgr/src/main/resources/api-doc/o2c.html similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/o2c.html rename to esr-mgr/src/main/resources/api-doc/o2c.html diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.js b/esr-mgr/src/main/resources/api-doc/swagger-ui.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.js rename to esr-mgr/src/main/resources/api-doc/swagger-ui.js diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.min.js b/esr-mgr/src/main/resources/api-doc/swagger-ui.min.js similarity index 100% rename from esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.min.js rename to esr-mgr/src/main/resources/api-doc/swagger-ui.min.js diff --git a/esr-core/esr-mgr/src/test/resources/Hibernate.cfg.xml b/esr-mgr/src/test/resources/Hibernate.cfg.xml similarity index 100% rename from esr-core/esr-mgr/src/test/resources/Hibernate.cfg.xml rename to esr-mgr/src/test/resources/Hibernate.cfg.xml diff --git a/esr-core/esr-mgr/src/test/resources/db/extsys.mv.db b/esr-mgr/src/test/resources/db/extsys.mv.db similarity index 100% rename from esr-core/esr-mgr/src/test/resources/db/extsys.mv.db rename to esr-mgr/src/test/resources/db/extsys.mv.db diff --git a/esr-core/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql b/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql similarity index 100% rename from esr-core/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql rename to esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql diff --git a/pom.xml b/pom.xml index babb150..c1b68ce 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,8 @@ 1.0.0-SNAPSHOT aai-esr-server-parent - esr-core + esr-mgr + standalone diff --git a/esr-core/distribution/standalone/pom.xml b/standalone/pom.xml similarity index 97% rename from esr-core/distribution/standalone/pom.xml rename to standalone/pom.xml index 5d03005..9ebd0d0 100644 --- a/esr-core/distribution/standalone/pom.xml +++ b/standalone/pom.xml @@ -18,14 +18,14 @@ --> - org.onap.aai.esr-server - distribution - 1.0.0-SNAPSHOT - + org.onap.aai.esr-server + aai-esr-server-parent + 1.0.0-SNAPSHOT + 4.0.0 standalone - esr-server/esr-core/distribution/standalone + esr-server/standalone pom diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/find_kill_process.bat b/standalone/src/main/assembly/bin/find_kill_process.bat similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/bin/find_kill_process.bat rename to standalone/src/main/assembly/bin/find_kill_process.bat diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/run.bat b/standalone/src/main/assembly/bin/run.bat similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/bin/run.bat rename to standalone/src/main/assembly/bin/run.bat diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/run.sh b/standalone/src/main/assembly/bin/run.sh similarity index 99% rename from esr-core/distribution/standalone/src/main/assembly/bin/run.sh rename to standalone/src/main/assembly/bin/run.sh index d12fec5..6678624 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/run.sh +++ b/standalone/src/main/assembly/bin/run.sh @@ -25,7 +25,7 @@ echo @JAVA@ $JAVA main_path=$RUNHOME/../ cd $main_path JAVA_OPTS="-Xms50m -Xmx128m" -port=8312 +port=9518 #JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" echo @JAVA_OPTS@ $JAVA_OPTS diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat b/standalone/src/main/assembly/bin/stop.bat similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/bin/stop.bat rename to standalone/src/main/assembly/bin/stop.bat diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh b/standalone/src/main/assembly/bin/stop.sh similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/bin/stop.sh rename to standalone/src/main/assembly/bin/stop.sh diff --git a/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml b/standalone/src/main/assembly/conf/extsys.yml similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml rename to standalone/src/main/assembly/conf/extsys.yml