From e1ff9c87d7121f18f675f4ae125932d690aa8f48 Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 17 Sep 2010 09:40:34 +0000 Subject: Switch to using the latest jci otests (r94). git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@998036 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java | 10 +--------- .../policy/src/test/resources/oasis-sca-tests.properties | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) (limited to 'sca-java-2.x/trunk/compliance-tests/policy/src') diff --git a/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java index ac2759114f..a6ee41aab6 100644 --- a/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java +++ b/sca-java-2.x/trunk/compliance-tests/policy/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java @@ -22,7 +22,6 @@ 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; @@ -61,10 +60,7 @@ public class TuscanyRuntimeBridge implements RuntimeBridge { public boolean startContribution(String compositeName, String contributionLocation, String[] contributionNames) throws Exception { try { // Tuscany specific code which starts the contribution(s) holding the test - Properties ps = new Properties(); - ps.setProperty("defaultScheme", "vm"); - ps.setProperty("org.apache.tuscany.sca.binding.ws.jaxws.ri.JAXWSBindingProviderFactory.defaultPort", "8080"); - launcher = NodeFactory.newInstance(ps); + launcher = NodeFactory.newInstance(); Contribution[] contributions = new Contribution[contributionNames.length]; String[] contributionURIs = getContributionURIs(contributionLocation, contributionNames); @@ -103,10 +99,6 @@ public class TuscanyRuntimeBridge implements RuntimeBridge { for (int i = 0; i < locations.length; i++) { String aLocation = contributionLocation.replaceAll("%1", contributionNames[i]); - if (!(new File(aLocation)).exists()) { - aLocation = aLocation.replace(".zip", ".jar"); - } - locations[i] = aLocation; } // end for } else { diff --git a/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties index 0d8cc27a45..0347fc3ec5 100644 --- a/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties +++ b/sca-java-2.x/trunk/compliance-tests/policy/src/test/resources/oasis-sca-tests.properties @@ -26,5 +26,5 @@ org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.Tuscany # The location of the contributions for the test suite # %1 represents the placement of the name of each contribution into the location URI -org.oasis.sca.tests.assembly.contribution.location=target/oasis-contributions/%1.zip +org.oasis.sca.tests.assembly.contribution.location=target/oasis-contributions/%1/target/%1.zip -- cgit v1.2.3