diff options
Diffstat (limited to 'distribution/src/main')
-rw-r--r-- | distribution/src/main/assembly/bin/find_kill_process.bat | 20 | ||||
-rw-r--r-- | distribution/src/main/assembly/bin/run.bat | 37 | ||||
-rw-r--r-- | distribution/src/main/assembly/bin/stop.bat | 30 | ||||
-rw-r--r-- | distribution/src/main/assembly/bin/stop.sh | 39 | ||||
-rw-r--r-- | distribution/src/main/assembly/conf/workflow-designer.yml | 50 | ||||
-rw-r--r-- | distribution/src/main/assembly/shutdown.bat | 24 | ||||
-rw-r--r-- | distribution/src/main/assembly/shutdown.sh | 27 | ||||
-rw-r--r-- | distribution/src/main/assembly/startup.bat | 26 | ||||
-rw-r--r-- | distribution/src/main/assembly/startup.sh | 28 | ||||
-rw-r--r-- | distribution/src/main/docker/Dockerfile (renamed from distribution/src/main/assembly/Dockerfile) | 2 |
10 files changed, 177 insertions, 106 deletions
diff --git a/distribution/src/main/assembly/bin/find_kill_process.bat b/distribution/src/main/assembly/bin/find_kill_process.bat new file mode 100644 index 00000000..6e08993f --- /dev/null +++ b/distribution/src/main/assembly/bin/find_kill_process.bat @@ -0,0 +1,20 @@ +@REM
+@REM Copyright (c) 2017 ZTE Corporation.
+@REM All rights reserved. This program and the accompanying materials
+@REM are made available under the terms of the Eclipse Public License v1.0
+@REM and the Apache License 2.0 which both accompany this distribution,
+@REM and are available at http://www.eclipse.org/legal/epl-v10.html
+@REM and http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Contributors:
+@REM ZTE - initial API and implementation and/or initial documentation
+@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/distribution/src/main/assembly/bin/run.bat b/distribution/src/main/assembly/bin/run.bat new file mode 100644 index 00000000..9ef96478 --- /dev/null +++ b/distribution/src/main/assembly/bin/run.bat @@ -0,0 +1,37 @@ +@REM
+@REM Copyright (c) 2017 ZTE Corporation.
+@REM All rights reserved. This program and the accompanying materials
+@REM are made available under the terms of the Eclipse Public License v1.0
+@REM and the Apache License 2.0 which both accompany this distribution,
+@REM and are available at http://www.eclipse.org/legal/epl-v10.html
+@REM and http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Contributors:
+@REM ZTE - initial API and implementation and/or initial documentation
+@REM
+
+@echo off
+title sdc-workflow-designer
+
+set RUNHOME=%~dp0
+echo ### RUNHOME: %RUNHOME%
+echo ### Starting sdc-workflow-designer
+set main_path=%RUNHOME%..\
+cd /d %main_path%
+set JAVA="%JAVA_HOME%\bin\java.exe"
+set port=12345
+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=y
+set class_path=%main_path%;%main_path%sdc-workflow-designer.jar
+echo ### jvm_opts: %jvm_opts%
+echo ### class_path: %class_path%
+
+%JAVA% -classpath %class_path% %jvm_opts% org.onap.sdc.workflowdesigner.WorkflowDesignerApp server %main_path%conf/workflow-designer.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/distribution/src/main/assembly/bin/stop.bat b/distribution/src/main/assembly/bin/stop.bat new file mode 100644 index 00000000..4407a449 --- /dev/null +++ b/distribution/src/main/assembly/bin/stop.bat @@ -0,0 +1,30 @@ +@REM
+@REM Copyright (c) 2017 ZTE Corporation.
+@REM All rights reserved. This program and the accompanying materials
+@REM are made available under the terms of the Eclipse Public License v1.0
+@REM and the Apache License 2.0 which both accompany this distribution,
+@REM and are available at http://www.eclipse.org/legal/epl-v10.html
+@REM and http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Contributors:
+@REM ZTE - initial API and implementation and/or initial documentation
+@REM
+
+@echo off
+title stopping sdc-workflow-designer
+
+set HOME=%~dp0
+set Main_Class="org.onap.sdc.workflowdesigner.WorkflowDesignerApp"
+
+echo ================== sdc-workflow-designer info =============================================
+echo HOME=$HOME
+echo Main_Class=%Main_Class%
+echo ===============================================================================
+
+echo ### Stopping sdc-workflow-designer
+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/distribution/src/main/assembly/bin/stop.sh b/distribution/src/main/assembly/bin/stop.sh new file mode 100644 index 00000000..3fe6d60d --- /dev/null +++ b/distribution/src/main/assembly/bin/stop.sh @@ -0,0 +1,39 @@ +# +# Copyright (c) 2017 ZTE Corporation. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# and the Apache License 2.0 which both accompany this distribution, +# and are available at http://www.eclipse.org/legal/epl-v10.html +# and http://www.apache.org/licenses/LICENSE-2.0 +# +# Contributors: +# ZTE - initial API and implementation and/or initial documentation +# + +DIRNAME=`dirname $0` +HOME=`cd $DIRNAME/; pwd` +Main_Class="org.onap.sdc.workflowdesigner.WorkflowDesignerApp" + +echo ================== sdc-workflow-designer 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/distribution/src/main/assembly/conf/workflow-designer.yml b/distribution/src/main/assembly/conf/workflow-designer.yml new file mode 100644 index 00000000..86f96870 --- /dev/null +++ b/distribution/src/main/assembly/conf/workflow-designer.yml @@ -0,0 +1,50 @@ +# +# Copyright (c) 2017 ZTE Corporation. +# All rights reserved. This program and the accompanying materials +# are made available under the Apache License, Version 2.0 +# and the Eclipse Public License v1.0 which both accompany this distribution, +# and are available at http://www.eclipse.org/legal/epl-v10.html +# and http://www.apache.org/licenses/LICENSE-2.0 +# +# Contributors: +# ZTE - initial API and implementation and/or initial documentation +# + +template: Hello, %s! + +defaultName: ${DW_DEFAULT_NAME:-Stranger} + +# use the simple server factory if you only want to run on a single port +server: + type: simple + rootPath: '/api/workflow-modeler/v1/*' + applicationContextPath: / + adminContextPath: /admin + connector: + type: http + port: 8080 + +# 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.onap.sdc.workflowdesigner.WorkflowDesignerApp: 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: ./works/logs/wfd.log + archivedLogFilenamePattern: ./works/logs/zip/wfd-%d{yyyy-MM-dd}.log.gz + archivedFileCount: 7 + timeZone: UTC diff --git a/distribution/src/main/assembly/shutdown.bat b/distribution/src/main/assembly/shutdown.bat deleted file mode 100644 index c2178a3d..00000000 --- a/distribution/src/main/assembly/shutdown.bat +++ /dev/null @@ -1,24 +0,0 @@ -@REM
-@REM Copyright 2017 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
-
-set RUNHOME=%~dp0
-echo ##RUNHOME %RUNHOME%
-
-echo ### shutdown blueprint
-start /D %RUNHOME%tomcat bin\shutdown.bat
diff --git a/distribution/src/main/assembly/shutdown.sh b/distribution/src/main/assembly/shutdown.sh deleted file mode 100644 index d1762c7b..00000000 --- a/distribution/src/main/assembly/shutdown.sh +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2017 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 "### shutdown blueprint"; -cd $RUNHOME -cd ./tomcat -export CATALINA_HOME=$RUNHOME/tomcat -export CATALINA_BASE=$RUNHOME/tomcat -$RUNHOME/tomcat/bin/shutdown.sh & -echo "### shutdown blueprint end"; diff --git a/distribution/src/main/assembly/startup.bat b/distribution/src/main/assembly/startup.bat deleted file mode 100644 index 52bfe3c7..00000000 --- a/distribution/src/main/assembly/startup.bat +++ /dev/null @@ -1,26 +0,0 @@ -@REM
-@REM Copyright 2017 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
-
-set RUNHOME=%~dp0
-echo ##RUNHOME %RUNHOME%
-
-set CATALINA_HOME=%RUNHOME%tomcat
-set CATALINA_BASE=%RUNHOME%tomcat
-echo ### Starting tomcat
-start /D %RUNHOME%tomcat bin\startup.bat
diff --git a/distribution/src/main/assembly/startup.sh b/distribution/src/main/assembly/startup.sh deleted file mode 100644 index 503b1020..00000000 --- a/distribution/src/main/assembly/startup.sh +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright 2017 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 "### Starting workflow designer"; -cd ./tomcat -if [ ! -d "$RUNHOME/tomcat/logs" ]; then - mkdir $RUNHOME/tomcat/logs -fi -export CATALINA_HOME=$RUNHOME/tomcat -export CATALINA_BASE=$RUNHOME/tomcat -$RUNHOME/tomcat/bin/catalina.sh run diff --git a/distribution/src/main/assembly/Dockerfile b/distribution/src/main/docker/Dockerfile index eaf0da22..b1ac0e54 100644 --- a/distribution/src/main/assembly/Dockerfile +++ b/distribution/src/main/docker/Dockerfile @@ -22,5 +22,5 @@ WORKDIR /home/sdc-workflow-designer ADD sdc-workflow-designer-*-linux64.tar.gz /home/sdc-workflow-designer/ RUN chmod 755 /home/sdc-workflow-designer/*.sh -ENTRYPOINT /home/sdc-workflow-designer/startup.sh +ENTRYPOINT /home/sdc-workflow-designer/bin/run.sh |