You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@sirona.apache.org by Romain Manni-Bucau <rm...@gmail.com> on 2014/02/05 00:47:17 UTC

Fwd: svn commit: r1564558 - /incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java

Can you revert please?
https://builds.apache.org/job/sirona/79/org.apache.sirona$sirona-javaagent/testReport/junit/org.apache.test.sirona.javaagent/SimpleTest/alreadyTryCatch/

I think we can make a javaagent runner instead of reusing this lazy one
dedicated to our sirona runner, no? Surely a good other project.



---------- Message transféré ----------
De : <ol...@apache.org>
Date : mercredi 5 février 2014
Objet : svn commit: r1564558 -
/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:17:52 2014
New Revision: 1564558

URL: http://svn.apache.org/r1564558
Log:
revert r1564321 add an other condition to not include -sources jar

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=1564558&r1=1564557&r2=1564558&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:17:52 2014
@@ -223,8 +223,10 @@ public class JavaAgentRunner extends Blo
         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("-shaded.jar");
+                return name.startsWith( System.getProperty(
"javaagent.jar.name.start", "sirona-javaagent-" )) //
+                        && name.endsWith(".jar") //
+                        && !name.contains("-sources") //
+                        && !name.contains("-tests");
             }
         });
         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>*

Re: svn commit: r1564558 - /incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java

Posted by Olivier Lamy <ol...@apache.org>.
I changed that to make it reusable: http://svn.apache.org/r1564567
At least I can now override that.
But my previous change worked locally :-)


On 5 February 2014 10:47, Romain Manni-Bucau <rm...@gmail.com> wrote:
> Can you revert please?
> https://builds.apache.org/job/sirona/79/org.apache.sirona$sirona-javaagent/testReport/junit/org.apache.test.sirona.javaagent/SimpleTest/alreadyTryCatch/
>
> I think we can make a javaagent runner instead of reusing this lazy one
> dedicated to our sirona runner, no? Surely a good other project.
>
>
>
> ---------- Message transféré ----------
> De : <ol...@apache.org>
> Date : mercredi 5 février 2014
> Objet : svn commit: r1564558 -
> /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:17:52 2014
> New Revision: 1564558
>
> URL: http://svn.apache.org/r1564558
> Log:
> revert r1564321 add an other condition to not include -sources jar
>
> 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=1564558&r1=1564557&r2=1564558&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:17:52 2014
> @@ -223,8 +223,10 @@ public class JavaAgentRunner extends Blo
>          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("-shaded.jar");
> +                return name.startsWith( System.getProperty(
> "javaagent.jar.name.start", "sirona-javaagent-" )) //
> +                        && name.endsWith(".jar") //
> +                        && !name.contains("-sources") //
> +                        && !name.contains("-tests");
>              }
>          });
>          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>*



-- 
Olivier Lamy
Ecetera: http://ecetera.com.au
http://twitter.com/olamy | http://linkedin.com/in/olamy