From: tang peng <tang.peng5@zte.com.cn>
Date: Wed, 30 Aug 2017 05:53:24 +0000 (+0000)
Subject: Merge "Modify the configuration files"
X-Git-Tag: v1.0.0~24
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=holmes%2Fdsa.git;a=commitdiff_plain;h=85458f222bc52628e97e710eff465bdc8984d573;hp=ed73689ac565e69d89d47e74e588d96887f922ea

Merge "Modify the configuration files"
---

diff --git a/dmaap-dsa-standalone/src/main/assembly/Dockerfile b/dmaap-dsa-standalone/src/main/assembly/Dockerfile
index 77b1795..e49d027 100644
--- a/dmaap-dsa-standalone/src/main/assembly/Dockerfile
+++ b/dmaap-dsa-standalone/src/main/assembly/Dockerfile
@@ -32,7 +32,7 @@ RUN mkdir /home/holmes
 
 WORKDIR /home/holmes
 
-ADD holmes-dsa-standalone-*-linux64.tar.gz /home/holmes/
+ADD holmes-dmaap-dsa-standalone-*-linux64.tar.gz /home/holmes/
 
 RUN chmod 755 /home/holmes/bin/*.sh
 
diff --git a/dmaap-dsa-standalone/src/main/assembly/bin/run.bat b/dmaap-dsa-standalone/src/main/assembly/bin/run.bat
index 1ea81ab..01c9ca9 100644
--- a/dmaap-dsa-standalone/src/main/assembly/bin/run.bat
+++ b/dmaap-dsa-standalone/src/main/assembly/bin/run.bat
@@ -30,7 +30,7 @@ set class_path=%main_path%;%main_path%holmes-rulemgt.jar
 echo ### jvm_opts: %jvm_opts%
 echo ### class_path: %class_path%
 
-%JAVA% -classpath %class_path% %jvm_opts% org.onap.holmes.rulemgt.RuleActiveApp server %main_path%conf/rulemgt.yml
+%JAVA% -classpath %class_path% %jvm_opts% org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp server %main_path%conf/dmaap-dsa.yml
 
 IF ERRORLEVEL 1 goto showerror
 exit
diff --git a/dmaap-dsa-standalone/src/main/assembly/bin/run.sh b/dmaap-dsa-standalone/src/main/assembly/bin/run.sh
index b6ab959..8079e60 100644
--- a/dmaap-dsa-standalone/src/main/assembly/bin/run.sh
+++ b/dmaap-dsa-standalone/src/main/assembly/bin/run.sh
@@ -31,5 +31,5 @@ echo @JAVA_OPTS@ $JAVA_OPTS
 class_path="$main_path/:$main_path/holmes-rulemgt.jar"
 echo @class_path@ $class_path
 
-"$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.rulemgt.RuleActiveApp server "$main_path/conf/rulemgt.yml"
+"$JAVA" $JAVA_OPTS -classpath "$class_path" org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp server "$main_path/conf/dmaap-dsa.yml"
 
diff --git a/dmaap-dsa-standalone/src/main/assembly/bin/stop.bat b/dmaap-dsa-standalone/src/main/assembly/bin/stop.bat
index bfde362..d234ab6 100644
--- a/dmaap-dsa-standalone/src/main/assembly/bin/stop.bat
+++ b/dmaap-dsa-standalone/src/main/assembly/bin/stop.bat
@@ -18,14 +18,14 @@
 title stopping engine-d-service
 
 set HOME=%~dp0
-set Main_Class="org.onap.holmes.rulemgt.RuleActiveApp"
+set Main_Class="org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp"
 
-echo ================== engine-d-service info =============================================
+echo ================== dmaap-dsa-service info =============================================
 echo HOME=$HOME
 echo Main_Class=%Main_Class%
 echo ===============================================================================
 
-echo ### Stopping engine-d-service
+echo ### Stopping dmaap-dsa-service
 cd /d %HOME%
 
 for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do (
diff --git a/dmaap-dsa-standalone/src/main/assembly/bin/stop.sh b/dmaap-dsa-standalone/src/main/assembly/bin/stop.sh
index 2f98e77..4448949 100644
--- a/dmaap-dsa-standalone/src/main/assembly/bin/stop.sh
+++ b/dmaap-dsa-standalone/src/main/assembly/bin/stop.sh
@@ -17,9 +17,9 @@
 
 DIRNAME=`dirname $0`
 HOME=`cd $DIRNAME/; pwd`
-Main_Class="org.onap.holmes.rulemgt.RuleActiveApp"
+Main_Class="org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp"
 
-echo ================== engine-d-service info =============================================
+echo ================== dmaap-dsa-service info =============================================
 echo HOME=$HOME
 echo Main_Class=$Main_Class
 echo ===============================================================================