Index: SurefireBooter.java =================================================================== --- SurefireBooter.java (revision 489098) +++ SurefireBooter.java (working copy) @@ -47,6 +47,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; import java.util.Properties; /** @@ -760,6 +762,9 @@ Properties p = loadProperties( surefirePropertiesFile ); SurefireBooter surefireBooter = new SurefireBooter(); + + SortedMap cpUrls = new TreeMap(); + SortedMap scpUrls = new TreeMap(); for ( Enumeration e = p.propertyNames(); e.hasMoreElements(); ) { @@ -783,11 +788,11 @@ } else if ( name.startsWith( "classPathUrl." ) ) { - surefireBooter.addClassPathUrl( p.getProperty( name ) ); + cpUrls.put(Integer.valueOf(name.split("\\.")[1]), p.getProperty( name )); } else if ( name.startsWith( "surefireClassPathUrl." ) ) { - surefireBooter.addSurefireClassPathUrl( p.getProperty( name ) ); + scpUrls.put(Integer.valueOf(name.split("\\.")[1]), p.getProperty( name )); } else if ( name.startsWith( "surefireBootClassPathUrl." ) ) { @@ -804,6 +809,21 @@ Boolean.valueOf( p.getProperty( "useSystemClassLoader" ) ).booleanValue(); } } + + System.out.println("FORKED TEST CLASSPATH: "); + + for(Iterator cpi = cpUrls.keySet().iterator(); cpi.hasNext(); ) + { + String url = (String)cpUrls.get( cpi.next() ); + System.out.println(" " + url); + surefireBooter.addClassPathUrl( url ); + } + + for(Iterator scpi = scpUrls.keySet().iterator(); scpi.hasNext(); ) + { + String url = (String)scpUrls.get( scpi.next() ); + surefireBooter.addSurefireClassPathUrl( url ); + } String testSet = p.getProperty( "testSet" ); boolean result;