97 files changed, 22 insertions, 248 deletions

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 @@
-<?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
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 @@
-<?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>
diff --git a/esr-core/esr-mgr/dependency-reduced-pom.xml b/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 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <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>

-    <artifactId>esr-core-parent</artifactId>

+    <artifactId>aai-esr-server-parent</artifactId>

     <groupId>org.onap.aai.esr-server</groupId>

     <version>1.0.0-SNAPSHOT</version>

   </parent>

   <modelVersion>4.0.0</modelVersion>

   <artifactId>esr-mgr</artifactId>

-  <name>esr-server/esr-core/esr-mgr</name>

+  <name>esr-server/esr-mgr</name>

+  <version>1.0.0-SNAPSHOT</version>

   <build>

     <plugins>

       <plugin>

diff --git a/esr-core/esr-mgr/pom.xml b/esr-mgr/pom.xml
index f54c8fd..c524f03 100644
--- a/esr-core/esr-mgr/pom.xml
+++ b/esr-mgr/pom.xml
@@ -18,16 +18,17 @@
 -->
 <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/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
index 6552d95..6552d95 100644
--- 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
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
index 862c6a5..862c6a5 100644
--- 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
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
index 3826bf8..3826bf8 100644
--- 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
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
index 650cca8..650cca8 100644
--- 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
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
index 0bd4f01..0bd4f01 100644
--- 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
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
index 0e80e24..0e80e24 100644
--- 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
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
index 3f3f491..3f3f491 100644
--- 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
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
index dc7fbed..dc7fbed 100644
--- 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
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
index c7b022d..c7b022d 100644
--- 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
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
index 0b546a8..0b546a8 100644
--- 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
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
index 795ba96..795ba96 100644
--- 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
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
index d777db3..d777db3 100644
--- 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
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
index 4e9948a..4e9948a 100644
--- 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
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
index 540d009..540d009 100644
--- 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
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
index 205fc84..205fc84 100644
--- 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
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
index fe60469..fe60469 100644
--- 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
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
index 617edf9..617edf9 100644
--- 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
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
index 685e56d..685e56d 100644
--- 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
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
index 7f07f87..7f07f87 100644
--- 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
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
index edefe54..edefe54 100644
--- 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
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
index acfa459..acfa459 100644
--- 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
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
index 68bf1c9..68bf1c9 100644
--- 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
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
index c2088a1..c2088a1 100644
--- 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
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
index cbb65ad..cbb65ad 100644
--- 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
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
index 0c45938..0c45938 100644
--- 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
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
index f4fcf20..f4fcf20 100644
--- 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
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
index a11b5d4..a11b5d4 100644
--- 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
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
index 12bb2bc..12bb2bc 100644
--- 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
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
index 068e288..068e288 100644
--- 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
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
index 05d1789..05d1789 100644
--- 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
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
index f79f584..f79f584 100644
--- 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
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
index f385350..f385350 100644
--- 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
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
index 368a0c3..368a0c3 100644
--- 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
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
index 1a3095c..1a3095c 100644
--- 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
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
index f31140b..f31140b 100644
--- 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
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
index f7e7097..f7e7097 100644
--- 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
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
index 72f8bd7..72f8bd7 100644
--- 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
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
index 3c27178..3c27178 100644
--- 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
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
index 842feb2..842feb2 100644
--- 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
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
index d88c9ae..d88c9ae 100644
--- 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
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
index 75cc4fc..75cc4fc 100644
--- 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
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
index a1ac53c..a1ac53c 100644
--- 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
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
index eaf90a9..eaf90a9 100644
--- 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
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
index 2a5346c..2a5346c 100644
--- 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
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
index 2e11612..2e11612 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/css/reset.css
+++ b/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
index 2b982c2..2b982c2 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/css/screen.css
+++ b/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
index 991427a..991427a 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/css/typography.css
+++ b/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
index 2250b71..2250b71 100644
--- 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
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
index a54bbbb..a54bbbb 100644
--- 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
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
index 523cb92..523cb92 100644
--- 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
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
index 67e3e25..67e3e25 100644
--- 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
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
index 1e726a7..1e726a7 100644
--- 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
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
index ac2698e..ac2698e 100644
--- 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
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
index d9f2a21..d9f2a21 100644
--- 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
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
index 76aede2..76aede2 100644
--- 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
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
index abf1989..abf1989 100644
--- 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
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
index 9f93f74..9f93f74 100644
--- 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
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
index ed9d2ff..ed9d2ff 100644
--- 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
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
index 5496a65..5496a65 100644
--- 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
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
index f9f9cd4..f9f9cd4 100644
--- 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
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
index 0639388..0639388 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/images/throbber.gif
+++ b/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
index dca4f14..dca4f14 100644
--- 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
diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/index.html b/esr-mgr/src/main/resources/api-doc/index.html
index eb1968f..eb1968f 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/index.html
+++ b/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
index c66d3a5..c66d3a5 100644
--- 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
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
index 743f04b..743f04b 100644
--- 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
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
index 78f8bd9..78f8bd9 100644
--- 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
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
index d6be256..d6be256 100644
--- 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
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
index 8c1ae26..8c1ae26 100644
--- 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
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
index 09b1584..09b1584 100644
--- 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
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
index 6d9404d..6d9404d 100644
--- 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
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
index 5111145..5111145 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/lib/marked.js
+++ b/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
index 83fe8fa..83fe8fa 100644
--- 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
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
index e28bec7..e28bec7 100644
--- 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
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
index 1c76448..1c76448 100644
--- 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
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
index 378d1bb..378d1bb 100644
--- 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
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
index e183d64..e183d64 100644
--- 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
diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/o2c.html b/esr-mgr/src/main/resources/api-doc/o2c.html
index 04c8c28..04c8c28 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/o2c.html
+++ b/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
index bc23dde..bc23dde 100644
--- a/esr-core/esr-mgr/src/main/resources/api-doc/swagger-ui.js
+++ b/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
index edd853a..edd853a 100644
--- 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
diff --git a/esr-core/esr-mgr/src/test/resources/Hibernate.cfg.xml b/esr-mgr/src/test/resources/Hibernate.cfg.xml
index 8d0776d..8d0776d 100644
--- a/esr-core/esr-mgr/src/test/resources/Hibernate.cfg.xml
+++ b/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
index facfeac..facfeac 100644
--- a/esr-core/esr-mgr/src/test/resources/db/extsys.mv.db
+++ b/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
index 073c73f..073c73f 100644
--- 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
diff --git a/pom.xml b/pom.xml
index babb150..c1b68ce 100644
--- 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>
diff --git a/esr-core/distribution/standalone/pom.xml b/standalone/pom.xml
index 5d03005..9ebd0d0 100644
--- a/esr-core/distribution/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -18,14 +18,14 @@
 -->
 <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>
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
index d93ab46..d93ab46 100644
--- a/esr-core/distribution/standalone/src/main/assembly/bin/find_kill_process.bat
+++ b/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
index b79cbee..b79cbee 100644
--- a/esr-core/distribution/standalone/src/main/assembly/bin/run.bat
+++ b/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
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
index e024625..e024625 100644
--- a/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat
+++ b/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
index a7aab04..a7aab04 100644
--- a/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh
+++ b/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
index a66ccc1..a66ccc1 100644
--- a/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml
+++ b/standalone/src/main/assembly/conf/extsys.yml