svn commit: r1485412 - /accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java

[ec...@apache.org]

Author: ecn
Date: Wed May 22 20:45:00 2013
New Revision: 1485412

URL: http://svn.apache.org/r1485412
Log:
ACCUMULO-970 simplify the hunt for the correct jars

Modified:
    accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java

Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java?rev=1485412&r1=1485411&r2=1485412&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java Wed May 22 20:45:00 2013
@@ -168,17 +168,8 @@ public class State {
     }
     
     File libdir = new File(acuHome + "/lib");
-    files = libdir.list();
-    for (int i = 0; i < files.length; i++) {
-      String f = files[i];
-      if (f.matches("^accumulo-core-.+jar$") || f.matches("^accumulo-server-.+jar$") || f.matches("^accumulo-fate-.+jar$")
-          || f.matches("^accumulo-trace-.+jar$") || f.matches("^libthrift-.+jar$")) {
-        if (retval == null) {
-          retval = String.format("%s/%s", libdir.getAbsolutePath(), f);
-        } else {
-          retval += String.format(",%s/%s", libdir.getAbsolutePath(), f);
-        }
-      }
+    for (String jar : "accumulo-core accumulo-server accumulo-fate accumulo-trace libthrift".split(" ")) {
+      retval += String.format(",%s/%s.jar", libdir.getAbsolutePath(), jar);      
     }
     
     return retval;