Author: antelder
Date: Mon Mar 29 14:07:30 2010
New Revision: 928783
URL: http://svn.apache.org/viewvc?rev=928783&view=rev
Log:
Update the assmebly tests runtime bridge to find both jar and zip contributions
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
Modified:
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java?rev=928783&r1=928782&r2=928783&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
(original)
+++
tuscany/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
Mon Mar 29 14:07:30 2010
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.fail;
import java.io.BufferedWriter;
+import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
@@ -114,6 +115,9 @@ public class TuscanyRuntimeBridge implem
if (aLocation.endsWith("_Java-1.0.zip") &&
!aLocation.endsWith("ASM_8005_Java-1.0.zip")) {
aLocation = aLocation.substring(0, aLocation.length()-3) +
"jar";
}
+ if (!(new File(aLocation)).exists()) {
+ aLocation = aLocation.replace(".zip", ".jar");
+ }
locations[i] = aLocation;
} // end for
} else {
