Remove old beta1 branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027389 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 0 insertions, 301 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
deleted file mode 100644
index 136e5668c0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/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/java-ci/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/oasis-sca-tests.properties
deleted file mode 100644
index 38e1e013dc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/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=POJO

-

-# 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/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
deleted file mode 100644
index 4de2d6e98b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/java-ci/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ /dev/null
@@ -1,33 +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. 

-POJO_2003=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.IntrospectionException: [JCA90042,JCI20002] Implementation missing service method operation2 service interface org.oasisopen.sca.test.Service1Superset

-POJO_5001=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.NoConstructorException: [JCI50001] No public constructor for class

-POJO_5005=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.AmbiguousConstructorException:

-POJO_5006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateConstructorException: [JCI50002] Multiple constructors marked with @Constructor

-POJO_5007=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.InvalidConstructorException: [JCI50005] Multiple annotated constructors

-POJO_8002=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8002Component1] - [ASM50004,JCA30002,JCI80001] Component service interface incompatible with implementation service interface: Component = TEST_POJO_8002Component1 Service = Service1Superset Operation operationb not found on target

-POJO_8003=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8003Component1, Service: Service1] - [POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent {http://docs.oasis-open.org/ns/opencsa/sca/200912}suspendsTransaction and {http://docs.oasis-open.org/ns/opencsa/sca/200912}propagatesTransaction are mutually exclusive

-POJO_8008=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8008Component1, Service: Service1] - [POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent {http://docs.oasis-open.org/ns/opencsa/sca/200912}suspendsTransaction and {http://docs.oasis-open.org/ns/opencsa/sca/200912}propagatesTransaction are mutually exclusive

-POJO_8012=org.oasisopen.sca.ServiceRuntimeException: [Composite: {http://docs.oasis-open.org/ns/opencsa/sca/200912}, Component: TEST_POJO_8012Component1, Service: Service1] - [POL40009,ASM60009,ASM60010,JCA70001,JCA70003] Intent {http://docs.oasis-open.org/ns/opencsa/sca/200912}noManagedTransaction and {http://docs.oasis-open.org/ns/opencsa/sca/200912}managedTransaction are mutually exclusive

-POJO_8013=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicatePropertyException: duplicateProperty

-POJO_8014=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: org.apache.tuscany.sca.implementation.java.introspect.impl.DuplicateReferenceException: duplicateReference

-POJO_9001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_9001, Artifact: Test_POJO_9001.composite] - XMLSchema validation error occured in: Test_POJO_9001.composite ,line = ***, column = ***, Message = cvc-complex-type.3.2.2: Attribute 'interface' is not allowed to appear in element 'implementation.java'.

-POJO_10001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_10001, Artifact: META-INF/sca-contribution.xml] - [JCI10001] The value of the @package attribute on the <import.java/> element is not unique across all other <import.java/> elements within the contribution.

-POJO_10004=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: [JCI100007] A Java package org.oasisopen.sca.test;version=1.0.0 that is specified on an export element MUST be contained within the contribution containing the export element.

-POJO_10005=org.oasisopen.sca.ServiceRuntimeException: [Contribution: POJO_10005, Artifact: META-INF/sca-contribution.xml] - [JCI10004] The value of the @package attribute on the <export.java/> element is not unique across all other <export.java/> elements within the contribution.

-POJO_10006=org.apache.tuscany.sca.contribution.processor.ContributionResolveException: [JCI100007] A Java package org.oasisopen.sca.test.y that is specified on an export element MUST be contained within the contribution containing the export element.

-