Update to allow reading jars from local workspace build dir

environments/servlet/tests/src/test/java/org/jboss/weld/environment/servlet/test/util/MavenArtifactResolver.java

@@ -1,6 +1,10 @@
 package org.jboss.weld.environment.servlet.test.util;
 
 import java.io.File;
+import java.io.FilenameFilter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -12,33 +16,80 @@
  */
 public class MavenArtifactResolver
 {
+
    public static File resolve(String groupId, String artifactId)
    {
       String classPath = System.getProperty("java.class.path");
-      // first look for an artefact from the repo
+      // first look for an artifact from the repo
       String pathString = groupId.replace('.', File.separatorChar) + File.separatorChar + artifactId;
-      String regex = "[^:]*" + Pattern.quote(pathString) + "[^:]*";
-      Pattern p = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
+      Pattern p = Pattern.compile("[^:]*" + Pattern.quote(pathString) + "[^:]*", Pattern.CASE_INSENSITIVE);
       Matcher matches = p.matcher(classPath);
 
       if (!matches.find())
       {
          // find a resource from the local build
-         String localResource = Pattern.quote("target" + File.separatorChar + artifactId);
-         regex = "[^:]*" + localResource + "[^:]*";
-         p = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-         matches = p.matcher(classPath);
-         if (!matches.find())
+         String localClasses = Pattern.quote("target" + File.separatorChar + "classes");
+         Pattern localClassesPattern = Pattern.compile("[^:]*" + localClasses + "[^:]*", Pattern.CASE_INSENSITIVE);
+         Matcher localClassesMatcher = localClassesPattern.matcher(classPath);
+         if (!localClassesMatcher.find())
+         {
+            throw new IllegalArgumentException("Unable to find maven archive " + groupId + ":" + artifactId + " in the local build");
+         }
+         else
          {
-            throw new RuntimeException("Unable to find maven archive " + groupId + ":" + artifactId + " on the test classpath");
+            List<String> targetPaths = new ArrayList<String>();
+            do
+            {
+               String path = localClassesMatcher.group();
+               targetPaths.add(path.substring(0, path.length() - 8));
+            }
+            while (localClassesMatcher.find());
+            return new File(findBuiltArtifact(targetPaths, artifactId));
          }
       }
-      return new File(matches.group(0));
+      else
+      {
+         return new File(matches.group(0));
+      }
    }
 
    public static File resolve(String qualifiedArtifactId)
    {
       String[] segments = qualifiedArtifactId.split(":");
       return resolve(segments[0], segments[1]);
    }
+
+   public static String findBuiltArtifact(List<String> targetPaths, String artifactId)
+   {
+      final String regex = "^" + artifactId + "-[\\d+\\.]+(?:\\-\\p{Upper}*)?.jar$";
+      for (String targetPath : targetPaths)
+      {
+         File target = new File(targetPath);
+         if (target.exists())
+         {
+            if (!target.isDirectory())
+            {
+               throw new IllegalStateException("Found ${project.dir}/target/ but it is not a directory!");
+            }
+            String[] possibleFiles = target.list(new FilenameFilter()
+            {
+
+               public boolean accept(File dir, String name)
+               {
+                  return name.matches(regex);
+               }
+
+            });
+            if (possibleFiles.length == 1)
+            {
+               return "target" + File.separatorChar + possibleFiles[0];
+            }
+            if (possibleFiles.length > 0)
+            {
+               throw new IllegalStateException("Found multiple matching files " + Arrays.asList(possibleFiles) + " for " + artifactId + " not sure which one to choose");
+            }
+         }
+      }
+      return null;
+   }
 }