Simplify esr-server project level. 51/10751/1
authorlizi00164331 <li.zi30@zte.com.cn>
Thu, 7 Sep 2017 07:34:26 +0000 (15:34 +0800)
committerlizi00164331 <li.zi30@zte.com.cn>
Thu, 7 Sep 2017 07:34:26 +0000 (15:34 +0800)
Remove the esr-core level and distribution level, Remove database related script.

Change-Id: I0204e9fcc5dabd2b6c9eb630e8bd7841b32c0b1b
Issue-ID: AAI-269
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
97 files changed:
esr-core/distribution/pom.xml [deleted file]
esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat [deleted file]
esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh [deleted file]
esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql [deleted file]
esr-core/pom.xml [deleted file]
esr-mgr/dependency-reduced-pom.xml [moved from esr-core/esr-mgr/dependency-reduced-pom.xml with 94% similarity]
esr-mgr/pom.xml [moved from esr-core/esr-mgr/pom.xml with 96% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysApp.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/ExtsysAppConfiguration.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Config.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ExtSysResuorceType.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/MsbUtil.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/Parameters.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/BaseData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/EmsData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/SdncData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VimData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/aai/VnfmData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AlarmAddr.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/AuthInfoItem.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/BaseRestData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/EmsRestData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/FtpAddr.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/RegisterResponse.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/ThirdPartySdncRestData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VimRestData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/entity/rest/VnfmRestData.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/exception/ExtsysException.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiAdapterConfig.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiCommon.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/AaiServiceConsumer.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/IEsrVimRest.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/CloudRegion.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrEms.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrSystemInfo.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrThirdpartySdnc.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/EsrVnfm.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/entity/ServiceNode.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MsbHelper.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/EmsManager.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/ThirdpatySdncManager.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VimManager.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/resource/VnfmManager.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/ExtsysUtil.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/util/RestResponseUtil.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java with 100% similarity]
esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java [moved from esr-core/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java with 100% similarity]
esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF [moved from esr-core/esr-mgr/src/main/resources/api-doc/META-INF/MANIFEST.MF with 100% similarity]
esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml [moved from esr-core/esr-mgr/src/main/resources/api-doc/WEB-INF/web.xml with 100% similarity]
esr-mgr/src/main/resources/api-doc/css/reset.css [moved from esr-core/esr-mgr/src/main/resources/api-doc/css/reset.css with 100% similarity]
esr-mgr/src/main/resources/api-doc/css/screen.css [moved from esr-core/esr-mgr/src/main/resources/api-doc/css/screen.css with 100% similarity]
esr-mgr/src/main/resources/api-doc/css/typography.css [moved from esr-core/esr-mgr/src/main/resources/api-doc/css/typography.css with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.eot with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.svg with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.ttf with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-700.woff2 with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.eot with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.svg with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.ttf with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff with 100% similarity]
esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 [moved from esr-core/esr-mgr/src/main/resources/api-doc/fonts/droid-sans-v6-latin-regular.woff2 with 100% similarity]
esr-mgr/src/main/resources/api-doc/images/explorer_icons.png [moved from esr-core/esr-mgr/src/main/resources/api-doc/images/explorer_icons.png with 100% similarity]
esr-mgr/src/main/resources/api-doc/images/logo_small.png [moved from esr-core/esr-mgr/src/main/resources/api-doc/images/logo_small.png with 100% similarity]
esr-mgr/src/main/resources/api-doc/images/pet_store_api.png [moved from esr-core/esr-mgr/src/main/resources/api-doc/images/pet_store_api.png with 100% similarity]
esr-mgr/src/main/resources/api-doc/images/throbber.gif [moved from esr-core/esr-mgr/src/main/resources/api-doc/images/throbber.gif with 100% similarity]
esr-mgr/src/main/resources/api-doc/images/wordnik_api.png [moved from esr-core/esr-mgr/src/main/resources/api-doc/images/wordnik_api.png with 100% similarity]
esr-mgr/src/main/resources/api-doc/index.html [moved from esr-core/esr-mgr/src/main/resources/api-doc/index.html with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/backbone-min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/backbone-min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/handlebars-2.0.0.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/highlight.7.3.pack.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery-1.8.0.min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.ba-bbq.min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.slideto.min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/jquery.wiggle.min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/marked.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/marked.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/shred.bundle.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/shred/content.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/shred/content.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/swagger-client.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-client.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/swagger-oauth.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/lib/underscore-min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/lib/underscore-min.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/o2c.html [moved from esr-core/esr-mgr/src/main/resources/api-doc/o2c.html with 100% similarity]
esr-mgr/src/main/resources/api-doc/swagger-ui.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.js with 100% similarity]
esr-mgr/src/main/resources/api-doc/swagger-ui.min.js [moved from esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.min.js with 100% similarity]
esr-mgr/src/test/resources/Hibernate.cfg.xml [moved from esr-core/esr-mgr/src/test/resources/Hibernate.cfg.xml with 100% similarity]
esr-mgr/src/test/resources/db/extsys.mv.db [moved from esr-core/esr-mgr/src/test/resources/db/extsys.mv.db with 100% similarity]
esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql [moved from esr-core/esr-mgr/src/test/resources/sql/extsys-resource-createObj-mysql.sql with 100% similarity]
pom.xml
standalone/pom.xml [moved from esr-core/distribution/standalone/pom.xml with 97% similarity]
standalone/src/main/assembly/bin/find_kill_process.bat [moved from esr-core/distribution/standalone/src/main/assembly/bin/find_kill_process.bat with 100% similarity]
standalone/src/main/assembly/bin/run.bat [moved from esr-core/distribution/standalone/src/main/assembly/bin/run.bat with 100% similarity]
standalone/src/main/assembly/bin/run.sh [moved from esr-core/distribution/standalone/src/main/assembly/bin/run.sh with 99% similarity]
standalone/src/main/assembly/bin/stop.bat [moved from esr-core/distribution/standalone/src/main/assembly/bin/stop.bat with 100% similarity]
standalone/src/main/assembly/bin/stop.sh [moved from esr-core/distribution/standalone/src/main/assembly/bin/stop.sh with 100% similarity]
standalone/src/main/assembly/conf/extsys.yml [moved from esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml with 100% similarity]

diff --git a/esr-core/distribution/pom.xml b/esr-core/distribution/pom.xml
deleted file mode 100644 (file)
index 26678a8..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.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.
-
--->
-<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-server</groupId>
-        <artifactId>esr-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>distribution</artifactId>
-    <name>esr-server/esr-core/distribution</name>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>standalone</module>
-    </modules>
-</project>
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 (file)
index dde251c..0000000
+++ /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 (file)
index 60f7be0..0000000
+++ /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 (file)
index c489c0e..0000000
+++ /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 (file)
index 807a30f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.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.
-
--->
-<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-server</groupId>
-        <artifactId>aai-esr-server-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>esr-core-parent</artifactId>
-    <name>esr-server/esr-core</name>
-       <version>1.0.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>esr-mgr</module>
-        <module>distribution</module>
-    </modules>
-</project>
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 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
   <parent>\r
-    <artifactId>esr-core-parent</artifactId>\r
+    <artifactId>aai-esr-server-parent</artifactId>\r
     <groupId>org.onap.aai.esr-server</groupId>\r
     <version>1.0.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>esr-mgr</artifactId>\r
-  <name>esr-server/esr-core/esr-mgr</name>\r
+  <name>esr-server/esr-mgr</name>\r
+  <version>1.0.0-SNAPSHOT</version>\r
   <build>\r
     <plugins>\r
       <plugin>\r
similarity index 96%
rename from esr-core/esr-mgr/pom.xml
rename to esr-mgr/pom.xml
index f54c8fd..c524f03 100644 (file)
 -->
 <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-server</groupId>
-        <artifactId>esr-core-parent</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>esr-mgr</artifactId>
-    <name>esr-server/esr-core/esr-mgr</name>
-    <packaging>jar</packaging>
+       <parent>
+               <groupId>org.onap.aai.esr-server</groupId>
+               <artifactId>aai-esr-server-parent</artifactId>
+               <version>1.0.0-SNAPSHOT</version>
+       </parent>
+       
+       <modelVersion>4.0.0</modelVersion>
+       <artifactId>esr-mgr</artifactId>
+       <name>esr-server/esr-mgr</name>
+       <version>1.0.0-SNAPSHOT</version>
+       <packaging>jar</packaging>
 
     <build>
         <plugins>
diff --git a/pom.xml b/pom.xml
index babb150..c1b68ce 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,8 @@
     <version>1.0.0-SNAPSHOT</version>
     <name>aai-esr-server-parent</name>
     <modules>
-        <module>esr-core</module>
+        <module>esr-mgr</module>
+               <module>standalone</module>
     </modules>
        
        <properties>
similarity index 97%
rename from esr-core/distribution/standalone/pom.xml
rename to standalone/pom.xml
index 5d03005..9ebd0d0 100644 (file)
 -->
 <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-server</groupId>
-        <artifactId>distribution</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
+               <groupId>org.onap.aai.esr-server</groupId>
+               <artifactId>aai-esr-server-parent</artifactId>
+               <version>1.0.0-SNAPSHOT</version>
+       </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>standalone</artifactId>
-    <name>esr-server/esr-core/distribution/standalone</name>
+    <name>esr-server/standalone</name>
     <packaging>pom</packaging>
 
     <properties>
@@ -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