Update bridge to match OASIS

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

1 files changed, 0 insertions, 163 deletions

diff --git a/otest/newlayout/tuscany-policy-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java b/otest/newlayout/tuscany-policy-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
deleted file mode 100644
index 8b909b0483..0000000000
--- a/otest/newlayout/tuscany-policy-test-runner/src/test/tjava/org/apache/tuscany/sca/otest/TuscanyOSGiRuntimeBridge.java
+++ /dev/null
@@ -1,163 +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.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.equinox.launcher.Contribution;
-import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher;
-
-import client.RuntimeBridge;
-import client.TestConfiguration;
-
-
-/**
- * An implementation of the Runtime Bridge for the Apache Tuscany SCA runtime (version 2.x)
- *
- */
-public class TuscanyOSGiRuntimeBridge implements RuntimeBridge {
-
-    static final String CONTRIBUTION_LOCATION_PROPKEY = "OASIS_TESTENV_CONTRIBUTION_LOCATION";
-
-    protected NodeLauncher launcher;
-    protected Node node;
-    TestConfiguration testConfiguration = null;
-    protected Properties expectedErrorMessages;
-
-    public TuscanyOSGiRuntimeBridge() {
-        // 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 contributionLocation, String[] contributionNames) throws Exception {
-        try {
-            // Tuscany specific code which starts the contribution(s) holding the test
-            launcher = NodeLauncher.newInstance();
-
-            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);
-            System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader());
-            // Start the node
-            node.start();
-        } 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]);
-
-                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){
-            fail("Null expected error message for test " + testName + 
-                 "Please add message to oasis-sca-tests-errors.properties");
-        }
-        
-        if (receivedMessage == null){
-            fail("Null received error message for test " + testName);
-        }
-        
-        int messageStart = receivedMessage.indexOf("] - ");
-        
-        if (messageStart < 0){
-            fail("Message separator not found for test " + testName);
-        }
-        
-        receivedMessage = receivedMessage.substring(messageStart + 4);
-        
-        assertEquals( expectedMessage, receivedMessage );
-        
-        return;
-    }   
-
-} // end class TuscanyRuntimeBridge