geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r533833 - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/bin/ maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
Date Mon, 30 Apr 2007 19:26:34 GMT
Author: dwoods
Date: Mon Apr 30 12:26:32 2007
New Revision: 533833

URL: http://svn.apache.org/viewvc?view=rev&rev=533833
Log:
GERONIMO-3114 Update setup of java.endorsed.dirs to always have ours before the JVM.  Also
updated java.ext.dirs to place ours before the JVM.

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/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
    geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.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=533833&r1=533832&r2=533833
==============================================================================
--- 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
Mon Apr 30 12:26:32 2007
@@ -318,11 +318,11 @@
 
 @REM Execute Java with the applicable properties
 if not "%JDB%" == "" goto doJDB
-%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% "%JAVA_AGENT_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%
+%_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%
 goto end
 
 :doJDB
-%_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%
+%_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/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=533833&r1=533832&r2=533833
==============================================================================
--- 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
Mon Apr 30 12:26:32 2007
@@ -235,11 +235,11 @@
   GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
   GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"`
   GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
-  EXT_DIRS="$JRE_HOME/lib/ext;$GERONIMO_BASE/lib/ext"
-  ENDORSED_DIRS="$JRE_HOME/lib/endorsed;$GERONIMO_BASE/lib/endorsed"
+  EXT_DIRS="$GERONIMO_BASE/lib/ext;$JRE_HOME/lib/ext"
+  ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed;$JRE_HOME/lib/endorsed"
 else
-  EXT_DIRS="$JRE_HOME/lib/ext:$GERONIMO_BASE/lib/ext"
-  ENDORSED_DIRS="$JRE_HOME/lib/endorsed:$GERONIMO_BASE/lib/endorsed"
+  EXT_DIRS="$GERONIMO_BASE/lib/ext:$JRE_HOME/lib/ext"
+  ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed:$JRE_HOME/lib/endorsed"
 fi
 
 # ----- Execute The Requested Command -----------------------------------------

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java?view=diff&rev=533833&r1=533832&r2=533833
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/RunClientMojo.java
Mon Apr 30 12:26:32 2007
@@ -106,8 +106,8 @@
         // Set the properties which we pass to the JVM from the startup script
         setSystemProperty(java, "org.apache.geronimo.base.dir", geronimoHome);
         setSystemProperty(java, "java.io.tmpdir", new File(geronimoHome, "var/temp"));
-        setSystemProperty(java, "java.endorsed.dirs", appendSystemPath("java.endorsed.dirs",
new File(geronimoHome, "lib/endorsed")));
-        setSystemProperty(java, "java.ext.dirs", appendSystemPath("java.ext.dirs", new File(geronimoHome,
"lib/ext")));
+        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")));
 
         java.createArg().setValue(moduleId);
 
@@ -127,15 +127,16 @@
         java.execute();
     }
 
-    private String appendSystemPath(final String name, final File file) {
+    private String prefixSystemPath(final String name, final File file) {
         assert name != null;
         assert file != null;
 
-        String dirs = System.getProperty(name, "");
-        if (dirs.length() > 0) {
+        String dirs = file.getPath();
+        String prop = System.getProperty(name, "");
+        if (prop.length() > 0) {
             dirs += File.pathSeparator;
+            dirs += prop;
         }
-        dirs += file.getPath();
         return dirs;
     }
 

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?view=diff&rev=533833&r1=533832&r2=533833
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
(original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Mon Apr 30 12:26:32 2007
@@ -236,8 +236,8 @@
         // Set the properties which we pass to the JVM from the startup script
         setSystemProperty(java, "org.apache.geronimo.base.dir", geronimoHome);
         setSystemProperty(java, "java.io.tmpdir", new File(geronimoHome, "var/temp"));
-        setSystemProperty(java, "java.endorsed.dirs", appendSystemPath("java.endorsed.dirs",
new File(geronimoHome, "lib/endorsed")));
-        setSystemProperty(java, "java.ext.dirs", appendSystemPath("java.ext.dirs", new File(geronimoHome,
"lib/ext")));
+        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")));
 
         if (quiet) {
             java.createArg().setValue("--quiet");
@@ -357,15 +357,16 @@
         }
     }
 
-    private String appendSystemPath(final String name, final File file) {
+    private String prefixSystemPath(final String name, final File file) {
         assert name != null;
         assert file != null;
 
-        String dirs = System.getProperty(name, "");
-        if (dirs.length() > 0) {
+        String dirs = file.getPath();
+        String prop = System.getProperty(name, "");
+        if (prop.length() > 0) {
             dirs += File.pathSeparator;
+            dirs += prop;
         }
-        dirs += file.getPath();
         return dirs;
     }
 



Mime
View raw message