Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 86260 invoked from network); 8 Nov 2008 12:50:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Nov 2008 12:50:01 -0000 Received: (qmail 75708 invoked by uid 500); 8 Nov 2008 12:50:07 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 75698 invoked by uid 500); 8 Nov 2008 12:50:07 -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 75687 invoked by uid 99); 8 Nov 2008 12:50:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 08 Nov 2008 04:50:07 -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; Sat, 08 Nov 2008 12:48:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1DCAA2388961; Sat, 8 Nov 2008 04:49:32 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r712387 - /geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh Date: Sat, 08 Nov 2008 12:49:32 -0000 To: scm@geronimo.apache.org From: dwoods@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081108124932.1DCAA2388961@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dwoods Date: Sat Nov 8 04:49:31 2008 New Revision: 712387 URL: http://svn.apache.org/viewvc?rev=712387&view=rev Log: GERONIMO-4389 updated patch from Jack Modified: 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/geronimo.sh URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/src/main/underlay/contents/bin/geronimo.sh?rev=712387&r1=712386&r2=712387&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 Sat Nov 8 04:49:31 2008 @@ -284,7 +284,7 @@ fi # Setup the Java programming language agent -JAVA_AGENT_JAR="$GERONIMO_BASE/bin/jpa.jar" +JAVA_AGENT_JAR="\"$GERONIMO_BASE/bin/jpa.jar\"" if [ -f "$JAVA_AGENT_JAR" ]; then JAVA_AGENT_OPTS="-javaagent:$JAVA_AGENT_JAR" else @@ -314,7 +314,7 @@ elif [ "$1" = "run" ]; then shift exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ - "$JAVA_AGENT_OPTS" \ + $JAVA_AGENT_OPTS \ -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.endorsed.dirs="$ENDORSED_DIRS" \ -Djava.ext.dirs="$EXT_DIRS" \ @@ -325,7 +325,7 @@ shift touch "$GERONIMO_OUT" $START_OS_CMD "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \ - "$JAVA_AGENT_OPTS" \ + $JAVA_AGENT_OPTS \ -Dorg.apache.geronimo.base.dir="$GERONIMO_BASE" \ -Djava.endorsed.dirs="$ENDORSED_DIRS" \ -Djava.ext.dirs="$EXT_DIRS" \