Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 98861 invoked from network); 30 Apr 2007 19:26:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Apr 2007 19:26:58 -0000 Received: (qmail 92257 invoked by uid 500); 30 Apr 2007 19:27:04 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 92216 invoked by uid 500); 30 Apr 2007 19:27:04 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 92205 invoked by uid 99); 30 Apr 2007 19:27:04 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2007 12:27:04 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Apr 2007 12:26:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B6A671A983E; Mon, 30 Apr 2007 12:26:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070430192634.B6A671A983E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }