John,
Could you take a look at https://issues.apache.org/jira/browse/GERONIMO-1743
It fixes a minor bug with this change that make deploy.bat unusable.
Thanks,
Joe
[EMAIL PROTECTED] wrote:
Author: jsisson
Date: Thu Feb 9 16:39:55 2006
New Revision: 376510
URL: http://svn.apache.org/viewcvs?rev=376510&view=rev
Log:
(Merged from trunk)
GERONIMO-1490 - setjavaenv.bat not called by deploy.bat
GERONIMO-1610 - deploy.bat does not honour GERONIMO_BATCH_ECHO and
GERONIMO_BATCH_PAUSE
Modified:
geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
Modified: geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
URL:
http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat?rev=376510&r1=376509&r2=376510&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat
(original)
+++ geronimo/branches/1.0/modules/scripts/src/resources/bin/deploy.bat Thu Feb
9 16:39:55 2006
@@ -1,78 +1,158 @@
[EMAIL PROTECTED]
[EMAIL PROTECTED] Copyright 2005 The Apache Software Foundation
[EMAIL PROTECTED]
[EMAIL PROTECTED] Licensed under the Apache License, Version 2.0 (the
"License");
[EMAIL PROTECTED] you may not use this file except in compliance with the
License.
[EMAIL PROTECTED] You may obtain a copy of the License at
[EMAIL PROTECTED]
[EMAIL PROTECTED] http://www.apache.org/licenses/LICENSE-2.0
[EMAIL PROTECTED]
[EMAIL PROTECTED] Unless required by applicable law or agreed to in writing,
software
[EMAIL PROTECTED] distributed under the License is distributed on an "AS IS"
BASIS,
[EMAIL PROTECTED] WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
[EMAIL PROTECTED] See the License for the specific language governing
permissions and
[EMAIL PROTECTED] limitations under the License.
[EMAIL PROTECTED]
[EMAIL PROTECTED]
--------------------------------------------------------------------
[EMAIL PROTECTED] $Rev$ $Date$
[EMAIL PROTECTED]
--------------------------------------------------------------------
[EMAIL PROTECTED] off
[EMAIL PROTECTED]
[EMAIL PROTECTED] Copyright 2005 The Apache Software Foundation
[EMAIL PROTECTED]
[EMAIL PROTECTED] Licensed under the Apache License, Version 2.0 (the
"License");
[EMAIL PROTECTED] you may not use this file except in compliance with the
License.
[EMAIL PROTECTED] You may obtain a copy of the License at
[EMAIL PROTECTED]
[EMAIL PROTECTED] http://www.apache.org/licenses/LICENSE-2.0
[EMAIL PROTECTED]
[EMAIL PROTECTED] Unless required by applicable law or agreed to in writing,
software
[EMAIL PROTECTED] distributed under the License is distributed on an "AS IS"
BASIS,
[EMAIL PROTECTED] WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
express or implied.
[EMAIL PROTECTED] See the License for the specific language governing
permissions and
[EMAIL PROTECTED] limitations under the License.
+
[EMAIL PROTECTED]
--------------------------------------------------------------------
[EMAIL PROTECTED] $Rev$ $Date$
[EMAIL PROTECTED]
--------------------------------------------------------------------
+
[EMAIL PROTECTED]
---------------------------------------------------------------------------
[EMAIL PROTECTED] Deploy batch file for Geronimo
[EMAIL PROTECTED]
[EMAIL PROTECTED] You should not have to edit this file. If you wish to have
[EMAIL PROTECTED] environment variables set each time you run this batch file
[EMAIL PROTECTED] refer to the information on the setenv.bat file below.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Invocation Syntax:
[EMAIL PROTECTED]
[EMAIL PROTECTED] deploy [general options] command [command options]
[EMAIL PROTECTED]
[EMAIL PROTECTED] For detailed usage information, just run deploy without
[EMAIL PROTECTED] arguments.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Environment Variable Prequisites
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_HOME May point at your Geronimo top-level directory.
[EMAIL PROTECTED] If not specified, this batch file will
attempt to
[EMAIL PROTECTED] discover it relative to the location of
this file.
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_BASE (Optional) Base directory for resolving
dynamic portions
[EMAIL PROTECTED] of a Geronimo installation. If not
present, resolves to
[EMAIL PROTECTED] the same directory that GERONIMO_HOME
points to.
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_OPTS (Optional) Java runtime options (in
addition to
[EMAIL PROTECTED] those set in JAVA_OPTS).
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_TMPDIR (Optional) Directory path location of
temporary directory
[EMAIL PROTECTED] the JVM should use (java.io.tmpdir).
Defaults to
[EMAIL PROTECTED] %GERONIMO_BASE%\var\temp.
[EMAIL PROTECTED]
[EMAIL PROTECTED] JAVA_HOME Points to your Java Development Kit
installation.
[EMAIL PROTECTED] JAVA_HOME doesn't need to be set if
JRE_HOME is set.
[EMAIL PROTECTED] It is mandatory either JAVA_HOME or
JRE_HOME are set.
[EMAIL PROTECTED]
[EMAIL PROTECTED] JRE_HOME (Optional) Points to your Java Runtime
Environment
[EMAIL PROTECTED] Set this if you wish to run Geronimo using the JRE
[EMAIL PROTECTED] instead of the JDK.
[EMAIL PROTECTED] Defaults to JAVA_HOME if empty.
[EMAIL PROTECTED] It is mandatory either JAVA_HOME or
JRE_HOME are set.
[EMAIL PROTECTED]
[EMAIL PROTECTED] JAVA_OPTS (Optional) Java runtime options used.
[EMAIL PROTECTED] Also see the GERONIMO_OPTS environment
variable.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Troubleshooting execution of this batch file:
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_BATCH_ECHO (Optional) Environment variable that
when set to
[EMAIL PROTECTED] "on" results in batch commands being
echoed.
[EMAIL PROTECTED]
[EMAIL PROTECTED] GERONIMO_BATCH_PAUSE (Optional) Environment variable that
when set to
[EMAIL PROTECTED] "on" results in each batch file to
pause at the
[EMAIL PROTECTED] end of execution
[EMAIL PROTECTED]
[EMAIL PROTECTED] Batch files called by this batch file:
[EMAIL PROTECTED]
[EMAIL PROTECTED] %GERONIMO_HOME%\bin\setenv.bat
[EMAIL PROTECTED] (Optional) This batch file is called if it
is present.
[EMAIL PROTECTED] Its contents may set one or more of the
above environment
[EMAIL PROTECTED] variables. It is preferable (to simplify
migration to
[EMAIL PROTECTED] future Geronimo releases) to set
environment variables
[EMAIL PROTECTED] in this file rather than modifying
Geronimo's batch files.
[EMAIL PROTECTED]
[EMAIL PROTECTED] %GERONIMO_HOME%\bin\setjavaenv.bat
[EMAIL PROTECTED] This batch file is called to set
environment variables
[EMAIL PROTECTED] relating to the java or jdb exe file to
call.
[EMAIL PROTECTED] This file should not need to be modified.
[EMAIL PROTECTED]
[EMAIL PROTECTED] Exit Codes:
[EMAIL PROTECTED]
[EMAIL PROTECTED] 0 - Success
[EMAIL PROTECTED] 1 - Error
[EMAIL PROTECTED]
---------------------------------------------------------------------------
[EMAIL PROTECTED] "%GERONIMO_BATCH_ECHO%" == "on" echo on
[EMAIL PROTECTED] not "%GERONIMO_BATCH_ECHO%" == "on" echo off
[EMAIL PROTECTED] Verify we are running on Windows XP or Server
-if not "%OS%"=="Windows_NT" goto FailOS
-setlocal
-goto Init
-
-:FailOS
-echo Error - Unrecognized OS type.
-echo.
+if "%OS%" == "Windows_NT" goto okOsCheck
+echo Cannot process Geronimo command - you are running an unsupported
operating system.
set ERRORLEVEL=1
-goto End
+goto end
-:Init
[EMAIL PROTECTED] Capture any passed in arguments
-set ARGS=%*
[EMAIL PROTECTED] Capture the current dir the script was started in
-set CUR_DIR="%cd%"
-for %%z in (%CUR_DIR%) do set CUR_DIR=%%~sz
-
[EMAIL PROTECTED] Set the path to the deployer.jar
-set DEPLOYER_JAR="%~dp0deployer.jar"
-for %%z in (%DEPLOYER_JAR%) do set DEPLOYER_JAR=%%~sz
-
-:CheckDeployerJar
[EMAIL PROTECTED] Verify the deployer.jar exists:
-if exist "%DEPLOYER_JAR%" goto CheckJavaHome
-echo Error - Unable to locate the deployer jar file.
-echo.
-set ERRORLEVEL=1
-goto End
+:okOsCheck
+setlocal
-:CheckJavaHome
-for %%z in ("%JAVA_HOME%") do set JAVA_HOME=%%~sz
-if not "%JAVA_HOME%"=="" goto CheckJavaExe
-echo Error - The JAVA_HOME env variable MUST be set.
-echo.
+if not "%GERONIMO_HOME%" == "" goto resolveHome
[EMAIL PROTECTED] %~dp0 is expanded pathname of the current script
+set GERONIMO_HOME=%~dp0..
+
[EMAIL PROTECTED] resolve .. and remove any trailing slashes
+:resolveHome
+set CURRENT_DIR=%cd%
+cd %GERONIMO_HOME%
+set GERONIMO_HOME=%cd%
+cd %CURRENT_DIR%
+
+:gotHome
+if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome
+echo The GERONIMO_HOME environment variable is not defined correctly
+echo This environment variable is needed to run this program
set ERRORLEVEL=1
-goto End
+goto end
+:okHome
-:CheckJavaExe
-if not exist "%JAVA_HOME%\bin" goto FailJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto FailJavaHome
-set JAVA="%JAVA_HOME%\bin\java.exe"
-goto StartDeployer
-
-:FailJavaHome
-echo Error - Unable to locate Java binary under the JAVA_HOME:
-echo JAVA_HOME: [ %JAVA_HOME%\bin\java.exe ]
-echo.
[EMAIL PROTECTED] Get standard environment variables
[EMAIL PROTECTED] Users can optionally create this file to set environment
variables.
+if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
+if not %errorlevel% == 0 goto end
+
[EMAIL PROTECTED] Get standard Java environment variables (based upon Tomcat's
setclasspath.bat
[EMAIL PROTECTED] but renamed since Deployer's classpath is set in the JAR
manifest)
+if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
+echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
+echo This file is needed to run this program
set ERRORLEVEL=1
-goto End
+goto end
+:okSetJavaEnv
+set BASEDIR=%GERONIMO_HOME%
+call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
+if not %errorlevel% == 0 goto end
+
+if not "%GERONIMO_BASE%" == "" goto gotBase
+set GERONIMO_BASE=%GERONIMO_HOME%
+:gotBase
+
+if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
+set GERONIMO_TMPDIR=%GERONIMO_BASE%\var\temp
+:gotTmpdir
-:StartDeployer
-%JAVA% -jar %DEPLOYER_JAR% %ARGS%
[EMAIL PROTECTED] Capture any passed in arguments
+set ARGS=%*
+set _JARFILE="%GERONIMO_HOME%"\bin\deployer.jar
+
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%"
-Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
+goto end
-:End
+:end
echo.
[EMAIL PROTECTED] pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
+if "%GERONIMO_BATCH_PAUSE%" == "on" pause
@endlocal
-
--
Joe Bohn
joe.bohn at earthlink.net
"He is no fool who gives what he cannot keep, to gain what he cannot
lose." -- Jim Elliot
