summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-03-29 14:07:30 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2010-03-29 14:07:30 +0000
commit9d1a4c4a37542c22a7b29d9f1dab2a196fecc5a2 (patch)
treed8d2507cf694d446a628d27cd2ee140d2ea70398
parent905af6fed520ca6f29a5e4bbaec5e9b802ea360c (diff)
Update the assmebly tests runtime bridge to find both jar and zip contributions
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@928783 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
index 9ded0654d1..754e853b95 100644
--- a/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ b/sca-java-2.x/trunk/compliance-tests/assembly/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
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 implements RuntimeBridge {
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 {