svn commit: r573660 - in /geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin: geronimo.bat geronimo.sh

[ke...@apache.org]

Author: kevan
Date: Fri Sep  7 11:34:45 2007
New Revision: 573660

URL: http://svn.apache.org/viewvc?rev=573660&view=rev
Log:
GERONIMO-3446 avoid problems with improperly configured JRE_HOME or JAVA_HOME settings. Invalid java.ext.dirs property setting results in strange errors in java runtime. Geronimo no longer needs java.ext.dirs to be configured. So, I've removed the setting. If someone is interested in doing something more sophisticated, have at it...

Modified:
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?rev=573660&r1=573659&r2=573660&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat Fri Sep  7 11:34:45 2007
@@ -183,7 +183,7 @@
 if not %errorlevel% == 0 goto end
 
 if not "%GERONIMO_BASE%" == "" goto gotBase
-@REM GERONIMO_BASE is used by lib, ext and endorsed which are currently shared
+@REM GERONIMO_BASE is used by lib and endorsed which are currently shared
 set GERONIMO_BASE=%GERONIMO_HOME%
 
 :gotBase
@@ -317,11 +317,11 @@
 
 @REM Execute Java with the applicable properties
 if not "%JDB%" == "" goto doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Djava.ext.dirs="%GERONIMO_BASE%\lib\ext;%JRE_HOME%\lib\ext" -Djava.endorsed.dirs="%GERONIMO_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -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_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
 goto end
 
 :doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -sourcepath "%JDB_SRCPATH%" -Djava.ext.dirs="%GERONIMO_BASE%\lib\ext;%JRE_HOME%\lib\ext" -Djava.endorsed.dirs="%GERONIMO_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -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_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath %_JARFILE% %MAINCLASS% %CMD_LINE_ARGS%
 goto end
 
 :end

Modified: geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh?rev=573660&r1=573659&r2=573660&view=diff
==============================================================================
--- geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh (original)
+++ geronimo/server/branches/2.0/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh Fri Sep  7 11:34:45 2007
@@ -235,10 +235,8 @@
   GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
   GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
   GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
-  EXT_DIRS="$GERONIMO_BASE/lib/ext;$JRE_HOME/lib/ext"
   ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed;$JRE_HOME/lib/endorsed"
 else
-  EXT_DIRS="$GERONIMO_BASE/lib/ext:$JRE_HOME/lib/ext"
   ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed:$JRE_HOME/lib/endorsed"
 fi
 
@@ -304,7 +302,6 @@
     exec "$_RUNJDB" $JAVA_OPTS $GERONIMO_OPTS \
       -sourcepath "$JDB_SRCPATH" \
       -Djava.endorsed.dirs="$ENDORSED_DIRS" \
-      -Djava.ext.dirs="$EXT_DIRS" \
       -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
       -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
       -classpath "$GERONIMO_HOME"/bin/server.jar \
@@ -317,7 +314,6 @@
     $JAVA_AGENT_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
     -Djava.endorsed.dirs="$ENDORSED_DIRS" \
-    -Djava.ext.dirs="$EXT_DIRS" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@"
 
@@ -328,7 +324,6 @@
     $JAVA_AGENT_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
     -Djava.endorsed.dirs="$ENDORSED_DIRS" \
-    -Djava.ext.dirs="$EXT_DIRS" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" \
     >> $GERONIMO_OUT 2>&1 &
@@ -351,7 +346,6 @@
   "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
     -Djava.endorsed.dirs="$ENDORSED_DIRS" \
-    -Djava.ext.dirs="$EXT_DIRS" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/shutdown.jar "$@"