Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 51783 invoked from network); 1 Dec 2008 21:33:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Dec 2008 21:33:23 -0000 Received: (qmail 95305 invoked by uid 500); 1 Dec 2008 21:33:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 95260 invoked by uid 500); 1 Dec 2008 21:33:28 -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 95233 invoked by uid 99); 1 Dec 2008 21:33:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Dec 2008 13:33:28 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Dec 2008 21:31:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E0CEA238898F; Mon, 1 Dec 2008 13:32:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r722243 - in /geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin: client.bat client.sh geronimo.bat geronimo.sh Date: Mon, 01 Dec 2008 21:32:15 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081201213215.E0CEA238898F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Mon Dec 1 13:32:15 2008 New Revision: 722243 URL: http://svn.apache.org/viewvc?rev=722243&view=rev Log: use GERONIMO_HOME instead of GERONIMO_BASE to resolve files in bin or lib directories. Patch from Russell E Glaue (GERONIMO-4229) Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.sh geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat?rev=722243&r1=722242&r2=722243&view=diff ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.bat Mon Dec 1 13:32:15 2008 @@ -167,7 +167,7 @@ set CMD_LINE_ARGS=%* set _JARFILE="%GERONIMO_HOME%"\bin\client.jar -%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Djava.endorsed.dirs="%GERONIMO_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_BASE%\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.base.dir="%GERONIMO_BASE%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS% goto end :end Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.sh URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.sh?rev=722243&r1=722242&r2=722243&view=diff ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.sh (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/client.sh Mon Dec 1 13:32:15 2008 @@ -177,11 +177,11 @@ GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"` GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"` GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"` - EXT_DIRS="$GERONIMO_BASE/lib/ext;$JRE_HOME/lib/ext" - ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed;$JRE_HOME/lib/endorsed" + EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext" + ENDORSED_DIRS="$GERONIMO_HOME/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" + EXT_DIRS="$GERONIMO_HOME/lib/ext:$JRE_HOME/lib/ext" + ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed:$JRE_HOME/lib/endorsed" fi # ----- Execute The Requested Command ----------------------------------------- Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat?rev=722243&r1=722242&r2=722243&view=diff ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.bat Mon Dec 1 13:32:15 2008 @@ -311,17 +311,17 @@ :doneSetArgs @REM Setup the Java programming language agent -set JAVA_AGENT_JAR=%GERONIMO_BASE%\bin\jpa.jar +set JAVA_AGENT_JAR=%GERONIMO_HOME%\bin\jpa.jar set JAVA_AGENT_OPTS= if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%" @REM Execute Java with the applicable properties if not "%JDB%" == "" goto doJDB -%_EXECJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Djava.endorsed.dirs="%GERONIMO_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_BASE%\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.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="%GERONIMO_BASE%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_BASE%\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.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/src/main/underlay/contents/bin/geronimo.sh URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh?rev=722243&r1=722242&r2=722243&view=diff ============================================================================== --- geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh (original) +++ geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh Mon Dec 1 13:32:15 2008 @@ -235,11 +235,11 @@ GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"` GERONIMO_BASE=`cygpath --absolute --windows "$GERONIMO_BASE"` GERONIMO_TMPDIR=`cygpath --windows "$GERONIMO_TMPDIR"` - EXT_DIRS="$GERONIMO_BASE/lib/ext;$JRE_HOME/lib/ext" - ENDORSED_DIRS="$GERONIMO_BASE/lib/endorsed;$JRE_HOME/lib/endorsed" + EXT_DIRS="$GERONIMO_HOME/lib/ext;$JRE_HOME/lib/ext" + ENDORSED_DIRS="$GERONIMO_HOME/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" + EXT_DIRS="$GERONIMO_HOME/lib/ext:$JRE_HOME/lib/ext" + ENDORSED_DIRS="$GERONIMO_HOME/lib/endorsed:$JRE_HOME/lib/endorsed" fi # ----- Execute The Requested Command ----------------------------------------- @@ -284,7 +284,7 @@ fi # Setup the Java programming language agent -JAVA_AGENT_JAR="\"$GERONIMO_BASE/bin/jpa.jar\"" +JAVA_AGENT_JAR="\"$GERONIMO_HOME/bin/jpa.jar\"" if [ -f "$JAVA_AGENT_JAR" ]; then JAVA_AGENT_OPTS="-javaagent:$JAVA_AGENT_JAR" else