Remove old beta1 branch

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

4 files changed, 0 insertions, 425 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/pom.xml b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/pom.xml
deleted file mode 100644
index 138594f049..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-compliance-tests</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-compliance-test-binding-jms</artifactId>
-    <name>Apache Tuscany SCA Specification Compliance Tests Binding JMS</name>
-
-    <dependencies>
-
-        <dependency>
-            <!-- This is only needed to get the module working in Eclipse which doesn't pick it up from the dependency plugin unpack -->
-            <!-- The dependency plugin unpack is needed as presently the surefire plugin wont run tests in a dependency jar -->
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>oasis-binding-jms-test-runner</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-jms</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>5.2.0</version>
-        </dependency>
-
-         <!-- This is need when running with Sun JDK which gets an unsupported operation exception creating an XMLStreamReader from a DOMSource
-             when Tuscany is writing a property value  -->
-         <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-  <build>
-    <finalName>${artifactId}</finalName>
-    <plugins>
-                        
-      <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-surefire-plugin</artifactId>
-         <configuration>
-           <excludes>
-              <!-- exclude>**/POJO_8011_TestCase.java</exclude -->
-           </excludes>
-         </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-               <artifactItems>
-                 <artifactItem>
-                   <groupId>org.apache.tuscany.sca</groupId>
-                   <artifactId>oasis-binding-jms-contributions</artifactId>
-                   <version>1.0-SNAPSHOT</version>
-                   <type>zip</type>
-                   <outputDirectory>${project.build.directory}/oasis-contributions</outputDirectory>
-                 </artifactItem>
-                 <artifactItem>
-                   <groupId>org.apache.tuscany.sca</groupId>
-                   <artifactId>oasis-binding-jms-test-runner</artifactId>
-                   <version>1.0-SNAPSHOT</version>
-                   <type>jar</type>
-                   <excludes>commons-logging.properties,oasis-sca-tests.properties,tuscany-oasis-sca-tests-errors.properties</excludes>
-                   <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
-                 </artifactItem>
-               </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
deleted file mode 100644
index d9490c641e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/java/org/apache/tuscany/sca/otest/TuscanyRuntimeBridge.java
+++ /dev/null
@@ -1,220 +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.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.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-import testClient.TestException_Exception;
-import client.RuntimeBridge;
-
-/**
- * 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;
-
-    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 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);
-
-            Contribution[] contributions = new Contribution[contributionNames.length];
-            String[] contributionURIs = getContributionURIs(contributionLocation, contributionNames);
-            for (int i = 0; i < contributions.length; i++) {
-                contributions[i] = new Contribution(contributionNames[i], contributionURIs[i]);
-            } // end for
-
-            node = launcher.createNode(compositeName, 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, String[] contributionNames) throws Exception {
-        String[] locations = new String[contributionNames.length];
-
-        if (locations != null && contributionLocation != null) {
-
-            for (int i = 0; i < locations.length; i++) {
-                String aLocation = contributionLocation.replaceAll("%1", contributionNames[i]);
-
-                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 void checkError(String testName, Throwable ex) throws Throwable { 
-              
-        String expectedMessage = expectedErrorMessages.getProperty(testName);
-        String receivedMessage = getErrorMessage(ex);//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 expected 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) {
-        } 
-    }
-
-    protected String getErrorMessage(Throwable ex) {
-        String errorMessage = null;
-        
-        if (ex instanceof TestException_Exception) {
-            TestException_Exception te = (TestException_Exception) ex;
-            errorMessage = te.getFaultInfo().getMessage();
-        } else {
-            errorMessage = ex.getMessage();
-        }
-        
-        return errorMessage;
-    }
-} // end class TuscanyRuntimeBridge
diff --git a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/resources/oasis-sca-tests.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/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-jms/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-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties b/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties
deleted file mode 100644
index 1788c1f2b8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/compliance-tests/binding-jms/src/test/resources/tuscany-oasis-sca-tests-errors.properties
+++ /dev/null
@@ -1,43 +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. 
-BJM_3001=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3001, Artifact: Test_BJM_3001.composite] - URI must start with the scheme jms: for uri: http://test.sca.oasisopen.org/
-BJM_3002=Test service got an exception during execution: org.apache.tuscany.sca.binding.jms.JMSBindingException JMS Destination jndi:BJM_3002_Queue not found with create mode of "ifnotexist" while registering binding Reference1 invoker
-BJM_3003=No error expected
-BJM_3004=No error expected
-BJM_3005=No error expected
-BJM_3010=**testcase incomplete**
-BJM_3011=org.apache.tuscany.sca.binding.jms.JMSBindingException: Error starting JMSServiceBinding
-BJM_3012=**testcase incomplete**
-BJM_3013=org.apache.tuscany.sca.binding.jms.JMSBindingException: Error starting JMSServiceBinding
-BJM_3014=**testcase incomplete**
-BJM_3015=**testcase incomplete**
-BJM_3017=org.oasisopen.sca.ServiceRuntimeException: [Contribution: BJM_3017, Artifact: Test_BJM_3017.composite] - XMLSchema validation error occured in: Test_BJM_3017.composite ,line = 36, column = 17, Message = cvc-complex-type.2.4.a: Invalid content was found starting with element 'activationSpec'. One of '{"http://docs.oasis-open.org/ns/opencsa/sca/200912":response, "http://docs.oasis-open.org/ns/opencsa/sca/200912":headers, "http://docs.oasis-open.org/ns/opencsa/sca/200912":messageSelection, "http://docs.oasis-open.org/ns/opencsa/sca/200912":resourceAdapter, "http://docs.oasis-open.org/ns/opencsa/sca/200912":operationProperties}' is expected.
-BJM_3018=**testcase incomplete**
-BJM_3019=**testcase incomplete**
-BJM_3020=**testcase incomplete**
-BJM_3021=**testcase incomplete**
-BJM_3022=**testcase incomplete**
-BJM_3023=**testcase incomplete**
-BJM_3024=**testcase incomplete**
-BJM_3025=**testcase incomplete**
-BJM_3026=**testcase incomplete**
-BJM_3029=**testcase incomplete**
-BJM_3034=**testcase incomplete**
-BJM_3037=**testcase incomplete**
-BJM_4011=*
-
-