svn commit: r1044373 - /cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java

[davidb]

Author: davidb
Date: Fri Dec 10 14:40:08 2010
New Revision: 1044373

URL: http://svn.apache.org/viewvc?rev=1044373&view=rev
Log:
Fix for CXF-DOSGi multibundle system test failures.

Modified:
    
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java

Modified: 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=1044373&r1=1044372&r2=1044373&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
 (original)
+++ 
cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java
 Fri Dec 10 14:40:08 2010
@@ -44,7 +44,7 @@ public class MultiBundleTools {
     }
     
     private static int getDistroBundles(File mdRoot, String pomVersion, 
Map<Integer, String> bundles, boolean discovery) throws Exception {
-        File distroDir = new File(mdRoot, 
"target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion + ".dir");
+        File distroDir = new File(mdRoot, 
"target/cxf-dosgi-ri-multibundle-distribution-" + pomVersion);
         Properties p = new Properties();
         File confDir = new File(distroDir, "apache-cxf-dosgi-ri-" + pomVersion 
+ "/conf");
         p.load(new FileInputStream(new File(confDir, 
"felix.config.properties.append")));