From 227ce45bc31b48c6707efbca7ca461f0e7ad0b60 Mon Sep 17 00:00:00 2001 From: sunqi310 Date: Mon, 21 Nov 2016 15:17:01 +0800 Subject: TOSCA-64 Modify shell scripts directory Change-Id: Ia3fe95057455cd8fb3d4def5106ccf5cb2ea83bd Issue-id: TOSCA-64 Signed-off-by: sunqi310 --- .../catalog-all/src/main/assembly/shutdown.bat | 2 +- .../catalog-all/src/main/assembly/shutdown.sh | 2 +- .../catalog-all/src/main/assembly/startup.bat | 5 ++- .../catalog-all/src/main/assembly/startup.sh | 2 +- .../src/main/assembly/bin/find_kill_process.bat | 24 ++++++++++++ .../src/main/assembly/bin/initDB.bat | 34 +++++++++++++++++ .../src/main/assembly/bin/initDB.sh | 34 +++++++++++++++++ .../src/main/assembly/bin/run.bat | 41 ++++++++++++++++++++ .../src/main/assembly/bin/run.sh | 35 +++++++++++++++++ .../src/main/assembly/bin/stop.bat | 34 +++++++++++++++++ .../src/main/assembly/bin/stop.sh | 44 ++++++++++++++++++++++ .../src/main/assembly/find_kill_process.bat | 24 ------------ .../src/main/assembly/initDB.bat | 33 ---------------- .../catalog-standalone/src/main/assembly/initDB.sh | 33 ---------------- .../catalog-standalone/src/main/assembly/run.bat | 40 -------------------- .../catalog-standalone/src/main/assembly/run.sh | 34 ----------------- .../catalog-standalone/src/main/assembly/stop.bat | 34 ----------------- .../catalog-standalone/src/main/assembly/stop.sh | 44 ---------------------- 18 files changed, 252 insertions(+), 247 deletions(-) create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/find_kill_process.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat delete mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh (limited to 'catalog-core') 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/bin/find_kill_process.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/find_kill_process.bat new file mode 100644 index 00000000..a4a2f069 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/find_kill_process.bat @@ -0,0 +1,24 @@ +@REM +@REM Copyright 2016 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 %1 | findstr %2 >NUL +echo ERRORLEVEL=%ERRORLEVEL% +IF ERRORLEVEL 1 goto findend +for /f "tokens=1" %%a in (%1) do ( + echo kill %1 + taskkill /F /pid %%a +) +:findend \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat new file mode 100644 index 00000000..10749c3a --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.bat @@ -0,0 +1,34 @@ +@REM +@REM Copyright 2016 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 catalog db +echo HOME=%HOME% +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 + ) else ( + echo failed init catalog db + pause + ) \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh new file mode 100644 index 00000000..9cde0cd7 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/initDB.sh @@ -0,0 +1,34 @@ +#!/bin/bash +# +# Copyright 2016 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 catalog db" +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!" + exit 1 +fi +echo "init catalog database success!" +exit 0 + diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat new file mode 100644 index 00000000..74c64b1f --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.bat @@ -0,0 +1,41 @@ +@REM +@REM Copyright 2016 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 +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=%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 %main_path%conf/catalog.yml + +IF ERRORLEVEL 1 goto showerror +exit +:showerror +echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check! +echo After checking, press any key to close +pause +exit \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh new file mode 100644 index 00000000..3d251af8 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/run.sh @@ -0,0 +1,35 @@ +# +# Copyright 2016 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` +RUNHOME=`cd $DIRNAME/; pwd` +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="$main_path/:$main_path/catalog-service.jar" +echo @class_path@ $class_path + +"$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/bin/stop.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.bat new file mode 100644 index 00000000..7036ade3 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.bat @@ -0,0 +1,34 @@ +@REM +@REM Copyright 2016 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 +title stopping catalog-service + +set HOME=%~dp0 +set Main_Class="org.openo.commontosca.catalog.CatalogApp" + +echo ================== catalog-service info ============================================= +echo HOME=$HOME +echo Main_Class=%Main_Class% +echo =============================================================================== + +echo ### Stopping catalog-service +cd /d %HOME% + +for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do ( + call find_kill_process "%%i" %Main_Class% +) +exit \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh new file mode 100644 index 00000000..841a4401 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/bin/stop.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# +# Copyright 2016 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` +Main_Class="org.openo.commontosca.catalog.CatalogApp" + +echo ================== catalog-service info ============================================= +echo HOME=$HOME +echo Main_Class=$Main_Class +echo =============================================================================== +cd $HOME; pwd + +echo @WORK_DIR@ $HOME + +function save_service_pid(){ + service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'` + echo @service_pid@ $service_pid +} + +function kill_service_process(){ + ps -p $service_pid + if [ $? == 0 ]; then + kill -9 $service_pid + fi +} + +save_service_pid; +echo @C_CMD@ kill -9 $service_pid +kill_service_process; \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat deleted file mode 100644 index a4a2f069..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat +++ /dev/null @@ -1,24 +0,0 @@ -@REM -@REM Copyright 2016 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 %1 | findstr %2 >NUL -echo ERRORLEVEL=%ERRORLEVEL% -IF ERRORLEVEL 1 goto findend -for /f "tokens=1" %%a in (%1) do ( - echo kill %1 - taskkill /F /pid %%a -) -:findend \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat deleted file mode 100644 index 67ed4447..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat +++ /dev/null @@ -1,33 +0,0 @@ -@REM -@REM Copyright 2016 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 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 "err=%errorlevel%" -if "%err%"=="0" ( - echo init catalog db success - ) else ( - echo failed init catalog db - pause - ) \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh deleted file mode 100644 index 40569e9b..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# -# Copyright 2016 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 catalog db" -mysql -u$user -p$password -P$port -h$host <$HOME/dbscripts/mysql/openo-common_tosca-catalog-createobj.sql -sql_result=$? -if [ $sql_result != 0 ] ; then - echo "failed to init catalog database!" - exit 1 -fi -echo "init catalog database success!" -exit 0 - diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat deleted file mode 100644 index 2a53942e..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat +++ /dev/null @@ -1,40 +0,0 @@ -@REM -@REM Copyright 2016 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 -title catalog-service - -set RUNHOME=%~dp0 -echo ### RUNHOME: %RUNHOME% -echo ### Starting catalog-service - -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 -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 - -IF ERRORLEVEL 1 goto showerror -exit -:showerror -echo WARNING: Error occurred during startup or Server abnormally stopped by way of killing the process,Please check! -echo After checking, press any key to close -pause -exit \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh deleted file mode 100644 index b82a7fb3..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2016 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` -RUNHOME=`cd $DIRNAME/; pwd` -echo @RUNHOME@ $RUNHOME - -echo @JAVA_HOME@ $JAVA_HOME -JAVA="$JAVA_HOME/bin/java" -echo @JAVA@ $JAVA - -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" -echo @class_path@ $class_path - -"$JAVA" $JAVA_OPTS -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp server "$RUNHOME/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/stop.bat deleted file mode 100644 index 7036ade3..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat +++ /dev/null @@ -1,34 +0,0 @@ -@REM -@REM Copyright 2016 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 -title stopping catalog-service - -set HOME=%~dp0 -set Main_Class="org.openo.commontosca.catalog.CatalogApp" - -echo ================== catalog-service info ============================================= -echo HOME=$HOME -echo Main_Class=%Main_Class% -echo =============================================================================== - -echo ### Stopping catalog-service -cd /d %HOME% - -for /f "delims=" %%i in ('"%JAVA_HOME%\bin\jcmd"') do ( - call find_kill_process "%%i" %Main_Class% -) -exit \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh deleted file mode 100644 index 841a4401..00000000 --- a/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# -# Copyright 2016 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` -Main_Class="org.openo.commontosca.catalog.CatalogApp" - -echo ================== catalog-service info ============================================= -echo HOME=$HOME -echo Main_Class=$Main_Class -echo =============================================================================== -cd $HOME; pwd - -echo @WORK_DIR@ $HOME - -function save_service_pid(){ - service_pid=`ps -ef | grep $Main_Class | grep -v grep | awk '{print $2}'` - echo @service_pid@ $service_pid -} - -function kill_service_process(){ - ps -p $service_pid - if [ $? == 0 ]; then - kill -9 $service_pid - fi -} - -save_service_pid; -echo @C_CMD@ kill -9 $service_pid -kill_service_process; \ No newline at end of file -- cgit 1.2.3-korg