You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/02/24 21:40:09 UTC
svn commit: r1571430 -
/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Author: rmannibucau
Date: Mon Feb 24 20:40:08 2014
New Revision: 1571430
URL: http://svn.apache.org/r1571430
Log:
supporting parameters on javaagent (tomee mvn plugin)
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1571430&r1=1571429&r2=1571430&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Mon Feb 24 20:40:08 2014
@@ -749,10 +749,21 @@ public abstract class AbstractTomEEMojo
strings.addAll(Arrays.asList(args.split(" ")));
}
if (javaagents != null) {
- for (final String javaagent : javaagents) {
+ for (final String rawJavaagent : javaagents) {
+ final String javaagent;
+ final String args;
+ final int argsIdx = rawJavaagent.indexOf('?');
+ if (argsIdx > 0) {
+ javaagent = rawJavaagent.substring(0, argsIdx);
+ args = rawJavaagent.substring(argsIdx);
+ } else {
+ javaagent = rawJavaagent;
+ args = "";
+ }
+
if (!new File(javaagent).isFile()) {
try {
- strings.add("-javaagent:" + mvnToFile(javaagent, "jar"));
+ strings.add("-javaagent:" + mvnToFile(javaagent, "jar") + args);
} catch (final Exception e) {
getLog().warn("Can't find " + javaagent);
strings.add("-javaagent:" + javaagent);