You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sirona.apache.org by ol...@apache.org on 2015/02/16 03:13:52 UTC
svn commit: r1660015 - in
/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent:
AgentArgs.java JavaAgentRunner.java
Author: olamy
Date: Mon Feb 16 02:13:51 2015
New Revision: 1660015
URL: http://svn.apache.org/r1660015
Log:
add an option to pass extra args to the vm
Modified:
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java?rev=1660015&r1=1660014&r2=1660015&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java Mon Feb 16 02:13:51 2015
@@ -28,7 +28,9 @@ import java.lang.annotation.Target;
@Retention ( RetentionPolicy.RUNTIME )
public @interface AgentArgs
{
+
boolean removeTargetClassesFromClasspath() default true;
+
boolean removeSironaFromClasspath() default true;
String value();
@@ -44,4 +46,11 @@ public @interface AgentArgs
* @return system properties to use in the forked agent format: props1=value|props2=value
*/
String sysProps() default "";
+
+ /**
+ * to setup extra vm args i.e -XX....
+ * @return
+ * @since 0.3
+ */
+ String[] vmArgs() default "";
}
Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java?rev=1660015&r1=1660014&r2=1660015&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java Mon Feb 16 02:13:51 2015
@@ -166,6 +166,15 @@ public class JavaAgentRunner extends Blo
args.add("-noverify");
}
+ String[] vmArgs = agentArgs == null ? new String[0] : agentArgs.vmArgs();
+
+ // java launcher not happy with empty arg....
+ if (vmArgs.length>0 && !( vmArgs.length==1 && vmArgs[0].length()<1))
+ {
+ args.addAll( Arrays.asList( vmArgs ) );
+ }
+
+
String sysProps = agentArgs == null ? "" : agentArgs.sysProps();
if (sysProps.length() > 0) {