You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/12/04 18:35:51 UTC
svn commit: r723380 - in /geronimo/server/branches/2.1:
assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/
buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
framework/modules/geronimo-command...
Author: gawor
Date: Thu Dec 4 09:35:50 2008
New Revision: 723380
URL: http://svn.apache.org/viewvc?rev=723380&view=rev
Log:
remove GERONIMO_BASE from scripts and pass org.apache.geronimo.home.dir system property instead of org.apache.geronimo.base.dir (GERONIMO-4229)
Modified:
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy
geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat Thu Dec 4 09:35:50 2008
@@ -38,16 +38,12 @@
@REM If not specified, this batch file will attempt to
@REM discover it relative to the location of this file.
@REM
-@REM GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-@REM of a Geronimo installation. If not present, resolves to
-@REM the same directory that GERONIMO_HOME points to.
-@REM
@REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
@REM those set in JAVA_OPTS).
@REM
@REM GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
@REM the JVM should use (java.io.tmpdir). Defaults to
-@REM %GERONIMO_BASE%\var\temp.
+@REM var\temp (resolved to server instance directory).
@REM
@REM JAVA_HOME Points to your Java Development Kit installation.
@REM JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -73,7 +69,7 @@
@REM
@REM GERONIMO_ENV_INFO (Optional) Environment variable that when set to
@REM "on" (the default) outputs the values of
-@REM GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM GERONIMO_HOME, GERONIMO_TMPDIR,
@REM JAVA_HOME and JRE_HOME before the command is
@REM issued. Set to "off" if you do not want this
@REM information displayed.
@@ -145,17 +141,12 @@
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=var\temp
:gotTmpdir
@REM ----- Execute The Requested Command ---------------------------------------
@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
-echo Using GERONIMO_BASE: %GERONIMO_BASE%
echo Using GERONIMO_HOME: %GERONIMO_HOME%
echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
@@ -167,7 +158,7 @@
set CMD_LINE_ARGS=%*
set _JARFILE="%GERONIMO_HOME%"\bin\client.jar
-%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
goto end
:end
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh Thu Dec 4 09:35:50 2008
@@ -39,15 +39,11 @@
# If not specified, it will default to the parent directory
# of the location of this script.
#
-# GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-# of a Geronimo installation. If not present, resolves to
-# the same directory that GERONIMO_HOME points to.
-#
# GERONIMO_OPTS (Optional) Java runtime options.
#
# GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir).
-# Defaults to $GERONIMO_BASE/var/temp.
+# the JVM should use (java.io.tmpdir). Defaults to var/temp
+# (resolved to server instance directory).
#
# JAVA_HOME Points to your Java Development Kit installation.
# JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -64,7 +60,7 @@
#
# GERONIMO_ENV_INFO (Optional) Environment variable that when set to
# "on" (the default) outputs the
-# values of GERONIMO_HOME, GERONIMO_BASE,
+# values of GERONIMO_HOME,
# GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
# the command is issued. Set to "off" if you
# do want to see this information.
@@ -125,7 +121,6 @@
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
[ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
- [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix "$GERONIMO_BASE"`
fi
# For OS400
@@ -161,10 +156,6 @@
fi
fi
-if [ -z "$GERONIMO_BASE" ] ; then
- GERONIMO_BASE="$GERONIMO_HOME"
-fi
-
if [ -z "$GERONIMO_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Geronimo
GERONIMO_TMPDIR=var/temp
@@ -175,7 +166,6 @@
JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
- GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext"
ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed;$JRE_HOME/lib/endorsed"
@@ -186,7 +176,6 @@
# ----- Execute The Requested Command -----------------------------------------
if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
- echo "Using GERONIMO_BASE: $GERONIMO_BASE"
echo "Using GERONIMO_HOME: $GERONIMO_HOME"
echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
if [ "$1" = "debug" ] ; then
@@ -198,7 +187,7 @@
fi
exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat Thu Dec 4 09:35:50 2008
@@ -38,16 +38,12 @@
@REM If not specified, this batch file will attempt to
@REM discover it relative to the location of this file.
@REM
-@REM GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-@REM of a Geronimo installation. If not present, resolves to
-@REM the same directory that GERONIMO_HOME points to.
-@REM
@REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
@REM those set in JAVA_OPTS).
@REM
@REM GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
@REM the JVM should use (java.io.tmpdir). Defaults to
-@REM %GERONIMO_BASE%\var\temp.
+@REM var\temp (resolved to server instance directory).
@REM
@REM JAVA_HOME Points to your Java Development Kit installation.
@REM JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -73,7 +69,7 @@
@REM
@REM GERONIMO_ENV_INFO (Optional) Environment variable that when set to
@REM "on" (the default) outputs the values of
-@REM GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM GERONIMO_HOME, GERONIMO_TMPDIR,
@REM JAVA_HOME and JRE_HOME before the command is
@REM issued. Set to "off" if you do not want this
@REM information displayed.
@@ -145,17 +141,12 @@
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=var\temp
:gotTmpdir
@REM ----- Execute The Requested Command ---------------------------------------
@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
-echo Using GERONIMO_BASE: %GERONIMO_BASE%
echo Using GERONIMO_HOME: %GERONIMO_HOME%
echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
@@ -167,7 +158,7 @@
set CMD_LINE_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%
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
goto end
:end
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh Thu Dec 4 09:35:50 2008
@@ -39,15 +39,11 @@
# If not specified, it will default to the parent directory
# of the location of this script.
#
-# GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-# of a Geronimo installation. If not present, resolves to
-# the same directory that GERONIMO_HOME points to.
-#
# GERONIMO_OPTS (Optional) Java runtime options.
#
# GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir).
-# Defaults to $GERONIMO_BASE/var/temp.
+# the JVM should use (java.io.tmpdir). Defaults to var/temp
+# (resolved to server instance directory).
#
# JAVA_HOME Points to your Java Development Kit installation.
# JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -64,7 +60,7 @@
#
# GERONIMO_ENV_INFO (Optional) Environment variable that when set to
# "on" (the default) outputs the
-# values of GERONIMO_HOME, GERONIMO_BASE,
+# values of GERONIMO_HOME,
# GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
# the command is issued. Set to "off" if you
# do want to see this information.
@@ -125,7 +121,6 @@
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
[ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
- [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix "$GERONIMO_BASE"`
fi
# For OS400
@@ -161,10 +156,6 @@
fi
fi
-if [ -z "$GERONIMO_BASE" ] ; then
- GERONIMO_BASE="$GERONIMO_HOME"
-fi
-
if [ -z "$GERONIMO_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Geronimo
GERONIMO_TMPDIR=var/temp
@@ -175,13 +166,11 @@
JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
- GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
fi
# ----- Execute The Requested Command -----------------------------------------
if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
- echo "Using GERONIMO_BASE: $GERONIMO_BASE"
echo "Using GERONIMO_HOME: $GERONIMO_HOME"
echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
if [ "$1" = "debug" ] ; then
@@ -193,6 +182,6 @@
fi
exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-jar "$GERONIMO_HOME"/bin/deployer.jar "$@"
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat Thu Dec 4 09:35:50 2008
@@ -44,17 +44,13 @@
@REM If not specified, this batch file will attempt to
@REM discover it relative to the location of this file.
@REM
-@REM GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-@REM of a Geronimo installation. If not present, resolves to
-@REM the same directory that GERONIMO_HOME points to.
-@REM
@REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
@REM those set in JAVA_OPTS) used when the "start",
@REM "stop", or "run" command is executed.
@REM
@REM GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
@REM the JVM should use (java.io.tmpdir). Defaults to
-@REM %GERONIMO_BASE%\var\temp.
+@REM var\temp (resolved to server instance directory).
@REM
@REM GERONIMO_WIN_START_ARGS (Optional) additional arguments to the Windows
@REM START command when the "start" command
@@ -109,7 +105,7 @@
@REM
@REM GERONIMO_ENV_INFO (Optional) Environment variable that when set to
@REM "on" (the default) outputs the values of
-@REM GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM GERONIMO_HOME, GERONIMO_TMPDIR,
@REM JAVA_HOME and JRE_HOME before the command is
@REM issued. Set to "off" if you do not want this
@REM information displayed.
@@ -182,12 +178,6 @@
call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
if not %errorlevel% == 0 goto end
-if not "%GERONIMO_BASE%" == "" goto gotBase
-@REM GERONIMO_BASE is used by lib and endorsed which are currently shared
-set GERONIMO_BASE=%GERONIMO_HOME%
-
-:gotBase
-
if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
@REM A relative value will be resolved relative to each instance
set GERONIMO_TMPDIR=var\temp
@@ -223,7 +213,6 @@
@REM ----- Execute The Requested Command ---------------------------------------
@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
-echo Using GERONIMO_BASE: %GERONIMO_BASE%
echo Using GERONIMO_HOME: %GERONIMO_HOME%
echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
@@ -317,11 +306,11 @@
@REM Execute Java with the applicable properties
if not "%JDB%" == "" goto doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
goto end
:doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS%
goto end
:end
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh Thu Dec 4 09:35:50 2008
@@ -45,24 +45,20 @@
# If not specified, it will default to the parent directory
# of the location of this script.
#
-# GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-# of a Geronimo installation. If not present, resolves to
-# the same directory that GERONIMO_HOME points to.
-#
# GERONIMO_OPTS (Optional) Java runtime options used when the "start",
# "stop", or "run" command is executed.
#
# GERONIMO_OUT (Optional) File that Geronimo's stdout and stderr streams
# will be redirected to if Geronimo is started in the
# background.
-# Defaults to $GERONIMO_BASE/var/log/geronimo.out
+# Defaults to $GERONIMO_HOME/var/log/geronimo.out
#
# GERONIMO_PID (Optional) Path of the file which should contains the pid
# of the Geronimo java process, when start (fork) is used
#
# GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir).
-# Defaults to $GERONIMO_BASE/var/temp.
+# the JVM should use (java.io.tmpdir). Defaults to var/temp
+# (resolved to server instance directory).
#
# JAVA_HOME Points to your Java Development Kit installation.
# JAVA_HOME doesn't need to be set if JRE_HOME is set
@@ -109,7 +105,7 @@
#
# GERONIMO_ENV_INFO (Optional) Environment variable that when set to "on"
# (the default) outputs the values of the GERONIMO_HOME,
-# GERONIMO_BASE, GERONIMO_TMPDIR, JAVA_HOME and
+# GERONIMO_TMPDIR, JAVA_HOME and
# JRE_HOME before the command is issued. Set to "off"
# if you do not want this information displayed.
#
@@ -170,7 +166,6 @@
[ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
[ -n "$JDB_SRCPATH" ] && JDB_SRCPATH=`cygpath --unix "$JDB_SRCPATH"`
[ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
- [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix "$GERONIMO_BASE"`
fi
# For OS400
@@ -206,10 +201,6 @@
fi
fi
-if [ -z "$GERONIMO_BASE" ] ; then
- GERONIMO_BASE="$GERONIMO_HOME"
-fi
-
if [ -z "$GERONIMO_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Geronimo
# A relative value will be resolved relative to each instance
@@ -219,7 +210,7 @@
if [ -z "$GERONIMO_OUT" ] ; then
# Define the output file we are to redirect both stdout and stderr to
# when Geronimo is started in the background
- GERONIMO_OUT="$GERONIMO_BASE"/var/log/geronimo.out
+ GERONIMO_OUT="$GERONIMO_HOME"/var/log/geronimo.out
fi
if [ -z "$JDB_SRCPATH" ] ; then
@@ -233,7 +224,6 @@
JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
JDB_SRCPATH=`cygpath --absolute --windows "$JDB_SRCPATH"`
GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
- GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext"
ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed;$JRE_HOME/lib/endorsed"
@@ -244,7 +234,6 @@
# ----- Execute The Requested Command -----------------------------------------
if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
- echo "Using GERONIMO_BASE: $GERONIMO_BASE"
echo "Using GERONIMO_HOME: $GERONIMO_HOME"
echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
if [ "$1" = "debug" ] ; then
@@ -305,7 +294,7 @@
-sourcepath "$JDB_SRCPATH" \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-classpath "$GERONIMO_HOME"/bin/server.jar \
org.apache.geronimo.cli.daemon.DaemonCLI $LONG_OPT "$@"
@@ -315,7 +304,7 @@
shift
exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
$JAVA_AGENT_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -326,7 +315,7 @@
touch "$GERONIMO_OUT"
$START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
$JAVA_AGENT_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
@@ -349,7 +338,7 @@
fi
"$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.endorsed.dirs="$ENDORSED_DIRS" \
-Djava.ext.dirs="$EXT_DIRS" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java Thu Dec 4 09:35:50 2008
@@ -122,7 +122,7 @@
}
// Set the properties which we pass to the JVM from the startup script
- setSystemProperty(java, "org.apache.geronimo.base.dir", geronimoHome);
+ setSystemProperty(java, "org.apache.geronimo.home.dir", geronimoHome);
setSystemProperty(java, "java.io.tmpdir", "var/temp");
setSystemProperty(java, "java.endorsed.dirs", prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/endorsed")));
setSystemProperty(java, "java.ext.dirs", prefixSystemPath("java.ext.dirs", new File(geronimoHome, "lib/ext")));
Modified: geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java (original)
+++ geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java Thu Dec 4 09:35:50 2008
@@ -252,7 +252,7 @@
}
// Set the properties which we pass to the JVM from the startup script
- setSystemProperty(java, "org.apache.geronimo.base.dir", geronimoHome);
+ setSystemProperty(java, "org.apache.geronimo.home.dir", geronimoHome);
// Use relative path
setSystemProperty(java, "java.io.tmpdir", "var/temp");
setSystemProperty(java, "java.endorsed.dirs", prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/endorsed")));
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy Thu Dec 4 09:35:50 2008
@@ -42,7 +42,7 @@
int verbose = 0
- @Option(name='-v', aliases=['--verbose'], description='Enable verbose output; specify multipule times to increase verbosity')
+ @Option(name='-v', aliases=['--verbose'], description='Enable verbose output; specify multiple times to increase verbosity')
private void increaseVerbosity(boolean flag) {
if (flag) {
verbose++
@@ -68,7 +68,7 @@
log.debug("Geronimo home: $geronimoHome")
// Setup the default properties required to boot the server
- properties['org.apache.geronimo.base.dir'] = geronimoHome
+ properties['org.apache.geronimo.home.dir'] = geronimoHome
properties['java.io.tmpdir'] = 'var/temp' // Use relative path
properties['java.endorsed.dirs'] = prefixSystemPath('java.endorsed.dirs', new File(geronimoHome, 'lib/endorsed'))
properties['java.ext.dirs'] = prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy Thu Dec 4 09:35:50 2008
@@ -45,7 +45,7 @@
int verbose = 0
- @Option(name='-v', aliases=['--verbose'], description='Enable verbose output; specify multipule times to increase verbosity')
+ @Option(name='-v', aliases=['--verbose'], description='Enable verbose output; specify multiple times to increase verbosity')
private void increaseVerbosity(boolean flag) {
if (flag) {
verbose++
@@ -86,7 +86,7 @@
log.debug("Geronimo home: $geronimoHome")
// Setup the default properties required to boot the server
- properties['org.apache.geronimo.base.dir'] = geronimoHome
+ properties['org.apache.geronimo.home.dir'] = geronimoHome
properties['java.io.tmpdir'] = 'var/temp' // Use relative path
properties['java.endorsed.dirs'] = prefixSystemPath('java.endorsed.dirs', new File(geronimoHome, 'lib/endorsed'))
properties['java.ext.dirs'] = prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat Thu Dec 4 09:35:50 2008
@@ -19,15 +19,13 @@
@REM --------------------------------------------------------------------
@REM ---------------------------------------------------------------------------
-@REM Deploy batch file for Geronimo
-@REM
@REM You should not have to edit this file. If you wish to have
@REM environment variables set each time you run this batch file
@REM refer to the information on the setenv.bat file below.
@REM
@REM Invocation Syntax:
@REM
-@REM deploy [general options] command [command options]
+@REM jaxws-tools [general options] command [command options]
@REM
@REM For detailed usage information, just run deploy without
@REM arguments.
@@ -38,16 +36,12 @@
@REM If not specified, this batch file will attempt to
@REM discover it relative to the location of this file.
@REM
-@REM GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-@REM of a Geronimo installation. If not present, resolves to
-@REM the same directory that GERONIMO_HOME points to.
-@REM
@REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
@REM those set in JAVA_OPTS).
@REM
@REM GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
@REM the JVM should use (java.io.tmpdir). Defaults to
-@REM %GERONIMO_BASE%\var\temp.
+@REM var\temp (resolved to server instance directory).
@REM
@REM JAVA_HOME Points to your Java Development Kit installation.
@REM JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -73,7 +67,7 @@
@REM
@REM GERONIMO_ENV_INFO (Optional) Environment variable that when set to
@REM "on" (the default) outputs the values of
-@REM GERONIMO_HOME, GERONIMO_BASE, GERONIMO_TMPDIR,
+@REM GERONIMO_HOME, GERONIMO_TMPDIR,
@REM JAVA_HOME and JRE_HOME before the command is
@REM issued. Set to "off" if you do not want this
@REM information displayed.
@@ -145,17 +139,12 @@
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=var\temp
:gotTmpdir
@REM ----- Execute The Requested Command ---------------------------------------
@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
-echo Using GERONIMO_BASE: %GERONIMO_BASE%
echo Using GERONIMO_HOME: %GERONIMO_HOME%
echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
@@ -167,7 +156,7 @@
set CMD_LINE_ARGS=%*
set _JARFILE="%GERONIMO_HOME%"\bin\jaxws-tools.jar
-%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
goto end
:end
Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh?rev=723380&r1=723379&r2=723380&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh (original)
+++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh Thu Dec 4 09:35:50 2008
@@ -20,15 +20,13 @@
# --------------------------------------------------------------------
# -----------------------------------------------------------------------------
-# Deploy Script for the Geronimo Server
-#
# You should not have to edit this file. If you wish to have environment
# variables set each time you run this script refer to the information
# on the setenv.sh script that is called by this script below.
#
# Invocation Syntax:
#
-# deploy.sh [general options] command [command options]
+# jaxws-tools.sh [general options] command [command options]
#
# For detailed command usage information, just run deploy.sh without any
# arguments.
@@ -39,15 +37,11 @@
# If not specified, it will default to the parent directory
# of the location of this script.
#
-# GERONIMO_BASE (Optional) Base directory for resolving dynamic portions
-# of a Geronimo installation. If not present, resolves to
-# the same directory that GERONIMO_HOME points to.
-#
# GERONIMO_OPTS (Optional) Java runtime options.
#
# GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir).
-# Defaults to $GERONIMO_BASE/var/temp.
+# the JVM should use (java.io.tmpdir). Defaults to var/temp
+# (resolved to server instance directory).
#
# JAVA_HOME Points to your Java Development Kit installation.
# JAVA_HOME doesn't need to be set if JRE_HOME is set.
@@ -64,7 +58,7 @@
#
# GERONIMO_ENV_INFO (Optional) Environment variable that when set to
# "on" (the default) outputs the
-# values of GERONIMO_HOME, GERONIMO_BASE,
+# values of GERONIMO_HOME,
# GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
# the command is issued. Set to "off" if you
# do want to see this information.
@@ -125,7 +119,6 @@
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
[ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
- [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix "$GERONIMO_BASE"`
fi
# For OS400
@@ -161,10 +154,6 @@
fi
fi
-if [ -z "$GERONIMO_BASE" ] ; then
- GERONIMO_BASE="$GERONIMO_HOME"
-fi
-
if [ -z "$GERONIMO_TMPDIR" ] ; then
# Define the java.io.tmpdir to use for Geronimo
GERONIMO_TMPDIR=var/temp
@@ -175,13 +164,11 @@
JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
- GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
fi
# ----- Execute The Requested Command -----------------------------------------
if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
- echo "Using GERONIMO_BASE: $GERONIMO_BASE"
echo "Using GERONIMO_HOME: $GERONIMO_HOME"
echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
if [ "$1" = "debug" ] ; then
@@ -193,6 +180,6 @@
fi
exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
-Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-jar "$GERONIMO_HOME"/bin/jaxws-tools.jar "$@"
Re: svn commit: r723380 - in /geronimo/server/branches/2.1: assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/ buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ framework/modules/geronimo-command...
Posted by Jason Dillon <ja...@planet57.com>.
Sweet :-)
--jason
On Dec 5, 2008, at 12:35 AM, gawor@apache.org wrote:
> Author: gawor
> Date: Thu Dec 4 09:35:50 2008
> New Revision: 723380
>
> URL: http://svn.apache.org/viewvc?rev=723380&view=rev
> Log:
> remove GERONIMO_BASE from scripts and pass
> org.apache.geronimo.home.dir system property instead of
> org.apache.geronimo.base.dir (GERONIMO-4229)
>
> Modified:
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.bat
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.sh
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.bat
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.sh
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.bat
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh
> geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> RunClientMojo.java
> geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> StartServerMojo.java
> geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy
> geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy
> geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.bat
> geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.sh
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/client.bat
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.bat?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.bat (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.bat Thu Dec 4 09:35:50 2008
> @@ -38,16 +38,12 @@
> @REM If not specified, this batch file will
> attempt to
> @REM discover it relative to the location of this
> file.
> @REM
> -@REM GERONIMO_BASE (Optional) Base directory for resolving
> dynamic portions
> -@REM of a Geronimo installation. If not present,
> resolves to
> -@REM the same directory that GERONIMO_HOME points
> to.
> -@REM
> @REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
> @REM those set in JAVA_OPTS).
> @REM
> @REM GERONIMO_TMPDIR (Optional) Directory path location of
> temporary directory
> @REM the JVM should use (java.io.tmpdir).
> Defaults to
> -@REM %GERONIMO_BASE%\var\temp.
> +@REM var\temp (resolved to server instance
> directory).
> @REM
> @REM JAVA_HOME Points to your Java Development Kit
> installation.
> @REM JAVA_HOME doesn't need to be set if JRE_HOME
> is set.
> @@ -73,7 +69,7 @@
> @REM
> @REM GERONIMO_ENV_INFO (Optional) Environment variable that
> when set to
> @REM "on" (the default) outputs the values of
> -@REM GERONIMO_HOME, GERONIMO_BASE,
> GERONIMO_TMPDIR,
> +@REM GERONIMO_HOME, GERONIMO_TMPDIR,
> @REM JAVA_HOME and JRE_HOME before the
> command is
> @REM issued. Set to "off" if you do not want
> this
> @REM information displayed.
> @@ -145,17 +141,12 @@
> 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=var\temp
> :gotTmpdir
>
> @REM ----- Execute The Requested Command
> ---------------------------------------
> @if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
> -echo Using GERONIMO_BASE: %GERONIMO_BASE%
> echo Using GERONIMO_HOME: %GERONIMO_HOME%
> echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
> if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
> @@ -167,7 +158,7 @@
> set CMD_LINE_ARGS=%*
> set _JARFILE="%GERONIMO_HOME%"\bin\client.jar
>
> -%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -
> Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
> +%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -
> Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
> goto end
>
> :end
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/client.sh
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/client.sh?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.sh (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/client.sh Thu Dec 4 09:35:50 2008
> @@ -39,15 +39,11 @@
> # If not specified, it will default to the parent
> directory
> # of the location of this script.
> #
> -# GERONIMO_BASE (Optional) Base directory for resolving dynamic
> portions
> -# of a Geronimo installation. If not present,
> resolves to
> -# the same directory that GERONIMO_HOME points to.
> -#
> # GERONIMO_OPTS (Optional) Java runtime options.
> #
> # GERONIMO_TMPDIR (Optional) Directory path location of temporary
> directory
> -# the JVM should use (java.io.tmpdir).
> -# Defaults to $GERONIMO_BASE/var/temp.
> +# the JVM should use (java.io.tmpdir). Defaults
> to var/temp
> +# (resolved to server instance directory).
> #
> # JAVA_HOME Points to your Java Development Kit installation.
> # JAVA_HOME doesn't need to be set if JRE_HOME is
> set.
> @@ -64,7 +60,7 @@
> #
> # GERONIMO_ENV_INFO (Optional) Environment variable that when
> set to
> # "on" (the default) outputs the
> -# values of GERONIMO_HOME, GERONIMO_BASE,
> +# values of GERONIMO_HOME,
> # GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
> # the command is issued. Set to "off" if you
> # do want to see this information.
> @@ -125,7 +121,6 @@
> [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
> [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
> [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix
> "$GERONIMO_HOME"`
> - [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix
> "$GERONIMO_BASE"`
> fi
>
> # For OS400
> @@ -161,10 +156,6 @@
> fi
> fi
>
> -if [ -z "$GERONIMO_BASE" ] ; then
> - GERONIMO_BASE="$GERONIMO_HOME"
> -fi
> -
> if [ -z "$GERONIMO_TMPDIR" ] ; then
> # Define the java.io.tmpdir to use for Geronimo
> GERONIMO_TMPDIR=var/temp
> @@ -175,7 +166,6 @@
> JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
> JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
> GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
> - GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
> GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
> EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext"
> ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed;$JRE_HOME/lib/endorsed"
> @@ -186,7 +176,6 @@
>
> # ----- Execute The Requested Command
> -----------------------------------------
> if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
> - echo "Using GERONIMO_BASE: $GERONIMO_BASE"
> echo "Using GERONIMO_HOME: $GERONIMO_HOME"
> echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
> if [ "$1" = "debug" ] ; then
> @@ -198,7 +187,7 @@
> fi
>
> exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.endorsed.dirs="$ENDORSED_DIRS" \
> -Djava.ext.dirs="$EXT_DIRS" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/deploy.bat
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.bat?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.bat (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.bat Thu Dec 4 09:35:50 2008
> @@ -38,16 +38,12 @@
> @REM If not specified, this batch file will
> attempt to
> @REM discover it relative to the location of this
> file.
> @REM
> -@REM GERONIMO_BASE (Optional) Base directory for resolving
> dynamic portions
> -@REM of a Geronimo installation. If not present,
> resolves to
> -@REM the same directory that GERONIMO_HOME points
> to.
> -@REM
> @REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
> @REM those set in JAVA_OPTS).
> @REM
> @REM GERONIMO_TMPDIR (Optional) Directory path location of
> temporary directory
> @REM the JVM should use (java.io.tmpdir).
> Defaults to
> -@REM %GERONIMO_BASE%\var\temp.
> +@REM var\temp (resolved to server instance
> directory).
> @REM
> @REM JAVA_HOME Points to your Java Development Kit
> installation.
> @REM JAVA_HOME doesn't need to be set if JRE_HOME
> is set.
> @@ -73,7 +69,7 @@
> @REM
> @REM GERONIMO_ENV_INFO (Optional) Environment variable that
> when set to
> @REM "on" (the default) outputs the values of
> -@REM GERONIMO_HOME, GERONIMO_BASE,
> GERONIMO_TMPDIR,
> +@REM GERONIMO_HOME, GERONIMO_TMPDIR,
> @REM JAVA_HOME and JRE_HOME before the
> command is
> @REM issued. Set to "off" if you do not want
> this
> @REM information displayed.
> @@ -145,17 +141,12 @@
> 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=var\temp
> :gotTmpdir
>
> @REM ----- Execute The Requested Command
> ---------------------------------------
> @if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
> -echo Using GERONIMO_BASE: %GERONIMO_BASE%
> echo Using GERONIMO_HOME: %GERONIMO_HOME%
> echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
> if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
> @@ -167,7 +158,7 @@
> set CMD_LINE_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%
> +%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -
> Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
> goto end
>
> :end
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/deploy.sh
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/deploy.sh?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.sh (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/deploy.sh Thu Dec 4 09:35:50 2008
> @@ -39,15 +39,11 @@
> # If not specified, it will default to the parent
> directory
> # of the location of this script.
> #
> -# GERONIMO_BASE (Optional) Base directory for resolving dynamic
> portions
> -# of a Geronimo installation. If not present,
> resolves to
> -# the same directory that GERONIMO_HOME points to.
> -#
> # GERONIMO_OPTS (Optional) Java runtime options.
> #
> # GERONIMO_TMPDIR (Optional) Directory path location of temporary
> directory
> -# the JVM should use (java.io.tmpdir).
> -# Defaults to $GERONIMO_BASE/var/temp.
> +# the JVM should use (java.io.tmpdir). Defaults
> to var/temp
> +# (resolved to server instance directory).
> #
> # JAVA_HOME Points to your Java Development Kit installation.
> # JAVA_HOME doesn't need to be set if JRE_HOME is
> set.
> @@ -64,7 +60,7 @@
> #
> # GERONIMO_ENV_INFO (Optional) Environment variable that when
> set to
> # "on" (the default) outputs the
> -# values of GERONIMO_HOME, GERONIMO_BASE,
> +# values of GERONIMO_HOME,
> # GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
> # the command is issued. Set to "off" if you
> # do want to see this information.
> @@ -125,7 +121,6 @@
> [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
> [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
> [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix
> "$GERONIMO_HOME"`
> - [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix
> "$GERONIMO_BASE"`
> fi
>
> # For OS400
> @@ -161,10 +156,6 @@
> fi
> fi
>
> -if [ -z "$GERONIMO_BASE" ] ; then
> - GERONIMO_BASE="$GERONIMO_HOME"
> -fi
> -
> if [ -z "$GERONIMO_TMPDIR" ] ; then
> # Define the java.io.tmpdir to use for Geronimo
> GERONIMO_TMPDIR=var/temp
> @@ -175,13 +166,11 @@
> JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
> JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
> GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
> - GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
> GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
> fi
>
> # ----- Execute The Requested Command
> -----------------------------------------
> if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
> - echo "Using GERONIMO_BASE: $GERONIMO_BASE"
> echo "Using GERONIMO_HOME: $GERONIMO_HOME"
> echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
> if [ "$1" = "debug" ] ; then
> @@ -193,6 +182,6 @@
> fi
>
> exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
> -jar "$GERONIMO_HOME"/bin/deployer.jar "$@"
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/geronimo.bat
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.bat?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.bat (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.bat Thu Dec 4 09:35:50 2008
> @@ -44,17 +44,13 @@
> @REM If not specified, this batch file will
> attempt to
> @REM discover it relative to the location of this
> file.
> @REM
> -@REM GERONIMO_BASE (Optional) Base directory for resolving
> dynamic portions
> -@REM of a Geronimo installation. If not present,
> resolves to
> -@REM the same directory that GERONIMO_HOME points
> to.
> -@REM
> @REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
> @REM those set in JAVA_OPTS) used when the "start",
> @REM "stop", or "run" command is executed.
> @REM
> @REM GERONIMO_TMPDIR (Optional) Directory path location of
> temporary directory
> @REM the JVM should use (java.io.tmpdir).
> Defaults to
> -@REM %GERONIMO_BASE%\var\temp.
> +@REM var\temp (resolved to server instance
> directory).
> @REM
> @REM GERONIMO_WIN_START_ARGS (Optional) additional arguments to
> the Windows
> @REM START command when the "start" command
> @@ -109,7 +105,7 @@
> @REM
> @REM GERONIMO_ENV_INFO (Optional) Environment variable that
> when set to
> @REM "on" (the default) outputs the values of
> -@REM GERONIMO_HOME, GERONIMO_BASE,
> GERONIMO_TMPDIR,
> +@REM GERONIMO_HOME, GERONIMO_TMPDIR,
> @REM JAVA_HOME and JRE_HOME before the
> command is
> @REM issued. Set to "off" if you do not want
> this
> @REM information displayed.
> @@ -182,12 +178,6 @@
> call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
> if not %errorlevel% == 0 goto end
>
> -if not "%GERONIMO_BASE%" == "" goto gotBase
> -@REM GERONIMO_BASE is used by lib and endorsed which are currently
> shared
> -set GERONIMO_BASE=%GERONIMO_HOME%
> -
> -:gotBase
> -
> if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
> @REM A relative value will be resolved relative to each instance
> set GERONIMO_TMPDIR=var\temp
> @@ -223,7 +213,6 @@
>
> @REM ----- Execute The Requested Command
> ---------------------------------------
> @if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
> -echo Using GERONIMO_BASE: %GERONIMO_BASE%
> echo Using GERONIMO_HOME: %GERONIMO_HOME%
> echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
> if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
> @@ -317,11 +306,11 @@
>
> @REM Execute Java with the applicable properties
> if not "%JDB%" == "" goto doJDB
> -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -
> Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT%
> %CMD_LINE_ARGS%
> +%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -
> Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT%
> %CMD_LINE_ARGS%
> goto end
>
> :doJDB
> -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%"
> -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS
> % %CMD_LINE_ARGS%
> +%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%"
> -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib
> \endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib
> \ext" -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS
> % %CMD_LINE_ARGS%
> goto end
>
> :end
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/geronimo.sh
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh Thu Dec 4 09:35:50 2008
> @@ -45,24 +45,20 @@
> # If not specified, it will default to the parent
> directory
> # of the location of this script.
> #
> -# GERONIMO_BASE (Optional) Base directory for resolving dynamic
> portions
> -# of a Geronimo installation. If not present,
> resolves to
> -# the same directory that GERONIMO_HOME points to.
> -#
> # GERONIMO_OPTS (Optional) Java runtime options used when the
> "start",
> # "stop", or "run" command is executed.
> #
> # GERONIMO_OUT (Optional) File that Geronimo's stdout and
> stderr streams
> # will be redirected to if Geronimo is started in
> the
> # background.
> -# Defaults to $GERONIMO_BASE/var/log/geronimo.out
> +# Defaults to $GERONIMO_HOME/var/log/geronimo.out
> #
> # GERONIMO_PID (Optional) Path of the file which should
> contains the pid
> # of the Geronimo java process, when start (fork)
> is used
> #
> # GERONIMO_TMPDIR (Optional) Directory path location of temporary
> directory
> -# the JVM should use (java.io.tmpdir).
> -# Defaults to $GERONIMO_BASE/var/temp.
> +# the JVM should use (java.io.tmpdir). Defaults
> to var/temp
> +# (resolved to server instance directory).
> #
> # JAVA_HOME Points to your Java Development Kit installation.
> # JAVA_HOME doesn't need to be set if JRE_HOME is
> set
> @@ -109,7 +105,7 @@
> #
> # GERONIMO_ENV_INFO (Optional) Environment variable that when set
> to "on"
> # (the default) outputs the values of the
> GERONIMO_HOME,
> -# GERONIMO_BASE, GERONIMO_TMPDIR, JAVA_HOME and
> +# GERONIMO_TMPDIR, JAVA_HOME and
> # JRE_HOME before the command is issued. Set to
> "off"
> # if you do not want this information displayed.
> #
> @@ -170,7 +166,6 @@
> [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
> [ -n "$JDB_SRCPATH" ] && JDB_SRCPATH=`cygpath --unix "$JDB_SRCPATH"`
> [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix
> "$GERONIMO_HOME"`
> - [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix
> "$GERONIMO_BASE"`
> fi
>
> # For OS400
> @@ -206,10 +201,6 @@
> fi
> fi
>
> -if [ -z "$GERONIMO_BASE" ] ; then
> - GERONIMO_BASE="$GERONIMO_HOME"
> -fi
> -
> if [ -z "$GERONIMO_TMPDIR" ] ; then
> # Define the java.io.tmpdir to use for Geronimo
> # A relative value will be resolved relative to each instance
> @@ -219,7 +210,7 @@
> if [ -z "$GERONIMO_OUT" ] ; then
> # Define the output file we are to redirect both stdout and stderr
> to
> # when Geronimo is started in the background
> - GERONIMO_OUT="$GERONIMO_BASE"/var/log/geronimo.out
> + GERONIMO_OUT="$GERONIMO_HOME"/var/log/geronimo.out
> fi
>
> if [ -z "$JDB_SRCPATH" ] ; then
> @@ -233,7 +224,6 @@
> JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
> JDB_SRCPATH=`cygpath --absolute --windows "$JDB_SRCPATH"`
> GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
> - GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
> GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"`
> EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext"
> ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed;$JRE_HOME/lib/endorsed"
> @@ -244,7 +234,6 @@
>
> # ----- Execute The Requested Command
> -----------------------------------------
> if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
> - echo "Using GERONIMO_BASE: $GERONIMO_BASE"
> echo "Using GERONIMO_HOME: $GERONIMO_HOME"
> echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
> if [ "$1" = "debug" ] ; then
> @@ -305,7 +294,7 @@
> -sourcepath "$JDB_SRCPATH" \
> -Djava.endorsed.dirs="$ENDORSED_DIRS" \
> -Djava.ext.dirs="$EXT_DIRS" \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
> -classpath "$GERONIMO_HOME"/bin/server.jar \
> org.apache.geronimo.cli.daemon.DaemonCLI $LONG_OPT "$@"
> @@ -315,7 +304,7 @@
> shift
> exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> $JAVA_AGENT_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.endorsed.dirs="$ENDORSED_DIRS" \
> -Djava.ext.dirs="$EXT_DIRS" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
> @@ -326,7 +315,7 @@
> touch "$GERONIMO_OUT"
> $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> $JAVA_AGENT_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.endorsed.dirs="$ENDORSED_DIRS" \
> -Djava.ext.dirs="$EXT_DIRS" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
> @@ -349,7 +338,7 @@
> fi
>
> "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.endorsed.dirs="$ENDORSED_DIRS" \
> -Djava.ext.dirs="$EXT_DIRS" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
>
> Modified: geronimo/server/branches/2.1/buildsupport/geronimo-maven-
> plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/
> server/RunClientMojo.java
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> RunClientMojo.java (original)
> +++ geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> RunClientMojo.java Thu Dec 4 09:35:50 2008
> @@ -122,7 +122,7 @@
> }
>
> // Set the properties which we pass to the JVM from the
> startup script
> - setSystemProperty(java, "org.apache.geronimo.base.dir",
> geronimoHome);
> + setSystemProperty(java, "org.apache.geronimo.home.dir",
> geronimoHome);
> setSystemProperty(java, "java.io.tmpdir", "var/temp");
> setSystemProperty(java, "java.endorsed.dirs",
> prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/
> endorsed")));
> setSystemProperty(java, "java.ext.dirs",
> prefixSystemPath("java.ext.dirs", new File(geronimoHome, "lib/ext")));
>
> Modified: geronimo/server/branches/2.1/buildsupport/geronimo-maven-
> plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/
> server/StartServerMojo.java
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> StartServerMojo.java (original)
> +++ geronimo/server/branches/2.1/buildsupport/geronimo-maven-plugin/
> src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
> StartServerMojo.java Thu Dec 4 09:35:50 2008
> @@ -252,7 +252,7 @@
> }
>
> // Set the properties which we pass to the JVM from the
> startup script
> - setSystemProperty(java, "org.apache.geronimo.base.dir",
> geronimoHome);
> + setSystemProperty(java, "org.apache.geronimo.home.dir",
> geronimoHome);
> // Use relative path
> setSystemProperty(java, "java.io.tmpdir", "var/temp");
> setSystemProperty(java, "java.endorsed.dirs",
> prefixSystemPath("java.endorsed.dirs", new File(geronimoHome, "lib/
> endorsed")));
>
> Modified: geronimo/server/branches/2.1/framework/modules/geronimo-
> commands/src/main/groovy/org/apache/geronimo/commands/
> StartClientCommand.groovy
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartClientCommand.groovy?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/
> StartClientCommand.groovy (original)
> +++ geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/
> StartClientCommand.groovy Thu Dec 4 09:35:50 2008
> @@ -42,7 +42,7 @@
>
> int verbose = 0
>
> - @Option(name='-v', aliases=['--verbose'], description='Enable
> verbose output; specify multipule times to increase verbosity')
> + @Option(name='-v', aliases=['--verbose'], description='Enable
> verbose output; specify multiple times to increase verbosity')
> private void increaseVerbosity(boolean flag) {
> if (flag) {
> verbose++
> @@ -68,7 +68,7 @@
> log.debug("Geronimo home: $geronimoHome")
>
> // Setup the default properties required to boot the server
> - properties['org.apache.geronimo.base.dir'] = geronimoHome
> + properties['org.apache.geronimo.home.dir'] = geronimoHome
> properties['java.io.tmpdir'] = 'var/temp' // Use relative path
> properties['java.endorsed.dirs'] =
> prefixSystemPath('java.endorsed.dirs', new File(geronimoHome, 'lib/
> endorsed'))
> properties['java.ext.dirs'] =
> prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
>
> Modified: geronimo/server/branches/2.1/framework/modules/geronimo-
> commands/src/main/groovy/org/apache/geronimo/commands/
> StartServerCommand.groovy
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-commands/src/main/groovy/org/apache/geronimo/commands/StartServerCommand.groovy?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/
> StartServerCommand.groovy (original)
> +++ geronimo/server/branches/2.1/framework/modules/geronimo-commands/
> src/main/groovy/org/apache/geronimo/commands/
> StartServerCommand.groovy Thu Dec 4 09:35:50 2008
> @@ -45,7 +45,7 @@
>
> int verbose = 0
>
> - @Option(name='-v', aliases=['--verbose'], description='Enable
> verbose output; specify multipule times to increase verbosity')
> + @Option(name='-v', aliases=['--verbose'], description='Enable
> verbose output; specify multiple times to increase verbosity')
> private void increaseVerbosity(boolean flag) {
> if (flag) {
> verbose++
> @@ -86,7 +86,7 @@
> log.debug("Geronimo home: $geronimoHome")
>
> // Setup the default properties required to boot the server
> - properties['org.apache.geronimo.base.dir'] = geronimoHome
> + properties['org.apache.geronimo.home.dir'] = geronimoHome
> properties['java.io.tmpdir'] = 'var/temp' // Use relative path
> properties['java.endorsed.dirs'] =
> prefixSystemPath('java.endorsed.dirs', new File(geronimoHome, 'lib/
> endorsed'))
> properties['java.ext.dirs'] =
> prefixSystemPath('java.ext.dirs', new File(geronimoHome, 'lib/ext'))
>
> Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/
> main/resources/bin/jaxws-tools.bat
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.bat?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.bat (original)
> +++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.bat Thu Dec 4 09:35:50 2008
> @@ -19,15 +19,13 @@
> @REM
> --------------------------------------------------------------------
>
> @REM
> ---------------------------------------------------------------------------
> -@REM Deploy batch file for Geronimo
> -@REM
> @REM You should not have to edit this file. If you wish to have
> @REM environment variables set each time you run this batch file
> @REM refer to the information on the setenv.bat file below.
> @REM
> @REM Invocation Syntax:
> @REM
> -@REM deploy [general options] command [command options]
> +@REM jaxws-tools [general options] command [command options]
> @REM
> @REM For detailed usage information, just run deploy without
> @REM arguments.
> @@ -38,16 +36,12 @@
> @REM If not specified, this batch file will
> attempt to
> @REM discover it relative to the location of this
> file.
> @REM
> -@REM GERONIMO_BASE (Optional) Base directory for resolving
> dynamic portions
> -@REM of a Geronimo installation. If not present,
> resolves to
> -@REM the same directory that GERONIMO_HOME points
> to.
> -@REM
> @REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
> @REM those set in JAVA_OPTS).
> @REM
> @REM GERONIMO_TMPDIR (Optional) Directory path location of
> temporary directory
> @REM the JVM should use (java.io.tmpdir).
> Defaults to
> -@REM %GERONIMO_BASE%\var\temp.
> +@REM var\temp (resolved to server instance
> directory).
> @REM
> @REM JAVA_HOME Points to your Java Development Kit
> installation.
> @REM JAVA_HOME doesn't need to be set if JRE_HOME
> is set.
> @@ -73,7 +67,7 @@
> @REM
> @REM GERONIMO_ENV_INFO (Optional) Environment variable that
> when set to
> @REM "on" (the default) outputs the values of
> -@REM GERONIMO_HOME, GERONIMO_BASE,
> GERONIMO_TMPDIR,
> +@REM GERONIMO_HOME, GERONIMO_TMPDIR,
> @REM JAVA_HOME and JRE_HOME before the
> command is
> @REM issued. Set to "off" if you do not want
> this
> @REM information displayed.
> @@ -145,17 +139,12 @@
> 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=var\temp
> :gotTmpdir
>
> @REM ----- Execute The Requested Command
> ---------------------------------------
> @if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
> -echo Using GERONIMO_BASE: %GERONIMO_BASE%
> echo Using GERONIMO_HOME: %GERONIMO_HOME%
> echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
> if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
> @@ -167,7 +156,7 @@
> set CMD_LINE_ARGS=%*
> set _JARFILE="%GERONIMO_HOME%"\bin\jaxws-tools.jar
>
> -%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -
> Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
> +%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -
> Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -
> Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
> goto end
>
> :end
>
> Modified: geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/
> main/resources/bin/jaxws-tools.sh
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/resources/bin/jaxws-tools.sh?rev=723380&r1=723379&r2=723380&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.sh (original)
> +++ geronimo/server/branches/2.1/plugins/jaxws/jaxws-tools/src/main/
> resources/bin/jaxws-tools.sh Thu Dec 4 09:35:50 2008
> @@ -20,15 +20,13 @@
> # --------------------------------------------------------------------
>
> #
> -----------------------------------------------------------------------------
> -# Deploy Script for the Geronimo Server
> -#
> # You should not have to edit this file. If you wish to have
> environment
> # variables set each time you run this script refer to the information
> # on the setenv.sh script that is called by this script below.
> #
> # Invocation Syntax:
> #
> -# deploy.sh [general options] command [command options]
> +# jaxws-tools.sh [general options] command [command options]
> #
> # For detailed command usage information, just run deploy.sh
> without any
> # arguments.
> @@ -39,15 +37,11 @@
> # If not specified, it will default to the parent
> directory
> # of the location of this script.
> #
> -# GERONIMO_BASE (Optional) Base directory for resolving dynamic
> portions
> -# of a Geronimo installation. If not present,
> resolves to
> -# the same directory that GERONIMO_HOME points to.
> -#
> # GERONIMO_OPTS (Optional) Java runtime options.
> #
> # GERONIMO_TMPDIR (Optional) Directory path location of temporary
> directory
> -# the JVM should use (java.io.tmpdir).
> -# Defaults to $GERONIMO_BASE/var/temp.
> +# the JVM should use (java.io.tmpdir). Defaults
> to var/temp
> +# (resolved to server instance directory).
> #
> # JAVA_HOME Points to your Java Development Kit installation.
> # JAVA_HOME doesn't need to be set if JRE_HOME is
> set.
> @@ -64,7 +58,7 @@
> #
> # GERONIMO_ENV_INFO (Optional) Environment variable that when
> set to
> # "on" (the default) outputs the
> -# values of GERONIMO_HOME, GERONIMO_BASE,
> +# values of GERONIMO_HOME,
> # GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
> # the command is issued. Set to "off" if you
> # do want to see this information.
> @@ -125,7 +119,6 @@
> [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
> [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
> [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix
> "$GERONIMO_HOME"`
> - [ -n "$GERONIMO_BASE" ] && GERONIMO_BASE=`cygpath --unix
> "$GERONIMO_BASE"`
> fi
>
> # For OS400
> @@ -161,10 +154,6 @@
> fi
> fi
>
> -if [ -z "$GERONIMO_BASE" ] ; then
> - GERONIMO_BASE="$GERONIMO_HOME"
> -fi
> -
> if [ -z "$GERONIMO_TMPDIR" ] ; then
> # Define the java.io.tmpdir to use for Geronimo
> GERONIMO_TMPDIR=var/temp
> @@ -175,13 +164,11 @@
> JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
> JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
> GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
> - GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
> GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
> fi
>
> # ----- Execute The Requested Command
> -----------------------------------------
> if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
> - echo "Using GERONIMO_BASE: $GERONIMO_BASE"
> echo "Using GERONIMO_HOME: $GERONIMO_HOME"
> echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
> if [ "$1" = "debug" ] ; then
> @@ -193,6 +180,6 @@
> fi
>
> exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
> - -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
> + -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
> -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
> -jar "$GERONIMO_HOME"/bin/jaxws-tools.jar "$@"
>
>