You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2010/05/19 20:36:06 UTC
svn commit: r946328 - in
/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution:
unix-shell/bin/client unix-shell/bin/geronimo windows-text/bin/client.bat
windows-text/bin/geronimo.bat
Author: gawor
Date: Wed May 19 18:36:06 2010
New Revision: 946328
URL: http://svn.apache.org/viewvc?rev=946328&view=rev
Log:
enable java agent in app client
Modified:
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client?rev=946328&r1=946327&r2=946328&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client Wed May 19 18:36:06 2010
@@ -173,6 +173,8 @@ do
fi
done
+# Setup the Java agent
+JAVA_AGENT_JAR="$GERONIMO_HOME/lib/agent/transformer.jar"
# Extension dirs
EXT_DIRS="$GERONIMO_HOME/lib/ext:$JRE_HOME/lib/ext"
# Endorsed dirs
@@ -196,14 +198,29 @@ if [ "$GERONIMO_ENV_INFO" != "off" ] ; t
echo "Using JRE_HOME: $JRE_HOME"
fi
-exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \
- -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
- -Dkaraf.home="$GERONIMO_HOME" \
- -Dkaraf.base="$GERONIMO_HOME" \
- -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
- -Djava.endorsed.dirs="$ENDORSED_DIRS" \
- -Djava.ext.dirs="$EXT_DIRS" \
- -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
- -classpath "$CLASSPATH" \
- org.apache.geronimo.cli.client.ClientCLI "$@"
+if [ -f "$JAVA_AGENT_JAR" ]; then
+ exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
+ -javaagent:"$JAVA_AGENT_JAR" \
+ -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
+ -Dkaraf.home="$GERONIMO_HOME" \
+ -Dkaraf.base="$GERONIMO_HOME" \
+ -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.endorsed.dirs="$ENDORSED_DIRS" \
+ -Djava.ext.dirs="$EXT_DIRS" \
+ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
+ -classpath "$CLASSPATH" \
+ org.apache.geronimo.cli.client.ClientCLI "$@"
+else
+ exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
+ -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false \
+ -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
+ -Dkaraf.home="$GERONIMO_HOME" \
+ -Dkaraf.base="$GERONIMO_HOME" \
+ -Djava.util.logging.config.file=$GERONIMO_HOME/etc/java.util.logging.properties \
+ -Djava.endorsed.dirs="$ENDORSED_DIRS" \
+ -Djava.ext.dirs="$EXT_DIRS" \
+ -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
+ -classpath "$CLASSPATH" \
+ org.apache.geronimo.cli.client.ClientCLI "$@"
+fi
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo?rev=946328&r1=946327&r2=946328&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo Wed May 19 18:36:06 2010
@@ -235,6 +235,8 @@ do
fi
done
+# Setup the Java agent
+JAVA_AGENT_JAR="$GERONIMO_HOME/lib/agent/transformer.jar"
# Extension dirs
EXT_DIRS="$GERONIMO_HOME/lib/ext:$JRE_HOME/lib/ext"
# Endorsed dirs
@@ -291,9 +293,6 @@ if [ "$1" = "jpda" ] ; then
shift
fi
-# Setup the Java programming language agent
-JAVA_AGENT_JAR="$GERONIMO_HOME/lib/agent/transformer.jar"
-
if [ "$1" = "debug" ] ; then
if $os400; then
echo "Debug command not available on OS400"
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat?rev=946328&r1=946327&r2=946328&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat Wed May 19 18:36:06 2010
@@ -164,7 +164,12 @@ if "%_REQUIRE_JDK%" == "0" echo Using JR
@REM Capture any passed in arguments
set CMD_LINE_ARGS=%*
-%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_HOME%" -Djava.util.logging.config.file="%GERONIMO_HOME%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath "%CLASSPATH%" org.apache.geronimo.cli.client.ClientCLI %CMD_LINE_ARGS%
+@REM Setup the Java agent
+set JAVA_AGENT_JAR=%GERONIMO_HOME%\lib\agent\transformer.jar
+set JAVA_AGENT_OPTS=
+if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%"
+
+%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% %JAVA_AGENT_OPTS% -Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=false -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Dkaraf.home="%GERONIMO_HOME%" -Dkaraf.base="%GERONIMO_HOME%" -Djava.util.logging.config.file="%GERONIMO_HOME%\etc\java.util.logging.properties" -Djava.endorsed.dirs="%GERONIMO_HOME%\lib\endorsed;%JRE_HOME%\lib\endorsed" -Djava.ext.dirs="%GERONIMO_HOME%\lib\ext;%JRE_HOME%\lib\ext" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -classpath "%CLASSPATH%" org.apache.geronimo.cli.client.ClientCLI %CMD_LINE_ARGS%
goto end
:end
Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat?rev=946328&r1=946327&r2=946328&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat Wed May 19 18:36:06 2010
@@ -312,7 +312,7 @@ shift
goto setArgs
:doneSetArgs
-@REM Setup the Java programming language agent
+@REM Setup the Java agent
set JAVA_AGENT_JAR=%GERONIMO_HOME%\lib\agent\transformer.jar
set JAVA_AGENT_OPTS=
if exist "%JAVA_AGENT_JAR%" set JAVA_AGENT_OPTS=-javaagent:"%JAVA_AGENT_JAR%"