From 49302058ca6f43eb04d5cd5287aba012d489ebff Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 18 Aug 2016 18:39:15 +0800 Subject: 1. Adjust the directory hierarchy 2. Fix the compile issue 3.Fix the licences check warning Change-Id: I0b9326d2dcdf08ced160ebe367b4b88e292137ee Signed-off-by: huangjian --- .../assembly/conf/catalog-db-createdb-mysql.sql | 34 ++++++++ .../conf/catalog-resource-createObj-mysql.sql | 75 ++++++++++++++++++ .../conf/catalog-resource-insert-extend-mysql.sql | 17 ++++ .../conf/catalog-resource-insert-mysql.sql | 20 +++++ .../src/main/assembly/conf/catalog.yml | 92 ++++++++++++++++++++++ .../src/main/assembly/find_kill_process.bat | 24 ++++++ .../src/main/assembly/initDB.bat | 42 ++++++++++ .../catalog-standalone/src/main/assembly/initDB.sh | 31 ++++++++ .../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 +++++++++++ 12 files changed, 487 insertions(+) create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat create mode 100644 catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh (limited to 'catalog-core/distribution/catalog-standalone/src') diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql new file mode 100644 index 00000000..9b7ed341 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-db-createdb-mysql.sql @@ -0,0 +1,34 @@ +-- +-- Copyright 2016 [ZTE] and others. +-- +-- 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. +-- + +/******************drop old database and user***************************/ +use mysql; +drop database IF EXISTS catalog; +delete from user where User='catalog'; +FLUSH PRIVILEGES; + +/******************create new database and user***************************/ +create database catalog CHARACTER SET utf8; + +GRANT ALL PRIVILEGES ON catalog.* TO 'catalog'@'%' IDENTIFIED BY 'catalog' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'catalog'@'%' IDENTIFIED BY 'catalog' WITH GRANT OPTION; + +GRANT ALL PRIVILEGES ON catalog.* TO 'catalog'@'localhost' IDENTIFIED BY 'catalog' WITH GRANT OPTION; +GRANT ALL PRIVILEGES ON mysql.* TO 'catalog'@'localhost' IDENTIFIED BY 'catalog' WITH GRANT OPTION; +FLUSH PRIVILEGES; + +use catalog; +set Names 'utf8'; diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql new file mode 100644 index 00000000..d49e60ba --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-createObj-mysql.sql @@ -0,0 +1,75 @@ +-- +-- Copyright 2016 [ZTE] and others. +-- +-- 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. +-- + +use catalog; +DROP TABLE IF EXISTS catalog_package_table; + +CREATE TABLE catalog_package_table ( + CSARID VARCHAR(200) NOT NULL, + DOWNLOADURI VARCHAR(200) NULL, + SIZE VARCHAR(100) NULL, + FORMAT VARCHAR(100) NULL, + CREATETIME VARCHAR(100) NULL, + DELETIONPENDING VARCHAR(100) NULL, + MODIFYTIME VARCHAR(100) NULL, + OPERATIONALSTATE VARCHAR(100) NULL, + USAGESTATE VARCHAR(100) NULL, + ONBOARDSTATE VARCHAR(100) NULL, + NAME VARCHAR(100) NULL, + VERSION VARCHAR(20) NULL, + PROVIDER VARCHAR(300) NULL, + TYPE VARCHAR(300) NULL, + PROCESSSTATE VARCHAR(100) NULL, + CONSTRAINT CATALOG_PACKAGE_TABLE_OID PRIMARY KEY(CSARID) +); + +DROP TABLE IF EXISTS catalog_service_template_table; +CREATE TABLE catalog_service_template_table ( + SERVICETEMPLATEID VARCHAR(200) NOT NULL, + TEMPLATENAME VARCHAR(100) NULL, + TYPE VARCHAR(50) NULL, + VENDOR VARCHAR(100) NULL, + VERSION VARCHAR(20) NULL, + CSARID VARCHAR(100) NULL, + INPUTS LONGTEXT NULL, + ROWDATA LONGTEXT NULL, + OPERATIONS LONGTEXT NULL, + DOWNLOADURI VARCHAR(200) NULL, + + CONSTRAINT CATALOG_SERVICE_TEMPLATE_TABLE_OID PRIMARY KEY(SERVICETEMPLATEID) +); + +DROP TABLE IF EXISTS catalog_node_template_table; +CREATE TABLE catalog_node_template_table ( + NODETEMPLATEID VARCHAR(200) NOT NULL, + NAME VARCHAR(100) NULL, + SERVICETEMPLATEID VARCHAR(200) NULL, + TYPE VARCHAR(50) NULL, + PROPERTIES LONGTEXT NULL, + RELATIONSHIPS LONGTEXT NULL, + + CONSTRAINT catalog_node_template_table PRIMARY KEY(NODETEMPLATEID) +); +DROP TABLE IF EXISTS catalog_model_substitution_mapping_table; +CREATE TABLE catalog_model_substitution_mapping_table ( + MAPPINGID VARCHAR(200) NOT NULL, + NODETYPE VARCHAR(100) NULL, + SERVICETEMPLATEID VARCHAR(200) NULL, + REQUIREMENTS LONGTEXT NULL, + CAPABILITIES LONGTEXT NULL, + + CONSTRAINT catalog_model_substitution_mapping_table PRIMARY KEY(MAPPINGID) +); diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql new file mode 100644 index 00000000..50b0c190 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-extend-mysql.sql @@ -0,0 +1,17 @@ +-- +-- Copyright 2016 [ZTE] and others. +-- +-- 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. +-- + +-- \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql new file mode 100644 index 00000000..d0bd6180 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog-resource-insert-mysql.sql @@ -0,0 +1,20 @@ +-- +-- Copyright 2016 [ZTE] and others. +-- +-- 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. +-- + +SET autocommit = 0; + +COMMIT; +SET autocommit = 1; \ No newline at end of file diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml new file mode 100644 index 00000000..14deab79 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/conf/catalog.yml @@ -0,0 +1,92 @@ +# +# Copyright 2016 [ZTE] and others. +# +# 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. +# + +template: Hello, %s! + +defaultName: ${DW_DEFAULT_NAME:-Stranger} + +msbServerAddr: http://127.0.0.1:80 + +httpServerAddr: http://127.0.0.1:8080 + +opentoscaServerAddr: http://127.0.0.1:1337 + +yamlParseAddr: http://127.0.0.1:8210 + +#catalogue path to store csar temperarily +cataloguePath: ./catalog +httpServerPath: ../tomcat/webapps/ROOT/ +#database +database: + + # the name of your JDBC driver + driverClass: com.mysql.jdbc.Driver + + # the username + user: catalog + + # the password + password: catalog + + # the JDBC URL + url: jdbc:mysql://10.74.148.157:3306/catalog +#LDAP +ldapServerIp: 127.0.0.1 +ldapServerPort: 20096 +ldapLogindn: uid=admin,ou=system +ldapPassword: nsoc +ldapVersion: 3 + +# use the simple server factory if you only want to run on a single port +#server: +# type: simple +# connector: +# type: http +# port: 8080 +server: + type: simple + rootPath: '/openoapi/catalog/v1/*' + applicationContextPath: / + adminContextPath: /admin + connector: + type: http + port: 8212 + +# Logging settings. +logging: + + # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL. + level: ALL + + # Logger-specific levels. + loggers: + + # Sets the level for 'com.example.app' to DEBUG. + org.openo.commontosca.catalog.catalog.CatalogApp: INFO + + appenders: + - type: console + threshold: INFO + timeZone: UTC + logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n" + - type: file + threshold: INFO + logFormat: "%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %m%n" + currentLogFilename: ./logs/catalog.log + archivedLogFilenamePattern: ./logs/zip/catalog-%d{yyyy-MM-dd}.log.gz + archivedFileCount: 7 + timeZone: UTC + 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 new file mode 100644 index 00000000..e3644ddf --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/find_kill_process.bat @@ -0,0 +1,24 @@ +@REM +@REM Copyright 2016 [ZTE] and others. +@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 new file mode 100644 index 00000000..61a00e69 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.bat @@ -0,0 +1,42 @@ +@REM +@REM Copyright 2016 [ZTE] and others. +@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 init catalog db + +set RUNHOME=%~dp0 +echo ### RUNHOME: %RUNHOME% + +echo ### init catalog db +rem cd /d %RUNHOME% + +set JAVA="%JAVA_HOME%\bin\java.exe" +set port=8777 +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 db migrate %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/initDB.sh b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh new file mode 100644 index 00000000..b950f88c --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/initDB.sh @@ -0,0 +1,31 @@ +# +# Copyright 2016 [ZTE] and others. +# +# 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 + +title catalog Database setup + +echo ### Starting catalog Database setup +echo @JAVA_HOME@ $JAVA_HOME +JAVA="$JAVA_HOME/bin/java" +echo @JAVA@ $JAVA + +class_path="$RUNHOME/:$RUNHOME/catalog-service.jar" +echo @class_path@ $class_path + +"$JAVA" -classpath "$class_path" org.openo.commontosca.catalog.CatalogApp db migrate "$RUNHOME/conf/catalog.yml" diff --git a/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat new file mode 100644 index 00000000..7dbcab0e --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.bat @@ -0,0 +1,40 @@ +@REM +@REM Copyright 2016 [ZTE] and others. +@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 new file mode 100644 index 00000000..4eda12c4 --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/run.sh @@ -0,0 +1,34 @@ +# +# Copyright 2016 [ZTE] and others. +# +# 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 new file mode 100644 index 00000000..f3e7c08f --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.bat @@ -0,0 +1,34 @@ +@REM +@REM Copyright 2016 [ZTE] and others. +@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 new file mode 100644 index 00000000..40ae2dad --- /dev/null +++ b/catalog-core/distribution/catalog-standalone/src/main/assembly/stop.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# +# Copyright 2016 [ZTE] and others. +# +# 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