From 0d6d7922ed17cca55ec36ff2626d1080e76d6d13 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 07:11:27 +0000 Subject: Remove old beta1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027389 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-Beta1/compliance-tests/binding-ws/pom.xml | 129 ----------- .../compliance-tests/binding-ws/sca_variables.dtd | 28 --- .../tuscany/sca/otest/TuscanyRuntimeBridge.java | 238 --------------------- .../src/test/resources/oasis-sca-tests.properties | 30 --- .../tuscany-oasis-sca-tests-errors.properties | 27 --- 5 files changed, 452 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/pom.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/sca_variables.dtd delete mode 100644 sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/oasis-sca-tests.properties delete mode 100644 sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/tuscany-oasis-sca-tests-errors.properties (limited to 'sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws') diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/pom.xml b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/pom.xml deleted file mode 100644 index 06a53c7d4e..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-compliance-tests - 2.0-Beta1-SNAPSHOT - ../pom.xml - - tuscany-compliance-test-binding-ws - Apache Tuscany SCA Specification Compliance Tests Binding WS - - - - - - - org.apache.tuscany.sca - oasis-binding-ws-test-runner - 1.0-SNAPSHOT - - - - org.apache.tuscany.sca.shades - tuscany-base - 2.0-Beta1-SNAPSHOT - - - - - org.codehaus.woodstox - wstx-asl - 3.2.4 - runtime - - - stax - stax-api - - - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - test-compile - - unpack - - - - - org.apache.tuscany.sca - oasis-binding-ws-contributions - 1.0-SNAPSHOT - zip - ${project.build.directory}/oasis-contributions - - - org.apache.tuscany.sca - oasis-binding-ws-test-runner - 1.0-SNAPSHOT - jar - commons-logging.properties,oasis-sca-tests.properties - ${project.build.directory}/test-classes - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/sca_variables.dtd b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/sca_variables.dtd deleted file mode 100644 index f29713a20d..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/sca_variables.dtd +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java deleted file mode 100644 index 6f4aa8e86a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tuscany.sca.otest; - -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; -import java.util.Properties; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -import client.RuntimeBridge; -import client.TestConfiguration; - -/** - * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x) - * - */ -public class TuscanyRuntimeBridge implements RuntimeBridge { - - static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION"; - - protected NodeFactory launcher; - protected Node node; - protected Properties expectedErrorMessages; - - TestConfiguration testConfiguration = null; - - public TuscanyRuntimeBridge() { - // read test error mapping - expectedErrorMessages = new Properties(); - try { - InputStream propertiesStream = this.getClass().getResourceAsStream("/tuscany-oasis-sca-tests-errors.properties"); - expectedErrorMessages.load(propertiesStream); - } catch (IOException e) { - System.out.println("Unable to read oasis-sca-tests-errors.properties file"); - } - } - - public TestConfiguration getTestConfiguration() { - return testConfiguration; - } - - public void setTestConfiguration(TestConfiguration testConfiguration) { - this.testConfiguration = testConfiguration; - } - - public boolean startContribution(String compositeName, - String contributionLocation, String[] contributionNames) - throws Exception { - //TODO: - return startContribution(contributionLocation, contributionNames); - } - - public boolean startContribution(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); - - Contribution[] contributions = new Contribution[contributionNames.length]; - String[] contributionURIs = getContributionURIs(contributionLocation); - for (int i = 0; i < contributions.length; i++) { - contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]); - } // end for - - node = launcher.createNode(testConfiguration.getComposite(), contributions); - // Start the node - node.start(); - - // For debugging - // print out the composites that have been read in success cases - // System.out.println(((NodeImpl)node).dumpDomainComposite()); - } catch (Exception e) { - System.out.println(e.getMessage()); - e.printStackTrace(); - throw e; - } // end try - - return true; - } // end method startContribution - - /** - * Gets the location of the Contributions as URIs - * @param contributionLocation - a location pattern URI, which contains one or more "%1" - * substrings, which are substituted with the name of the contribution to get the URI of - * the contribution - * @return the contribution locations as an array of Strings - */ - protected String[] getContributionURIs(String contributionLocation) throws Exception { - String[] locations; - locations = testConfiguration.getContributionNames(); - - if (locations != null && contributionLocation != null) { - - for (int i = 0; i < locations.length; i++) { - String aLocation = contributionLocation.replaceAll("%1", locations[i]); - // Looks like bugs in the oasis code that sometimes still uses jars for some - if (aLocation.endsWith("_POJO.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 { - if (locations == null) { - // No contribution specified - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution supplied - error"); - } else { - // No contribution location supplied - throw an Exception - throw new Exception("Unable to start SCA runtime - no contribution location supplied - error"); - } // end if - } // end if - - return locations; - } // end getContributionURI - - public void stopContribution() { - if (node != null) { - node.stop(); - } // end if - if (launcher != null) { - launcher.destroy(); - } // end if - } // end method stopContribution - - public String getContributionLocation(Class testClass) { - return ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - } // end method getContributionLocation - - public void checkError(String testName, Throwable ex) throws Throwable { - - String expectedMessage = expectedErrorMessages.getProperty(testName); - String receivedMessage = ex.getMessage(); - - if (expectedMessage == null){ - writeMissingMessage(testName, ex); - fail("Null expected error message for test " + testName + - "Please add message to oasis-sca-tests-errors.properties"); - } // end if - - if (receivedMessage == null){ - ex.printStackTrace(); - fail("Null received error message for test " + testName); - } // end if - - if (expectedMessage.startsWith("*")) { - // allow using * to ignore a message comparison - return; - } - - // Deal with the case where the message has variable parts within it - // marked with the characters ***. Here we tokenize the epected string - // and make sure all the individual parts are present in the results string - String expectedMessageParts[] = expectedMessage.split("\\*\\*\\*"); - - if (expectedMessageParts.length > 1){ - int foundParts = 0; - for(int i = 0; i < expectedMessageParts.length; i++){ - if (receivedMessage.indexOf(expectedMessageParts[i]) > -1 ){ - foundParts++; - } - } - - if (foundParts == expectedMessageParts.length){ - return; - } - } - - - // Deal with the case where the end of the message is variable (eg contains absolute filenames) - // and where the only relevant part is the start of the message - in this case the expected - // message only contains the stem section which is unchanging... - if( receivedMessage.length() > expectedMessage.length() ) { - // Truncate the received message to the length of the expected message - receivedMessage = receivedMessage.substring(0, expectedMessage.length() ); - } // end if - - if (!expectedMessage.equals(receivedMessage)) { - writeIncorrectMessage(testName, expectedMessage, receivedMessage); - } - - assertEquals( expectedMessage, receivedMessage ); - - return; - - } - - protected void writeMissingMessage(String testName, Throwable ex) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestMissingMsgs.txt", true)); - out.write(testName + "=*"); - out.newLine(); - out.close(); - } catch (IOException e) { - } - } - - protected void writeIncorrectMessage(String testName, String expected, String received) { - try { - BufferedWriter out = new BufferedWriter(new FileWriter("target/OTestIncorrectMsgs.txt", true)); - out.write(testName); out.newLine(); - out.write(" " + expected); out.newLine(); - out.write(" " + received); out.newLine(); - out.close(); - } catch (IOException e) { - } - } - -} // end class TuscanyRuntimeBridge diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/oasis-sca-tests.properties deleted file mode 100644 index 33192c49e5..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/oasis-sca-tests.properties +++ /dev/null @@ -1,30 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# OASIS SCA Assembly test properties -# The implementation type to use for Assembly test suite -# org.oasis.sca.tests.assembly.lang=BPEL -org.oasis.sca.tests.assembly.lang=Java - -# The class to use as the Runtime Bridge for the SCA runtime under test -#org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyOSGiRuntimeBridge -org.oasis.sca.tests.assembly.runtime_bridge=org.apache.tuscany.sca.otest.TuscanyRuntimeBridge - -# 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 - diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/tuscany-oasis-sca-tests-errors.properties deleted file mode 100644 index 4e8b4e5cbd..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-ws/src/test/resources/tuscany-oasis-sca-tests-errors.properties +++ /dev/null @@ -1,27 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -BWS_2020=* -BWS_3001=* -BWS_4008=* -BWS_2007=* -BWS_2018=* -BWS_2005=* -BWS_2001=* -BWS_2022=* -BWS_2002=* -BWS_2019=* - -- cgit v1.2.3