You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/03/10 22:43:30 UTC

svn commit: r1665712 - /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java

Author: burn
Date: Tue Mar 10 21:43:30 2015
New Revision: 1665712

URL: http://svn.apache.org/r1665712
Log:
UIMA-4274 Create test classpath from all jars in test-classes as the build no longer renames them

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java?rev=1665712&r1=1665711&r2=1665712&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/helper/Utilities.java Tue Mar 10 21:43:30 2015
@@ -18,6 +18,7 @@
 */
 package org.apache.uima.ducc.container.jd.test.helper;
 
+import java.io.File;
 import java.net.URL;
 
 public class Utilities {
@@ -38,22 +39,17 @@ public class Utilities {
 	}
 	
 	private Utilities() {
-		userCP = 
-			resource("/") +
-			":" +
-			resource("/uima-ducc-user.jar") +
-			":" +
-			resource("/uimaj-as-core.jar") +
-			":" +
-			resource("/uimaj-core.jar") +
-			":" +
-			resource("/xstream-1.3.1.jar") +
-			":" +
-			resource("/spring-core.jar") +
-			":" +
-			resource("/xmlbeans.jar") +
-			""
-			;
+		// Create classpath from all jars in the test-classes directory, plus the directory.
+		// i.e. uima-ducc-user uimaj-core uimaj-as-core xmlbeans xstream spring-core
+		userCP = resource("/");
+		StringBuilder sb = new StringBuilder(userCP);
+		File dir = new File(userCP);
+		for (File file : dir.listFiles()) {
+			if (file.getName().endsWith(".jar")) {
+				sb.append(':').append(file.getPath());
+			}
+		}
+		userCP = sb.toString();
 	}
 	
 	public String getUserCP() {
@@ -71,6 +67,7 @@ public class Utilities {
 	public void listToConsole(String userCP) {
 		if(userCP != null) {
 			String[] segments = userCP.split(":");
+			System.out.println("userCP has " + segments.length + " segments:");
 			for(String segment : segments) {
 				System.out.println(segment);
 			}