You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/11/08 13:48:13 UTC
svn commit: r712385 -
/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
Author: dwoods
Date: Sat Nov 8 04:48:12 2008
New Revision: 712385
URL: http://svn.apache.org/viewvc?rev=712385&view=rev
Log:
GERONIMO-4389 updated patch from Jack
Modified:
geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh?rev=712385&r1=712384&r2=712385&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh Sat Nov 8 04:48:12 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" \
Re: svn commit: r712385 - /geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
Posted by Jack Cai <gr...@gmail.com>.
Thanks Kevan for catching this! I've provided a new fix - it's clumsy, but
it works now.
-Jack
2009/2/17 Kevan Miller <ke...@gmail.com>
> This change has broken -javaagent processing on my Mac OS X system.
> JAVA_AGENT_OPTS will never be set and as a result we'll never run with the
> OpenJPA runtime enhancer.
> Does it work on Linux or any other unix-based system?
>
> Start geronimo ('startup.sh' or 'geronimo.sh run') and check to see what
> parameters have been passed to java. With this change, it looks like:
>
> bash-3.2$ ps auxww | grep server.jar
> kevan 7245 67.5 2.4 2997696 102400 p0 R+ 10:40PM 0:08.80
> /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java
> -Dorg.apache.geronimo.home.dir=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT
> -Djava.endorsed.dirs=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/endorsed:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/endorsed
> -Djava.ext.dirs=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/ext:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext
> -Djava.io.tmpdir=var/temp -jar
> /Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/server.jar
>
> Without the change, it correctly sets -javaagent:
>
> bash-3.2$ ps auxww | grep server.jar
> kevan 17952 128.4 5.0 3074220 209992 p0 R+ 11:16PM 0:20.85
> /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java
> -javaagent:/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/jpa.jar
> -Dorg.apache.geronimo.home.dir=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT
> -Djava.endorsed.dirs=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/endorsed:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/endorsed
> -Djava.ext.dirs=/Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/ext:/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext
> -Djava.io.tmpdir=var/temp -jar
> /Users/kevan/geronimo/server/branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/server.jar
>
> --kevan
>
>
> On Nov 8, 2008, at 7:48 AM, dwoods@apache.org wrote:
>
> Author: dwoods
> Date: Sat Nov 8 04:48:12 2008
> New Revision: 712385
>
> URL: http://svn.apache.org/viewvc?rev=712385&view=rev
> Log:
> GERONIMO-4389 updated patch from Jack
>
> Modified:
>
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
>
> Modified:
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
> URL:
> http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh?rev=712385&r1=712384&r2=712385&view=diff
>
> ==============================================================================
> ---
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
> (original)
> +++
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
> Sat Nov 8 04:48:12 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" \
>
>
>
>
Re: svn commit: r712385 - /geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh
Posted by Kevan Miller <ke...@gmail.com>.
This change has broken -javaagent processing on my Mac OS X system.
JAVA_AGENT_OPTS will never be set and as a result we'll never run with
the OpenJPA runtime enhancer.
Does it work on Linux or any other unix-based system?
Start geronimo ('startup.sh' or 'geronimo.sh run') and check to see
what parameters have been passed to java. With this change, it looks
like:
bash-3.2$ ps auxww | grep server.jar
kevan 7245 67.5 2.4 2997696 102400 p0 R+ 10:40PM
0:08.80 /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/
bin/java -Dorg.apache.geronimo.home.dir=/Users/kevan/geronimo/server/
branches/2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT -
Djava.endorsed.dirs=/Users/kevan/geronimo/server/branches/2.1/target/
geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/endorsed:/System/Library/
Frameworks/JavaVM.framework/Versions/1.6/Home/lib/endorsed -
Djava.ext.dirs=/Users/kevan/geronimo/server/branches/2.1/target/
geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/ext:/System/Library/
Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext -
Djava.io.tmpdir=var/temp -jar /Users/kevan/geronimo/server/branches/
2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/server.jar
Without the change, it correctly sets -javaagent:
bash-3.2$ ps auxww | grep server.jar
kevan 17952 128.4 5.0 3074220 209992 p0 R+ 11:16PM
0:20.85 /System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/
bin/java -javaagent:/Users/kevan/geronimo/server/branches/2.1/target/
geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/jpa.jar -
Dorg.apache.geronimo.home.dir=/Users/kevan/geronimo/server/branches/
2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT -
Djava.endorsed.dirs=/Users/kevan/geronimo/server/branches/2.1/target/
geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/endorsed:/System/Library/
Frameworks/JavaVM.framework/Versions/1.6/Home/lib/endorsed -
Djava.ext.dirs=/Users/kevan/geronimo/server/branches/2.1/target/
geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/lib/ext:/System/Library/
Frameworks/JavaVM.framework/Versions/1.6/Home/lib/ext -
Djava.io.tmpdir=var/temp -jar /Users/kevan/geronimo/server/branches/
2.1/target/geronimo-tomcat6-javaee5-2.1.4-SNAPSHOT/bin/server.jar
--kevan
On Nov 8, 2008, at 7:48 AM, dwoods@apache.org wrote:
> Author: dwoods
> Date: Sat Nov 8 04:48:12 2008
> New Revision: 712385
>
> URL: http://svn.apache.org/viewvc?rev=712385&view=rev
> Log:
> GERONIMO-4389 updated patch from Jack
>
> Modified:
> geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh
>
> Modified: geronimo/server/branches/2.1/assemblies/geronimo-
> boilerplate-minimal/src/main/underlay/bin/geronimo.sh
> URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/src/main/underlay/bin/geronimo.sh?rev=712385&r1=712384&r2=712385&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh (original)
> +++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-
> minimal/src/main/underlay/bin/geronimo.sh Sat Nov 8 04:48:12 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" \
>
>