From 6b8d734e71fc1677c68d85c9d78c8fa014e2b7d5 Mon Sep 17 00:00:00 2001 From: lizi00164331 Date: Thu, 10 Aug 2017 10:25:59 +0800 Subject: [PATCH] Remove the tag from esr-server. Remove the tag from esr-server code and rename the file name about openo Change-Id: I5d16e81519cec80aece5f387110f469be0e6cdf5 Issue-ID: AAI-144 Signed-off-by: lizi00164331 --- esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat | 8 ++++---- esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh | 8 ++++---- esr-core/distribution/standalone/src/main/assembly/bin/run.bat | 8 ++++---- esr-core/distribution/standalone/src/main/assembly/bin/run.sh | 4 ++-- esr-core/distribution/standalone/src/main/assembly/bin/stop.bat | 8 ++++---- esr-core/distribution/standalone/src/main/assembly/bin/stop.sh | 4 ++-- .../distribution/standalone/src/main/assembly/conf/extsys.yml | 4 ++-- ...mmon-extsys-createobj.sql => onap-common-extsys-createobj.sql} | 0 .../src/main/java/org/onap/aai/esr/common/ServiceRegistrer.java | 2 +- .../org/onap/aai/esr/externalservice/msb/MicroserviceBusRest.java | 2 +- esr-core/esr-mgr/src/main/resources/api-doc/index.html | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) rename esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/{openo-common-extsys-createobj.sql => onap-common-extsys-createobj.sql} (100%) diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat b/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat index dd86c3e..c72b2ff 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat +++ b/esr-core/distribution/standalone/src/main/assembly/bin/initDB.bat @@ -20,15 +20,15 @@ set user=%1 set password=%2 set port=%3 set host=%4 -echo start init extsys db +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\openo-common-extsys-createobj.sql +mysql -u%user% -p%password% -P%port% -h%host% < dbscripts\mysql\onap-aai-esr-createobj.sql set "err=%errorlevel%" if "%err%"=="0" ( - echo init extsys db success + echo init esr db success ) else ( - echo failed init extsys db + 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 index eb2dc24..5008e82 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh +++ b/esr-core/distribution/standalone/src/main/assembly/bin/initDB.sh @@ -21,14 +21,14 @@ user=$1 password=$2 port=$3 host=$4 -echo "start init extsys db" +echo "start init esr db" main_path=$HOME/../ -mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/openo-common-extsys-createobj.sql +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 extsys database!" + echo "failed to init esr database!" exit 1 fi -echo "init extsys database success!" +echo "init esr database success!" exit 0 diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/run.bat b/esr-core/distribution/standalone/src/main/assembly/bin/run.bat index 9de9ffa..4923ee6 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/run.bat +++ b/esr-core/distribution/standalone/src/main/assembly/bin/run.bat @@ -15,22 +15,22 @@ @REM @echo off -title extsys-service +title esr-service set RUNHOME=%~dp0 echo ### RUNHOME: %RUNHOME% -echo ### Starting extsys-service +echo ### Starting esr-service set main_path=%RUNHOME%..\ cd /d %main_path% set JAVA="%JAVA_HOME%\bin\java.exe" set port=8312 set jvm_opts=-Xms50m -Xmx128m rem set jvm_opts=%jvm_opts% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=%port%,server=y,suspend=n -set class_path=%main_path%;%main_path%extsys-service.jar +set class_path=%main_path%;%main_path%esr-service.jar echo ### jvm_opts: %jvm_opts% echo ### class_path: %class_path% -%JAVA% -classpath %class_path% %jvm_opts% org.openo.commonservice.extsys.ExtsysApp server %main_path%conf/extsys.yml +%JAVA% -classpath %class_path% %jvm_opts% org.onap.aai.esr.ExtsysApp server %main_path%conf/extsys.yml IF ERRORLEVEL 1 goto showerror exit diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/run.sh b/esr-core/distribution/standalone/src/main/assembly/bin/run.sh index 176fc69..b55e3c2 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/run.sh +++ b/esr-core/distribution/standalone/src/main/assembly/bin/run.sh @@ -29,8 +29,8 @@ port=8312 #JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=$port,server=y,suspend=n" echo @JAVA_OPTS@ $JAVA_OPTS -class_path="$main_path/:$main_path/extsys-service.jar" +class_path="$main_path/:$main_path/esr-service.jar" echo @class_path@ $class_path -"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.commonservice.extsys.ExtsysApp server "$main_path/conf/extsys.yml" +"$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.aai.esr.ExtsysApp server "$main_path/conf/extsys.yml" diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat b/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat index 170f240..60f1a13 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat +++ b/esr-core/distribution/standalone/src/main/assembly/bin/stop.bat @@ -15,17 +15,17 @@ @REM @echo off -title stopping extsys-service +title stopping esr-service set HOME=%~dp0 -set Main_Class="org.openo.commonservice.extsys.ExtsysApp" +set Main_Class="org.onap.aai.esr.ExtsysApp" -echo ================== extsys-service info ============================================= +echo ================== esr-service info ============================================= echo HOME=$HOME echo Main_Class=%Main_Class% echo =============================================================================== -echo ### Stopping extsys-service +echo ### Stopping esr-service cd /d %HOME% for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do ( diff --git a/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh b/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh index 0afe681..1ebb1b3 100644 --- a/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh +++ b/esr-core/distribution/standalone/src/main/assembly/bin/stop.sh @@ -17,9 +17,9 @@ DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` -Main_Class="org.openo.commonservice.extsys.ExtsysApp" +Main_Class="org.onap.aai.esr.ExtsysApp" -echo ================== catalog-service info ============================================= +echo ================== esr-service info ============================================= echo HOME=$HOME echo Main_Class=$Main_Class echo =============================================================================== diff --git a/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml b/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml index 33c939a..cc8b6be 100644 --- a/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml +++ b/esr-core/distribution/standalone/src/main/assembly/conf/extsys.yml @@ -43,7 +43,7 @@ database: # port: 8080 server: type: simple - rootPath: '/openoapi/extsys/v1/*' + rootPath: '/onapapi/aai/esr/v1/*' applicationContextPath: / adminContextPath: /admin connector: @@ -60,7 +60,7 @@ logging: loggers: # Sets the level for 'com.example.app' to DEBUG. - org.openo.commonservice.extsys.ExtsysApp: INFO + org.onap.aai.esr.ExtsysApp: INFO appenders: - type: console diff --git a/esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/openo-common-extsys-createobj.sql b/esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql similarity index 100% rename from esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/openo-common-extsys-createobj.sql rename to esr-core/distribution/standalone/src/main/assembly/dbscripts/mysql/onap-common-extsys-createobj.sql diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ServiceRegistrer.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ServiceRegistrer.java index c8cb3cd..f61a25b 100644 --- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ServiceRegistrer.java +++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/common/ServiceRegistrer.java @@ -69,7 +69,7 @@ public class ServiceRegistrer implements Runnable { extsysEntity.setServiceName("extsys"); extsysEntity.setProtocol("REST"); extsysEntity.setVersion("v1"); - extsysEntity.setUrl("/openoapi/extsys/v1"); + extsysEntity.setUrl("/onapapi/aai/esr/v1"); extsysEntity.setSingleNode(Config.getConfigration().getServiceIp(), "8100", 0); extsysEntity.setVisualRange("1"); } diff --git a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MicroserviceBusRest.java b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MicroserviceBusRest.java index a6a064f..f0344b1 100644 --- a/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MicroserviceBusRest.java +++ b/esr-core/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/msb/MicroserviceBusRest.java @@ -27,7 +27,7 @@ import org.onap.aai.esr.externalservice.entity.ServiceRegisterEntity; -@Path("/openoapi/microservices/v1/services") +@Path("/onapapi/microservices/v1/services") // @Path("/api/microservices/v1/services") public interface MicroserviceBusRest { @Path("") diff --git a/esr-core/esr-mgr/src/main/resources/api-doc/index.html b/esr-core/esr-mgr/src/main/resources/api-doc/index.html index 7cd76a3..54cf8b4 100644 --- a/esr-core/esr-mgr/src/main/resources/api-doc/index.html +++ b/esr-core/esr-mgr/src/main/resources/api-doc/index.html @@ -45,7 +45,7 @@ if (url && url.length > 1) { url = decodeURIComponent(url[1]); } else { - url = "/openoapi/extsys/v1/swagger.json"; + url = "/onapapi/aai/esr/v1/swagger.json"; } window.swaggerUi = new SwaggerUi({ url: url, -- 2.16.6