Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 59988 invoked from network); 21 Apr 2010 20:24:21 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 21 Apr 2010 20:24:21 -0000 Received: (qmail 56741 invoked by uid 500); 21 Apr 2010 20:24:21 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 56666 invoked by uid 500); 21 Apr 2010 20:24:21 -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 56659 invoked by uid 99); 21 Apr 2010 20:24:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 Apr 2010 20:24:21 +0000 X-ASF-Spam-Status: No, hits=-1372.5 required=10.0 tests=ALL_TRUSTED,AWL 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; Wed, 21 Apr 2010 20:24:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CE6B238897F; Wed, 21 Apr 2010 20:23:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100421202338.7CE6B238897F@eris.apache.org> 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%"