geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r452362 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/
Date Tue, 03 Oct 2006 09:19:14 GMT
Author: rickmcguire
Date: Tue Oct  3 02:19:14 2006
New Revision: 452362

URL: http://svn.apache.org/viewvc?view=rev&rev=452362
Log:
GERONIMO-2440 Geronimo java.endorsed.dirs support is non-functional


Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
    geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat?view=diff&rev=452362&r1=452361&r2=452362
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.bat
Tue Oct  3 02:19:14 2006
@@ -19,26 +19,26 @@
 
 @REM ---------------------------------------------------------------------------
 @REM Start/Stop Batch file for Geronimo
-@REM 
+@REM
 @REM This batch file is based upon Tomcat's catalina.bat file to enable
 @REM those familiar with Tomcat to quickly get started with Geronimo.
 @REM
-@REM This batch file can be used directly instead of startup.bat and 
+@REM This batch file can be used directly instead of startup.bat and
 @REM shutdown.bat as they call this batch file anyway.
 @REM
 @REM You should not have to edit this file.  If you wish to have environment
 @REM variables set each time you run this batch file refer to the information
-@REM on the setenv.bat file below. 
+@REM on the setenv.bat file below.
 @REM
 @REM Invocation Syntax:
 @REM
-@REM   geronimo command [geronimo_args] 
+@REM   geronimo command [geronimo_args]
 @REM
-@REM   For detailed usage information, just run geronimo.bat without any 
+@REM   For detailed usage information, just run geronimo.bat without any
 @REM   arguments.
 @REM
 @REM Environment Variable Prequisites:
-@REM 
+@REM
 @REM   GERONIMO_HOME   May point at your Geronimo top-level directory.
 @REM                   If not specified, this batch file will attempt to
 @REM                   discover it relative to the location of this file.
@@ -57,7 +57,7 @@
 @REM
 @REM   GERONIMO_WIN_START_ARGS  (Optional) additional arguments to the Windows
 @REM                            START command when the "start" command
-@REM                            is executed. E.G, you could set this to /MIN 
+@REM                            is executed. E.G, you could set this to /MIN
 @REM                            to start Geronimo in a minimized window.
 @REM
 @REM   JAVA_HOME       Points to your Java Development Kit installation.
@@ -66,7 +66,7 @@
 @REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
 @REM
 @REM   JRE_HOME        (Optional) Points to your Java Runtime Environment
-@REM                   Set this if you wish to run Geronimo using the JRE 
+@REM                   Set this if you wish to run Geronimo using the JRE
 @REM                   instead of the JDK (except for the "debug" command).
 @REM                   Defaults to JAVA_HOME if empty.
 @REM                   It is mandatory either JAVA_HOME or JRE_HOME are set.
@@ -82,11 +82,11 @@
 @REM                   command is executed. The default is "8000".
 @REM
 @REM   JPDA_OPTS       (Optional) JPDA command line options.
-@REM                   Only set this if you need to use some unusual JPDA 
+@REM                   Only set this if you need to use some unusual JPDA
 @REM                   command line options.  This overrides the use of the
 @REM                   other JPDA_* environment variables.
 @REM                   Defaults to JPDA command line options contructed from
-@REM                   the JPDA_ADDRESS, JPDA_SUSPEND and JPDA_TRANSPORT 
+@REM                   the JPDA_ADDRESS, JPDA_SUSPEND and JPDA_TRANSPORT
 @REM                   environment variables.
 @REM
 @REM   JPDA_SUSPEND    (Optional) Suspend the JVM before the main class is loaded.
@@ -94,7 +94,7 @@
 @REM
 @REM   JPDA_TRANSPORT  (Optional) JPDA transport used when the "jpda start"
 @REM                   command is executed. The default is "dt_socket".
-@REM                   Note that "dt_socket" is the default instead of "dt_shmem" 
+@REM                   Note that "dt_socket" is the default instead of "dt_shmem"
 @REM                   because eclipse does not support "dt_shmem".
 @REM
 @REM Troubleshooting execution of this batch file:
@@ -107,14 +107,14 @@
 @REM                        end of execution
 @REM
 @REM   GERONIMO_ENV_INFO    (Optional) Environment variable that when set to
-@REM                        "on" (the default) outputs the values of  
+@REM                        "on" (the default) outputs the values of
 @REM                        GERONIMO_HOME, GERONIMO_BASE, 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.
 @REM
 @REM Batch files called by this batch file:
-@REM 
+@REM
 @REM   %GERONIMO_HOME%\bin\setenv.bat
 @REM                   (Optional) This batch file is called if it is present.
 @REM                   Its contents may set one or more of the above environment
@@ -202,7 +202,7 @@
 set JPDA_SUSPEND=n
 :gotJpdaSuspend
 if not "%JPDA_TRANSPORT%" == "" goto gotJpdaTransport
-@REM Note that "dt_socket" is the default instead of "dt_shmem" 
+@REM Note that "dt_socket" is the default instead of "dt_shmem"
 @REM because eclipse does not support "dt_shmem".
 set JPDA_TRANSPORT=dt_socket
 :gotJpdaTransport
@@ -242,7 +242,7 @@
 echo   run               Start Geronimo in the current window
 echo   start             Start Geronimo in a separate window
 echo   stop              Stop Geronimo
-echo. 
+echo.
 echo args for debug, jpda run, jpda start, run and start commands:
 echo        --quiet       No startup progress
 echo        --long        Long startup progress
@@ -250,7 +250,7 @@
 echo   -vv  --veryverbose DEBUG log level
 echo        --override    Override configurations. USE WITH CAUTION!
 echo        --help        Detailed help.
-echo. 
+echo.
 echo args for stop command:
 echo        --user        Admin user
 echo        --password    Admin password
@@ -268,7 +268,7 @@
 echo Note: The jdb debugger will start Geronimo in another process and connect to it.
 echo       To terminate Geronimo when running under jdb, run the "geronimo stop" command
 echo       in another window.  Do not use Ctrl-C as that will terminate the jdb client
-echo       (the debugger itself) but will not stop the Geronimo process. 
+echo       (the debugger itself) but will not stop the Geronimo process.
 goto execCmd
 
 :doRun
@@ -279,7 +279,7 @@
 echo.
 echo Starting Geronimo in a separate window...
 shift
-@REM use long format of startup progress to be consistent with 
+@REM use long format of startup progress to be consistent with
 @REM the unix version of the start processing
 set _LONG_OPT=--long
 
@@ -308,11 +308,11 @@
 
 @REM Execute Java with the applicable properties
 if not "%JDB%" == "" goto doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.base.dir="%GERONIMO_BASE%"
-Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %_LONG_OPT% %CMD_LINE_ARGS%
+%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Djava.ext.dirs="%JRE_HOME%/lib/ext;%GERONIMO_BASE%/lib/ext"
-Djava.endorsed.dirs="%JRE_HOME%\lib\endorsed;%GERONIMO_BASE%\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%" -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="%JRE_HOME%\lib\endorsed;%GERONIMO_BASE%\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/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh?view=diff&rev=452362&r1=452361&r2=452362
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/geronimo.sh
Tue Oct  3 02:19:14 2006
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 #  Copyright 2005 The Apache Software Foundation
-# 
+#
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,18 +24,18 @@
 # This script is based upon Tomcat's catalina.sh file to enable
 # those familiar with Tomcat to quickly get started with Geronimo.
 #
-# This script file can be used directly instead of startup.sh and 
+# This script file can be used directly instead of startup.sh and
 # shutdown.sh as they call this script file anyway.
 #
 # 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. 
+# on the setenv.sh script that is called by this script below.
 #
 # Invocation Syntax:
 #
-#   geronimo.sh command [geronimo_args] 
+#   geronimo.sh command [geronimo_args]
 #
-#   For detailed command usage information, just run geronimo.sh without any 
+#   For detailed command usage information, just run geronimo.sh without any
 #   arguments.
 #
 # Environment Variable Prequisites:
@@ -52,7 +52,7 @@
 #                   "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 
+#                   will be redirected to if Geronimo is started in the
 #                   background.
 #                   Defaults to $GERONIMO_BASE/var/log/geronimo.out
 #
@@ -69,7 +69,7 @@
 #                   It is mandatory either JAVA_HOME or JRE_HOME are set.
 #
 #   JRE_HOME        Points to your Java Runtime Environment installation.
-#                   Set this if you wish to run Geronimo using the JRE 
+#                   Set this if you wish to run Geronimo using the JRE
 #                   instead of the JDK (except for the "debug" command).
 #                   Defaults to JAVA_HOME if empty.
 #                   It is mandatory either JAVA_HOME or JRE_HOME are set.
@@ -77,7 +77,7 @@
 #   JAVA_OPTS       (Optional) Java runtime options used when the "start",
 #                   "stop", or "run" command is executed.
 #
-#   JDB_SRCPATH     (Optional) The Source Path to be used by jdb debugger 
+#   JDB_SRCPATH     (Optional) The Source Path to be used by jdb debugger
 #                   when the "debug" command is executed.
 #                   Defaults to %GERONIMO_HOME%\src
 #
@@ -88,11 +88,11 @@
 #                   command is executed. The default is "dt_socket".
 #
 #   JPDA_OPTS       (Optional) JPDA command line options.
-#                   Only set this if you need to use some unusual JPDA 
+#                   Only set this if you need to use some unusual JPDA
 #                   command line options.  This overrides the use of the
 #                   other JPDA_* environment variables.
-#                   Defaults to JPDA command line options contructed from 
-#                   the JPDA_ADDRESS, JPDA_SUSPEND and JPDA_TRANSPORT 
+#                   Defaults to JPDA command line options contructed from
+#                   the JPDA_ADDRESS, JPDA_SUSPEND and JPDA_TRANSPORT
 #                   environment variables.
 #
 #   JPDA_SUSPEND    (Optional) Suspend the JVM before the main class is loaded.
@@ -109,11 +109,11 @@
 #  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
-#                    JRE_HOME before the command is issued. Set to "off"    
+#                    JRE_HOME before the command is issued. Set to "off"
 #                    if you do not want this information displayed.
 #
 # Scripts called by this script:
-# 
+#
 #   $GERONIMO_HOME/bin/setenv.sh
 #                   (Optional) This script file is called if it is present.
 #                   Its contents may set one or more of the above environment
@@ -167,7 +167,7 @@
 if $cygwin; then
   [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
-  [ -n "$JDB_SRCPATH" ] && JDB_SRCPATH=`cygpath --unix "$JDB_SRCPATH"`  
+  [ -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
@@ -185,7 +185,7 @@
 fi
 
 # Get standard Java environment variables
-# (based upon Tomcat's setclasspath.sh but renamed since Geronimo's classpath 
+# (based upon Tomcat's setclasspath.sh but renamed since Geronimo's classpath
 # is set in the JAR manifest)
 if $os400; then
   # -r will Only work on the os400 if the files are:
@@ -193,7 +193,7 @@
   # 2. owned by the PRIMARY group of the user
   # this will not work if the user belongs in secondary groups
   BASEDIR="$GERONIMO_HOME"
-  . "$GERONIMO_HOME"/bin/setjavaenv.sh 
+  . "$GERONIMO_HOME"/bin/setjavaenv.sh
 else
   if [ -r "$GERONIMO_HOME"/bin/setjavaenv.sh ]; then
     BASEDIR="$GERONIMO_HOME"
@@ -229,7 +229,7 @@
 if $cygwin; then
   JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
   JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
-  JDB_SRCPATH=`cygpath --absolute --windows "$JDB_SRCPATH"`  
+  JDB_SRCPATH=`cygpath --absolute --windows "$JDB_SRCPATH"`
   GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
   GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
   GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
@@ -271,7 +271,7 @@
   fi
   if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
     echo "Using JPDA_OPTS:       $JPDA_OPTS"
-  fi  
+  fi
   GERONIMO_OPTS="$GERONIMO_OPTS $JPDA_OPTS"
   shift
 fi
@@ -288,10 +288,12 @@
     shift
     exec "$_RUNJDB" $JAVA_OPTS $GERONIMO_OPTS \
       -sourcepath "$JDB_SRCPATH" \
+      -Djava.endorsed.dirs="$JRE_HOME/lib/endorsed:$GERONIMO_BASE/lib/endorsed" \
+      -Djava.ext.dirs="$JRE_HOME/lib/ext:$GERONIMO_BASE/lib/ext" \
       -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
       -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
       -classpath "$GERONIMO_HOME"/bin/server.jar \
-      org.apache.geronimo.system.main.Daemon $LONG_OPT "$@" 
+      org.apache.geronimo.system.main.Daemon $LONG_OPT "$@"
   fi
 
 elif [ "$1" = "run" ]; then
@@ -299,8 +301,10 @@
   shift
   exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+    -Djava.endorsed.dirs="$JRE_HOME/lib/endorsed:$GERONIMO_BASE/lib/endorsed" \
+    -Djava.ext.dirs="$JRE_HOME/lib/ext:$GERONIMO_BASE/lib/ext" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
-    -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" 
+    -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@"
 
 elif [ "$1" = "start" ] ; then
 
@@ -308,6 +312,8 @@
   touch "$GERONIMO_OUT"
   $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+    -Djava.endorsed.dirs="$JRE_HOME/lib/endorsed:$GERONIMO_BASE/lib/endorsed" \
+    -Djava.ext.dirs="$JRE_HOME/lib/ext:$GERONIMO_BASE/lib/ext" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/server.jar $LONG_OPT "$@" \
     >> $GERONIMO_OUT 2>&1 &
@@ -330,6 +336,8 @@
 
   "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
     -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \
+    -Djava.endorsed.dirs="$JRE_HOME/lib/endorsed:$GERONIMO_BASE/lib/endorsed" \
+    -Djava.ext.dirs="$JRE_HOME/lib/ext:$GERONIMO_BASE/lib/ext" \
     -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
     -jar "$GERONIMO_HOME"/bin/shutdown.jar "$@"
 

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat?view=diff&rev=452362&r1=452361&r2=452362
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.bat
Tue Oct  3 02:19:14 2006
@@ -20,11 +20,11 @@
 @REM --------------------------------------------------------------------
 @REM Set environment variables relating to the execution of java commands
 @REM
-@REM This batch file is called by the geronimo.bat file (which is 
+@REM This batch file is called by the geronimo.bat file (which is
 @REM invoked by the startup.bat, shutdown.bat files).  This file is
 @REM also invoked by the deploy.bat file.
 @REM
-@REM It is preferable (to simplify migration to future Geronimo releases) 
+@REM It is preferable (to simplify migration to future Geronimo releases)
 @REM to set any environment variables you need in the setenv.bat file
 @REM rather than modifying Geronimo's script files.  See the documentation
 @REM in the geronimo.bat file for further information.
@@ -71,7 +71,7 @@
 
 :okJdkFileCheck
 @REM default JRE_HOME to JAVA_HOME if not set.
-if "%JRE_HOME%" == "" set JRE_HOME=%JAVA_HOME%
+if "%JRE_HOME%" == "" set JRE_HOME=%JAVA_HOME%\jre
 
 if not "%BASEDIR%" == "" goto gotBasedir
 echo The BASEDIR environment variable is not defined

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh?view=diff&rev=452362&r1=452361&r2=452362
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
(original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/setjavaenv.sh
Tue Oct  3 02:19:14 2006
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
 #  Copyright 2005 The Apache Software Foundation
-# 
+#
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
-# 
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 #   Unless required by applicable law or agreed to in writing, software
 #   distributed under the License is distributed on an "AS IS" BASIS,
 #   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
 # by the startup.sh, shutdown.sh files).  This file is also invoked
 # by the deploy.sh file.
 #
-# It is preferable (to simplify migration to future Geronimo releases) 
+# It is preferable (to simplify migration to future Geronimo releases)
 # to set any environment variables you need in the setenv.sh file
 # rather than modifying Geronimo's script files.  See the documentation
 # in the geronimo.sh file for further information.
@@ -45,7 +45,7 @@
   exit 1
 fi
 if [ -z "$JRE_HOME" ]; then
-  JRE_HOME="$JAVA_HOME"
+  JRE_HOME="$JAVA_HOME/jre"
 fi
 
 # If we're running under jdb, we need a full jdk.

Modified: geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java?view=diff&rev=452362&r1=452361&r2=452362
==============================================================================
--- geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
(original)
+++ geronimo/server/trunk/modules/geronimo-system/src/main/java/org/apache/geronimo/system/main/Daemon.java
Tue Oct  3 02:19:14 2006
@@ -176,7 +176,7 @@
                 monitor = new LongStartupMonitor();
             else
                 monitor = new ProgressBarStartupMonitor();
-        }                                                            
+        }
 
         // JVMCheck();   // Removed for 1.1
     }
@@ -213,17 +213,6 @@
                 throw new AssertionError();
             }
 
-            // setup the endorsed dir entry
-            CommandLineManifest manifestEntries = CommandLineManifest.getManifestEntries();
-
-            String endorsedDirs = "java.endorsed.dirs";
-            List endorsedDirsFromManifest = manifestEntries.getEndorsedDirs();
-            AddToSystemProperty(endorsedDirs, endorsedDirsFromManifest, geronimoInstallDirectory);
-
-            String extensionDirs = "java.ext.dirs";
-            List extensionDirsFromManifest = manifestEntries.getExtensionDirs();
-            AddToSystemProperty(extensionDirs, extensionDirsFromManifest, geronimoInstallDirectory);
-
             ClassLoader classLoader = Daemon.class.getClassLoader();
 
             // create the kernel
@@ -260,7 +249,7 @@
                     }
                 }
             }
-            
+
             monitor.systemStarted(kernel);
 
             AbstractNameQuery query = new AbstractNameQuery(PersistentConfigurationList.class.getName());



Mime
View raw message