geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r936484 - in /geronimo/server/trunk/framework: buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ configs/karaf-framework/src/main/distribution/unix-shell/bin/ configs/karaf-framework/src/main...
Date Wed, 21 Apr 2010 20:23:38 GMT
Author: gawor
Date: Wed Apr 21 20:23:38 2010
New Revision: 936484

URL: http://svn.apache.org/viewvc?rev=936484&view=rev
Log:
GERONIMO-5213: javaagent updates

Modified:
    geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
    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/geronimo.bat

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java?rev=936484&r1=936483&r2=936484&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
Wed Apr 21 20:23:38 2010
@@ -195,7 +195,7 @@ public class StartServerMojo
         }
 
         // Load the Java programming language agent for JPA
-        File javaAgentJar = new File(geronimoHome, "bin/jpa.jar");
+        File javaAgentJar = new File(geronimoHome, "lib/agent/transformer.jar");
         if (javaAgentJar.exists()) {
             java.createJvmarg().setValue("-javaagent:" + javaAgentJar.getCanonicalPath());
         }

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=936484&r1=936483&r2=936484&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 Apr 21 20:23:38 2010
@@ -290,7 +290,7 @@ if [ "$1" = "jpda" ] ; then
 fi
 
 # Setup the Java programming language agent
-JAVA_AGENT_JAR="$GERONIMO_HOME/bin/jpa.jar"
+JAVA_AGENT_JAR="$GERONIMO_HOME/lib/agent/transformer.jar"
 
 if [ "$1" = "debug" ] ; then
   if $os400; then

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=936484&r1=936483&r2=936484&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 Apr 21 20:23:38 2010
@@ -312,7 +312,7 @@ goto setArgs
 :doneSetArgs
 
 @REM Setup the Java programming language agent
-set JAVA_AGENT_JAR=%GERONIMO_HOME%\bin\jpa.jar
+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%"
 



Mime
View raw message