[jboss-cvs] JBossAS SVN: r79775 - projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util.

[jboss-cvs-commits at lists.jboss.org]

Author: stalep
Date: 2008-10-20 18:01:03 -0400 (Mon, 20 Oct 2008)
New Revision: 79775

Modified:
   projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java
   projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java
Log:
[JBAOP-538] added a more generic parsing of the jars needed


Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java	2008-10-20 22:00:26 UTC (rev 79774)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/AopRunCommand.java	2008-10-20 22:01:03 UTC (rev 79775)
@@ -23,6 +23,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.regex.Pattern;
 
 import org.jboss.aophelper.core.AopHandler;
 import org.jboss.aophelper.core.AopRun;
@@ -125,16 +126,24 @@
    private String getLoadtimePath()
    {
       String pathSeparator = System.getProperty("path.separator");
+      String fileSeparator = System.getProperty("file.separator");
       String[] paths = System.getProperty("java.class.path").split(pathSeparator);
+      Pattern pattern = Pattern.compile("(\\"+fileSeparator+".*\\"+fileSeparator+")++");
+
       for(String p : paths)
       {
-         if(p.contains("jboss-aop-"))
-            return "-javaagent:"+p;
+         String[] splits = pattern.split(p);
+         for(String s : splits)
+         { 
+            if(s.contains("jboss-aop"))
+            {
+               return "-javaagent:"+p;
+            }
+         }
       }
       return null;
    }
    
-
    private String getClasspath()
    {
       StringBuilder sb = new StringBuilder();

Modified: projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java
===================================================================
--- projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java	2008-10-20 22:00:26 UTC (rev 79774)
+++ projects/aop/trunk/aophelper/src/main/java/org/jboss/aophelper/util/CommandUtil.java	2008-10-20 22:01:03 UTC (rev 79775)
@@ -41,23 +41,23 @@
       String[] paths = System.getProperty("java.class.path").split(pathSeparator);
       for(String p : paths)
       {
-         if(p.contains("jboss-aop-"))
+         if(p.contains("jboss-aop"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("trove-2"))
+         else if(p.contains("trove"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("javassist-3"))
+         else if(p.contains("javassist"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("jboss-common-core-2"))
+         else if(p.contains("jboss-common-core"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("jboss-logging-spi-2"))
+         else if(p.contains("jboss-logging-spi"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("jboss-container-"))
+         else if(p.contains("jboss-container"))
             aopPaths.append(p).append(pathSeparator);
          else if(p.contains("jboss-common-logging-spi"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("jboss-mdr-"))
+         else if(p.contains("jboss-mdr"))
             aopPaths.append(p).append(pathSeparator);
-         else if(p.contains("jboss-reflect-"))
+         else if(p.contains("jboss-reflect"))
             aopPaths.append(p).append(pathSeparator);
          
       }