From db52e4d66d60184d53a27ba4d6772461daacc03d Mon Sep 17 00:00:00 2001 From: tknall Date: Fri, 22 Mar 2013 08:57:51 +0000 Subject: Maintenance update (bugfixes, new features, cleanup...) Refer to /dok/RELEASE_NOTES-3.3.txt for further information. git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/pdf-as/trunk@931 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- .../src/main/assembly/tomcat/scripts/catalina.env | 11 ++++ .../main/assembly/tomcat/scripts/setVariables.bat | 62 ++++++++++++++++++++++ .../main/assembly/tomcat/scripts/startTomcat.bat | 5 ++ .../main/assembly/tomcat/scripts/startTomcat.sh | 7 +++ .../main/assembly/tomcat/scripts/stopTomcat.bat | 5 ++ .../src/main/assembly/tomcat/scripts/stopTomcat.sh | 7 +++ 6 files changed, 97 insertions(+) create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/catalina.env create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/setVariables.bat create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.bat create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.sh create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.bat create mode 100644 pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.sh (limited to 'pdf-as-web/src/main/assembly/tomcat/scripts') diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/catalina.env b/pdf-as-web/src/main/assembly/tomcat/scripts/catalina.env new file mode 100644 index 0000000..3ee2300 --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/catalina.env @@ -0,0 +1,11 @@ +export CATALINA_HOME=`pwd` +export CATALINA_BASE=`pwd` +export CATALINA_OPTS="\ + -Djava.io.tmpdir=$CATALINA_BASE/temp \ + -Dpdf-as.work-dir=$CATALINA_BASE/conf/pdf-as \ + -server \ + -Xss1024K \ + -Xms128M \ + -Xmx512M \ + -XX:MaxPermSize=256m \ +" diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/setVariables.bat b/pdf-as-web/src/main/assembly/tomcat/scripts/setVariables.bat new file mode 100644 index 0000000..ba61144 --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/setVariables.bat @@ -0,0 +1,62 @@ +@echo off + +set SERVICE_NAME=tomcatpdfas +set SERVICE_DESCRIPTION=ports: shutdown=8005, http=8080 +set SERVICE_DISPLAY_NAME=Apache Tomcat ${tomcat.version} - PDF-AS ${project.version} +set TITLE=%SERVICE_DISPLAY_NAME% + +rem Set Tomcat installation folder, otherwise automatic detection will be performed. +set TOMCAT_DIR=%CD% + +rem Set Java installation folder, otherwise default JRE/JDK will be used. +rem set JAVA_HOME= + + +rem *** do not change settings beyond this point *** + +if exist %TOMCAT_DIR%\webapps\nul goto START +goto FIND_TOMCAT_DIR + +:FIND_TOMCAT_DIR +set TOMCAT_DIR= +if exist webapps\nul set TOMCAT_DIR=%CD% +if exist ..\webapps\nul set TOMCAT_DIR=%CD%\.. +if exist apache-tomcat-${tomcat.version}\webapps\nul set TOMCAT_DIR=%CD%\apache-tomcat-${tomcat.version} +if "%TOMCAT_DIR%"=="" goto TOMCAT_DIR_NOT_FOUND +goto START + +:TOMCAT_DIR_NOT_FOUND +echo. +echo Unable to find Tomcat installation folder. +goto END + +:START +set CATALINA_HOME=%TOMCAT_DIR% +set CATALINA_BASE=%TOMCAT_DIR% +set PDFAS_WORK_DIR=%CATALINA_BASE%\conf\pdf-as + +rem PARAMETERS +set PDFAS_WORK_DIR_PARAM=-Dpdf-as.work-dir="%PDFAS_WORK_DIR%" + +rem MEMORY SETTINGS + +rem Thread stack size in KB +set JVM_XSS=1024 + +rem Initial memory pool size in MB +set JVM_XMS=128 + +rem Maximum memory pool size in MB +set JVM_XMX=1024 + +rem Maximum PermGenSize in M +set JVM_MAXPERMSIZE=256 + +rem COMMAND LINE OPTIONS +set JAVA_OPTS=-server -Xss%JVM_XSS%k -Xms%JVM_XMS%m -Xmx%JVM_XMX%m -XX:MaxPermSize=%JVM_MAXPERMSIZE%m +set CATALINA_OPTS=%PDFAS_WORK_DIR_PARAM% + +rem SERVICE OPTIONS +set SERVICE_OPTS=%PDFAS_WORK_DIR_PARAM%;-XX:MaxPermSize=%JVM_MAXPERMSIZE%m + +:END diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.bat b/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.bat new file mode 100644 index 0000000..8db7b39 --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.bat @@ -0,0 +1,5 @@ +@echo off +call setVariables.bat +echo. +cd /d %CATALINA_HOME% +bin\catalina.bat start diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.sh b/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.sh new file mode 100644 index 0000000..caacfbc --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/startTomcat.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +DEFAULT=`pwd`/catalina.env +. $DEFAULT + +$CATALINA_HOME/bin/catalina.sh run + diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.bat b/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.bat new file mode 100644 index 0000000..9c59fb5 --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.bat @@ -0,0 +1,5 @@ +@echo off +call setVariables.bat +echo. +cd %CATALINA_HOME% +bin\catalina.bat stop diff --git a/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.sh b/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.sh new file mode 100644 index 0000000..c5943eb --- /dev/null +++ b/pdf-as-web/src/main/assembly/tomcat/scripts/stopTomcat.sh @@ -0,0 +1,7 @@ +#!/bin/sh +# +DEFAULT=`pwd`/catalina.env +. $DEFAULT + +$CATALINA_HOME/bin/catalina.sh stop + -- cgit v1.2.3