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 (file)
--- 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 (file)
--- 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%\r
 echo ### class_path: %class_path%\r
 \r
-%JAVA% -classpath %class_path% %jvm_opts% org.onap.holmes.rulemgt.RuleActiveApp server %main_path%conf/rulemgt.yml\r
+%JAVA% -classpath %class_path% %jvm_opts% org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp server %main_path%conf/dmaap-dsa.yml\r
 \r
 IF ERRORLEVEL 1 goto showerror\r
 exit\r

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 (file)
--- 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 (file)
--- 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\r
 \r
 set HOME=%~dp0\r
-set Main_Class="org.onap.holmes.rulemgt.RuleActiveApp"\r
+set Main_Class="org.onap.holmes.dsa.dmaap.DmaapDsaActiveApp"\r
 \r
-echo ================== engine-d-service info =============================================\r
+echo ================== dmaap-dsa-service info =============================================\r
 echo HOME=$HOME\r
 echo Main_Class=%Main_Class%\r
 echo ===============================================================================\r
 \r
-echo ### Stopping engine-d-service\r
+echo ### Stopping dmaap-dsa-service\r
 cd /d %HOME%\r
 \r
 for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do (\r

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 (file)
--- 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 ===============================================================================