From 227ce45bc31b48c6707efbca7ca461f0e7ad0b60 Mon Sep 17 00:00:00 2001
From: sunqi310 <sun.qi310@zte.com.cn>
Date: Mon, 21 Nov 2016 15:17:01 +0800
Subject: [PATCH] TOSCA-64 Modify shell scripts directory

Change-Id: Ia3fe95057455cd8fb3d4def5106ccf5cb2ea83bd
Issue-id: TOSCA-64
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>
---
 .../distribution/catalog-all/src/main/assembly/shutdown.bat        | 2 +-
 .../distribution/catalog-all/src/main/assembly/shutdown.sh         | 2 +-
 .../distribution/catalog-all/src/main/assembly/startup.bat         | 5 +++--
 catalog-core/distribution/catalog-all/src/main/assembly/startup.sh | 2 +-
 .../src/main/assembly/{ => bin}/find_kill_process.bat              | 0
 .../catalog-standalone/src/main/assembly/{ => bin}/initDB.bat      | 5 +++--
 .../catalog-standalone/src/main/assembly/{ => bin}/initDB.sh       | 3 ++-
 .../catalog-standalone/src/main/assembly/{ => bin}/run.bat         | 7 ++++---
 .../catalog-standalone/src/main/assembly/{ => bin}/run.sh          | 7 ++++---
 .../catalog-standalone/src/main/assembly/{ => bin}/stop.bat        | 0
 .../catalog-standalone/src/main/assembly/{ => bin}/stop.sh         | 0
 11 files changed, 19 insertions(+), 14 deletions(-)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/find_kill_process.bat (100%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/initDB.bat (84%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/initDB.sh (86%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/run.bat (86%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/run.sh (87%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/stop.bat (100%)
 rename catalog-core/distribution/catalog-standalone/src/main/assembly/{ => bin}/stop.sh (100%)

diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat
index d08d4fc8..06663fe2 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.bat
@@ -22,7 +22,7 @@ echo ##RUNHOME %RUNHOME%
 
 
 echo ### Starting catalog
-start /D %RUNHOME%catalog stop.bat
+start /D %RUNHOME%catalog bin\stop.bat
 
 echo ### Starting tomcat
 start /D %RUNHOME%tomcat bin\shutdown.bat 
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
index d6bca27f..291e3555 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/shutdown.sh
@@ -20,7 +20,7 @@ echo @RUNHOME@ $RUNHOME
 
 echo "### Starting catalog";
 cd catalog
-$RUNHOME/catalog/stop.sh &
+$RUNHOME/catalog/bin/stop.sh &
 cd $RUNHOME
 
 
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat b/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat
index ebba72e5..fbd74a73 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.bat
@@ -22,8 +22,9 @@ echo ##RUNHOME %RUNHOME%
 
 
 echo ### Starting catalog
-start /D %RUNHOME%catalog run.bat
-
+start /D %RUNHOME%catalog bin\run.bat
+set CATALINA_HOME=%RUNHOME%tomcat
+set CATALINA_BASE=%RUNHOME%tomcat
 echo ### Starting tomcat
 start /D %RUNHOME%tomcat bin\startup.bat 
 
diff --git a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
index f3b3e5fb..b9e8ea68 100644
--- a/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
+++ b/catalog-core/distribution/catalog-all/src/main/assembly/startup.sh
@@ -21,7 +21,7 @@ echo @RUNHOME@ $RUNHOME
 
 echo "### Starting catalog";
 cd catalog
-$RUNHOME/catalog/run.sh &
+$RUNHOME/catalog/bin/run.sh &
 cd $RUNHOME
 
 
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/find_kill_process.bat
similarity index 100%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/find_kill_process.bat
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat
similarity index 84%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat
index 67ed4447..10749c3a 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat
@@ -22,8 +22,9 @@ set port=%3
 set host=%4
 echo start init catalog db
 echo HOME=%HOME%
-cd /d %HOME%
-mysql -u%user% -p%password% -P%port% -h%host% < %HOME%\dbscripts\mysql\openo-common_tosca-catalog-createobj.sql
+set main_path=%HOME%..\
+cd /d %main_path%
+mysql -u%user% -p%password% -P%port% -h%host% < %main_path%\dbscripts\mysql\openo-common_tosca-catalog-createobj.sql
 set "err=%errorlevel%"
 if "%err%"=="0" (
    echo init catalog db success
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh
similarity index 86%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh
index 40569e9b..9cde0cd7 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh
@@ -22,7 +22,8 @@ password=$2
 port=$3
 host=$4
 echo "start init catalog db"
-mysql -u$user -p$password -P$port -h$host <$HOME/dbscripts/mysql/openo-common_tosca-catalog-createobj.sql
+main_path=$HOME/../
+mysql -u$user -p$password -P$port -h$host <$main_path/dbscripts/mysql/openo-common_tosca-catalog-createobj.sql
 sql_result=$?
 if [ $sql_result != 0 ] ; then
    echo "failed to init catalog database!"
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat
similarity index 86%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat
index 2a53942e..74c64b1f 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat
@@ -20,16 +20,17 @@ title catalog-service
 set RUNHOME=%~dp0
 echo ### RUNHOME: %RUNHOME%
 echo ### Starting catalog-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=%RUNHOME%;%RUNHOME%catalog-service.jar
+set class_path=%main_path%;%main_path%catalog-service.jar
 echo ### jvm_opts: %jvm_opts%
 echo ### class_path: %class_path%
 
-%JAVA% -classpath %class_path% %jvm_opts% org.openo.commontosca.catalog.CatalogApp server %RUNHOME%conf/catalog.yml
+%JAVA% -classpath %class_path% %jvm_opts% org.openo.commontosca.catalog.CatalogApp server %main_path%conf/catalog.yml
 
 IF ERRORLEVEL 1 goto showerror
 exit
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh
similarity index 87%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh
index b82a7fb3..3d251af8 100644
--- a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh
+++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh
@@ -21,14 +21,15 @@ echo @RUNHOME@ $RUNHOME
 echo @JAVA_HOME@ $JAVA_HOME
 JAVA="$JAVA_HOME/bin/java"
 echo @JAVA@ $JAVA
-
+main_path=$RUNHOME/../
+cd $main_path
 JAVA_OPTS="-Xms50m -Xmx128m"
 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="$RUNHOME/:$RUNHOME/catalog-service.jar"
+class_path="$main_path/:$main_path/catalog-service.jar"
 echo @class_path@ $class_path
 
-"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp server "$RUNHOME/conf/catalog.yml"
+"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp server "$main_path/conf/catalog.yml"
 
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.bat
similarity index 100%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.bat
diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh
similarity index 100%
rename from catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh
rename to catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh
-- 
2.16.6