svn commit: r563810 - /maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java

[brett]

Author: brett
Date: Wed Aug  8 04:05:03 2007
New Revision: 563810

URL: http://svn.apache.org/viewvc?view=rev&rev=563810
Log:
[SUREFIRE-61] correct classpath ordering
Submitted by: Paul Gier, Barrett Snyder
merged from: r563809 on surefire-2.3.x branch

Modified:
    
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java

Modified: 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
URL: 
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java?view=diff&rev=563810&r1=563809&r2=563810
==============================================================================
--- 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
 (original)
+++ 
maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooter.java
 Wed Aug  8 04:05:03 2007
@@ -52,6 +52,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * @author Jason van Zyl
@@ -816,6 +818,10 @@
 
             File surefirePropertiesFile = new File( args[0] );
             Properties p = loadProperties( surefirePropertiesFile );
+            
+            SortedMap classPathUrls = new TreeMap();
+            
+            SortedMap surefireClassPathUrls = new TreeMap();
 
             SurefireBooter surefireBooter = new SurefireBooter( true );
 
@@ -845,11 +851,11 @@
                 }
                 else if ( name.startsWith( "classPathUrl." ) )
                 {
-                    surefireBooter.addClassPathUrl( p.getProperty( name ) );
+                    classPathUrls.put(Integer.valueOf(name.split("\\.")[1]), 
p.getProperty( name ));
                 }
                 else if ( name.startsWith( "surefireClassPathUrl." ) )
                 {
-                    surefireBooter.addSurefireClassPathUrl( p.getProperty( 
name ) );
+                    
surefireClassPathUrls.put(Integer.valueOf(name.split("\\.")[1]), p.getProperty( 
name ));
                 }
                 else if ( name.startsWith( "surefireBootClassPathUrl." ) )
                 {
@@ -871,6 +877,19 @@
                                                                                
                p.getProperty( "useSystemClassLoader" ) ).booleanValue() );
                 }
             }
+            
+            for (Iterator cpi = classPathUrls.keySet().iterator(); 
cpi.hasNext();) 
+            {
+                String url = (String) classPathUrls.get(cpi.next());
+                surefireBooter.addClassPathUrl(url);
+            }
+
+            for (Iterator scpi = surefireClassPathUrls.keySet().iterator(); 
scpi.hasNext();) 
+            {
+                String url = (String) surefireClassPathUrls.get(scpi.next());
+                surefireBooter.addSurefireClassPathUrl(url);
+            }
+            
 
             String testSet = p.getProperty( "testSet" );
             boolean result;