← Back to branch summary

~ubuntu-branches/ubuntu/natty/tomcat6/natty-proposed

« back to all changes in this revision

Viewing changes to bin/catalina.bat

  • Committer: Bazaar Package Importer
  • Author(s): Thierry Carrez
  • Date: 2010-05-21 13:51:15 UTC
  • mfrom: (2.2.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100521135115-qfwnf24lzvi3644v
Tags: 6.0.26-2
http://bugs.debian.org/581018
https://launchpad.net/bugs/557300
https://launchpad.net/bugs/569118
* debian/tomcat6.{postinst,prerm}: Respect TOMCAT6_USER and TOMCAT6_GROUP
  as defined in /etc/default/tomcat6 when setting directory permissions and
  authbind configuration (Closes: #581018, LP: #557300)
* debian/tomcat6.postinst: Use group "tomcat6" instead of "adm" for
  permissions in /var/lib/tomcat6, so that group "adm" doesn't get write
  permissions over /var/lib/tomcat6/webapps (LP: #569118)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/catalina.bat
43
43
rem                   "stop", or "run" command is executed.
44
44
rem
45
45
rem   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
46
 
rem                   command is executed. The default is "dt_shmem".
 
46
rem                   command is executed. The default is "dt_socket".
47
47
rem
48
48
rem   JPDA_ADDRESS    (Optional) Java runtime options used when the "jpda start"
49
 
rem                   command is executed. The default is "jdbconn".
 
49
rem                   command is executed. The default is 8000.
50
50
rem
51
51
rem   JPDA_SUSPEND    (Optional) Java runtime options used when the "jpda start"
52
52
rem                   command is executed. Specifies whether JVM should suspend
75
75
rem
76
76
rem
77
77
rem
78
 
rem $Id: catalina.bat 898474 2010-01-12 19:20:59Z kkolinko $
 
78
rem $Id: catalina.bat 915073 2010-02-22 21:22:13Z markt $
79
79
rem ---------------------------------------------------------------------------
80
80
 
81
81
rem Guess CATALINA_HOME if not defined
82
 
set CURRENT_DIR=%cd%
 
82
set "CURRENT_DIR=%cd%"
83
83
if not "%CATALINA_HOME%" == "" goto gotHome
84
 
set CATALINA_HOME=%CURRENT_DIR%
 
84
set "CATALINA_HOME=%CURRENT_DIR%"
85
85
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
86
86
cd ..
87
 
set CATALINA_HOME=%cd%
88
 
cd %CURRENT_DIR%
 
87
set "CATALINA_HOME=%cd%"
 
88
cd "%CURRENT_DIR%"
89
89
:gotHome
90
90
if exist "%CATALINA_HOME%\bin\catalina.bat" goto okHome
91
91
echo The CATALINA_HOME environment variable is not defined correctly
107
107
 
108
108
rem Get standard Java environment variables
109
109
if exist "%CATALINA_HOME%\bin\setclasspath.bat" goto okSetclasspath
110
 
echo Cannot find %CATALINA_HOME%\bin\setclasspath.bat
 
110
echo Cannot find "%CATALINA_HOME%\bin\setclasspath.bat"
111
111
echo This file is needed to run this program
112
112
goto end
113
113
:okSetclasspath
114
 
set BASEDIR=%CATALINA_HOME%
 
114
set "BASEDIR=%CATALINA_HOME%"
115
115
call "%CATALINA_HOME%\bin\setclasspath.bat" %1
116
116
if errorlevel 1 goto end
117
117
 
118
118
if not "%CATALINA_BASE%" == "" goto gotBase
119
 
set CATALINA_BASE=%CATALINA_HOME%
 
119
set "CATALINA_BASE=%CATALINA_HOME%"
120
120
:gotBase
121
121
 
122
122
if not "%CATALINA_TMPDIR%" == "" goto gotTmpdir
123
 
set CATALINA_TMPDIR=%CATALINA_BASE%\temp
 
123
set "CATALINA_TMPDIR=%CATALINA_BASE%\temp"
124
124
:gotTmpdir
125
125
 
126
126
rem Add tomcat-juli.jar and bootstrap.jar to classpath
128
128
rem Note that there are no quotes as we do not want to introduce random
129
129
rem quotes into the CLASSPATH
130
130
if "%CLASSPATH%" == "" goto emptyClasspath
131
 
set CLASSPATH=%CLASSPATH%;
 
131
set "CLASSPATH=%CLASSPATH%;"
132
132
:emptyClasspath
133
133
if "%CATALINA_BASE%" == "%CATALINA_HOME%" goto juliClasspathHome
134
134
if not exist "%CATALINA_BASE%\bin\tomcat-juli.jar" goto juliClasspathHome
135
 
set CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar
 
135
set "CLASSPATH=%CLASSPATH%%CATALINA_BASE%\bin\tomcat-juli.jar;%CATALINA_HOME%\bin\bootstrap.jar"
136
136
goto juliClasspathDone
137
137
:juliClasspathHome
138
 
set CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar
 
138
set "CLASSPATH=%CLASSPATH%%CATALINA_HOME%\bin\bootstrap.jar"
139
139
:juliClasspathDone
140
140
 
141
141
if not "%LOGGING_CONFIG%" == "" goto noJuliConfig
152
152
 
153
153
rem ----- Execute The Requested Command ---------------------------------------
154
154
 
155
 
echo Using CATALINA_BASE:   %CATALINA_BASE%
156
 
echo Using CATALINA_HOME:   %CATALINA_HOME%
157
 
echo Using CATALINA_TMPDIR: %CATALINA_TMPDIR%
 
155
echo Using CATALINA_BASE:   "%CATALINA_BASE%"
 
156
echo Using CATALINA_HOME:   "%CATALINA_HOME%"
 
157
echo Using CATALINA_TMPDIR: "%CATALINA_TMPDIR%"
158
158
if ""%1"" == ""debug"" goto use_jdk
159
 
echo Using JRE_HOME:        %JRE_HOME%
 
159
echo Using JRE_HOME:        "%JRE_HOME%"
160
160
goto java_dir_displayed
161
161
:use_jdk
162
 
echo Using JAVA_HOME:       %JAVA_HOME%
 
162
echo Using JAVA_HOME:       "%JAVA_HOME%"
163
163
:java_dir_displayed
164
 
echo Using CLASSPATH:       %CLASSPATH%
 
164
echo Using CLASSPATH:       "%CLASSPATH%"
165
165
 
166
166
set _EXECJAVA=%_RUNJAVA%
167
167
set MAINCLASS=org.apache.catalina.startup.Bootstrap
213
213
if not ""%1"" == ""-security"" goto execCmd
214
214
shift
215
215
echo Using Security Manager
216
 
set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
 
216
set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
217
217
goto execCmd
218
218
 
219
219
:doRun
221
221
if not ""%1"" == ""-security"" goto execCmd
222
222
shift
223
223
echo Using Security Manager
224
 
set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
 
224
set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
225
225
goto execCmd
226
226
 
227
227
:doStart
236
236
if not ""%1"" == ""-security"" goto execCmd
237
237
shift
238
238
echo Using Security Manager
239
 
set SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy
 
239
set "SECURITY_POLICY_FILE=%CATALINA_BASE%\conf\catalina.policy"
240
240
goto execCmd
241
241
 
242
242
:doStop