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 2014/02/05 00:52:57 UTC
svn commit: r1564567 -
/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
Author: olamy
Date: Tue Feb 4 23:52:57 2014
New Revision: 1564567
URL: http://svn.apache.org/r1564567
Log:
change to non static and protected to be able to override
Modified:
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/JavaAgentRunner.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java?rev=1564567&r1=1564566&r2=1564567&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 Tue Feb 4 23:52:57 2014
@@ -124,7 +124,7 @@ public class JavaAgentRunner extends Blo
}
}
- private static String[] buildProcessArgs(final FrameworkMethod mtd) throws IOException {
+ protected String[] buildProcessArgs(final FrameworkMethod mtd) throws IOException {
final Collection<String> args = new ArrayList<String>();
args.add( findJava() );
@@ -219,14 +219,13 @@ public class JavaAgentRunner extends Blo
return latch;
}
- private static String buildJavaagent() throws IOException {
+ protected String buildJavaagent() throws IOException {
final File[] files = new File(System.getProperty("javaagent.jar.directory", "target")).listFiles(new FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.startsWith( System.getProperty( "javaagent.jar.name.start", "sirona-javaagent-" )) //
&& name.endsWith(".jar") //
- && !name.contains("-sources") //
- && !name.contains("-tests");
+ && name.endsWith("-shaded.jar");
}
});
return files[0].getAbsolutePath();
Fwd: svn commit: r1564567 - /incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Since we build the classpath in the same class we know if we need to use
shade or not so maybe just add a prop to @AgentArgs(shaded = true)
My goal forking and not changing the classloader was to test shade was well
done
---------- Message transféré ----------
De : <ol...@apache.org>
Date : mercredi 5 février 2014
Objet : svn commit: r1564567 -
/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
À : commits@sirona.incubator.apache.org
Author: olamy
Date: Tue Feb 4 23:52:57 2014
New Revision: 1564567
URL: http://svn.apache.org/r1564567
Log:
change to non static and protected to be able to override
Modified:
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/JavaAgentRunner.java
URL:
http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java?rev=1564567&r1=1564566&r2=1564567&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
Tue Feb 4 23:52:57 2014
@@ -124,7 +124,7 @@ public class JavaAgentRunner extends Blo
}
}
- private static String[] buildProcessArgs(final FrameworkMethod mtd)
throws IOException {
+ protected String[] buildProcessArgs(final FrameworkMethod mtd) throws
IOException {
final Collection<String> args = new ArrayList<String>();
args.add( findJava() );
@@ -219,14 +219,13 @@ public class JavaAgentRunner extends Blo
return latch;
}
- private static String buildJavaagent() throws IOException {
+ protected String buildJavaagent() throws IOException {
final File[] files = new
File(System.getProperty("javaagent.jar.directory", "target")).listFiles(new
FilenameFilter() {
@Override
public boolean accept(File dir, String name) {
return name.startsWith( System.getProperty(
"javaagent.jar.name.start", "sirona-javaagent-" )) //
&& name.endsWith(".jar") //
- && !name.contains("-sources") //
- && !name.contains("-tests");
+ && name.endsWith("-shaded.jar");
}
});
return files[0].getAbsolutePath();
--
*Romain Manni-Bucau*
*Twitter: @rmannibucau <https://twitter.com/rmannibucau>*
*Blog: **http://rmannibucau.wordpress.com/*<http://rmannibucau.wordpress.com/>
*LinkedIn: **http://fr.linkedin.com/in/rmannibucau
<http://fr.linkedin.com/in/rmannibucau>*
*Github: https://github.com/rmannibucau <https://github.com/rmannibucau>*