Remove old beta1 branch

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

10 files changed, 0 insertions, 565 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorld.java
deleted file mode 100644
index e3fcdfd25f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorld.java
+++ /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.    
- */
-
-package hello;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * HelloWorld interface
- */
-@Remotable
-public interface HelloWorld {
-    String hello(String name);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
deleted file mode 100644
index c9a7560b12..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/hello/HelloWorldImpl.java
+++ /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.    
- */
-
-package hello;
-
-/**
- * HelloWorldImpl
- */
-public class HelloWorldImpl implements HelloWorld {
-    public String hello(String name) {
-        System.out.println("Hello: " + name);
-        return "Hello, " + name;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
deleted file mode 100644
index a10f2cccd4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/configuration/xml/NodeConfigurationProcessorTestCase.java
+++ /dev/null
@@ -1,86 +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.node.configuration.xml;
-
-import java.io.InputStream;
-import java.io.StringWriter;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.DefaultFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- *
- */
-public class NodeConfigurationProcessorTestCase {
-    private static FactoryExtensionPoint factories;
-    private static StAXArtifactProcessor processor;
-
-    private static ProcessorContext context;
-
-    @BeforeClass
-    public static void setUp() throws Exception {
-        ExtensionPointRegistry registry = new DefaultExtensionPointRegistry();
-        context = new ProcessorContext(registry);
-
-        factories = new DefaultFactoryExtensionPoint(registry);
-        StAXArtifactProcessorExtensionPoint processors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        processor = processors.getProcessor(NodeConfiguration.class);
-    }
-
-    @Test
-    public void testRead() throws Exception {
-        InputStream is = getClass().getResourceAsStream("/org/apache/tuscany/sca/node/configuration/node1.xml");
-        XMLInputFactory xmlInputFactory = factories.getFactory(XMLInputFactory.class);
-        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(is);
-        is.close();
-        reader.nextTag();
-        NodeConfiguration config = (NodeConfiguration) processor.read(reader, context);
-        StringWriter sw = new StringWriter();
-        XMLOutputFactory xmlOutputFactory = factories.getFactory(XMLOutputFactory.class);
-        xmlOutputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.TRUE);
-        XMLStreamWriter writer = xmlOutputFactory.createXMLStreamWriter(sw);
-        processor.write(config, writer, context);
-        writer.flush();
-        System.out.println(sw.toString());
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
deleted file mode 100644
index 3133931210..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeImplTestCase.java
+++ /dev/null
@@ -1,218 +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.node.impl;
-
-import hello.HelloWorld;
-
-import java.io.File;
-import java.io.StringReader;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint;
-import org.apache.tuscany.sca.runtime.RuntimeProperties;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Test case for NodeImpl
- */
-public class NodeImplTestCase {
-    private static String composite =
-        "<composite xmlns=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\"" + " xmlns:tuscany=\"http://tuscany.apache.org/xmlns/sca/1.1\""
-            + " targetNamespace=\"http://sample/composite\""
-            + " xmlns:sc=\"http://sample/composite\""
-            + " name=\"HelloWorld2\">"
-            + " <component name=\"HelloWorld2\">"
-            + " <implementation.java class=\"hello.HelloWorldImpl\"/>"
-            + " </component>"
-            + " </composite>";
-
-    @Test
-    public void testNodeWithCompositeContent() {
-        NodeFactory factory = new NodeFactoryImpl();
-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());
-        Node node = factory.createNode(new StringReader(composite), contribution);
-        testNode2(node);
-    }
-
-    @Test
-    public void testNodeWithRelativeCompositeURI() {
-        NodeFactory factory = new NodeFactoryImpl();
-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());
-        String compositeURI = "HelloWorld.composite";
-        Node node = factory.createNode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Test
-    public void testNodeWithAbsoluteCompositeURI() throws MalformedURLException {
-        NodeFactory factory = new NodeFactoryImpl();
-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURL().toString());
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURL().toString();
-        Node node = factory.createNode(compositeURI, contribution);
-        testNode(node);
-    }
-
-    @Test
-    public void testDefaultNode() {
-        testNode(new NodeFactoryImpl().createNode());
-    }
-
-    @Test
-    public void testNodeWithURI() {
-        testNode(new NodeFactoryImpl().createNode(URI.create("foo"),"target/test-classes"));
-    }
-    @Test
-    public void testNodeWithURIandComposite() throws MalformedURLException {
-        String compositeURI = new File("target/test-classes/HelloWorld.composite").toURI().toString();
-        testNode(new NodeFactoryImpl().createNode(URI.create("foo"), compositeURI, new String[]{"target/test-classes"}));
-    }
-
-    @Test
-    public void testGetServiceEndpoints() {
-        NodeFactory factory = new NodeFactoryImpl();
-        Contribution contribution = new Contribution("c1", new File("target/test-classes").toURI().toString());
-        NodeImpl node = (NodeImpl)factory.createNode(new StringReader(composite), contribution);
-        node.start();
-        List<Endpoint> es = node.getServiceEndpoints();   
-        Assert.assertEquals(1, es.size());
-        Assert.assertEquals("HelloWorld2", es.get(0).getComponent().getName());
-        node.stop();
-    }
-
-    private void testNode(Node node) {
-        node.start();
-        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-
-    private void testNode2(Node node) {
-        node.start();
-        HelloWorld hw = node.getService(HelloWorld.class, "HelloWorld2");
-        Assert.assertEquals("Hello, Node", hw.hello("Node"));
-        node.stop();
-    }
-    
-    @Test
-    public void testNodeFactoryAttributes() {
-        Map<String, Map<String, String>> attrs = new HashMap<String, Map<String, String>>();
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("enabled", "false");
-        attrs.put(ValidationSchemaExtensionPoint.class.getName(), map);
-
-        Map<String, String> map2 = new HashMap<String, String>();
-        map2.put("urn:MyDomain", "multicast://200.0.0.100:50000/MyDomain");
-        attrs.put(DomainRegistryFactoryExtensionPoint.class.getName(), map2);
-
-        NodeFactoryImpl factory = (NodeFactoryImpl)NodeFactory.newInstance(attrs);
-        Assert.assertFalse(factory.getExtensionPointRegistry().getExtensionPoint(ValidationSchemaExtensionPoint.class)
-            .isEnabled());
-
-        DomainRegistryFactoryExtensionPoint domainRegistryFactoryExtensionPoint =
-            factory.getExtensionPointRegistry().getExtensionPoint(DomainRegistryFactoryExtensionPoint.class);
-        Map<String, String> mapping = domainRegistryFactoryExtensionPoint.getDomainRegistryMapping();
-        Assert.assertEquals(1, mapping.size());
-        Assert.assertEquals("multicast://200.0.0.100:50000/MyDomain", mapping.get("urn:MyDomain"));
-    }
-    
-    @Test
-    public void testNodeFactoryProperties() throws Exception {
-        NodeFactoryImpl factory = (NodeFactoryImpl)NodeFactory.newInstance();
-        factory.init();
-        UtilityExtensionPoint utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        Properties ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(2, ps.size());
-        Assert.assertEquals("vm", ps.getProperty("defaultScheme"));
-
-        Properties properties = new Properties();
-        properties.setProperty("defaultScheme", "vm");
-        properties.setProperty("foo.bla", "some value");
-        factory = (NodeFactoryImpl)NodeFactory.newInstance(properties);
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(2, ps.size());
-        Assert.assertEquals("some value", ps.getProperty("foo.bla"));
-        
-        factory = (NodeFactoryImpl)NodeFactory.newInstance("properties:test.properties");
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(2, ps.size());
-        Assert.assertEquals("xyz", ps.getProperty("foo.bla"));
-        
-        factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:foo?k1=v1&k2=v2&defaultScheme=vm");
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(4, ps.size());
-        Assert.assertEquals("vm", ps.getProperty("defaultScheme"));
-        Assert.assertEquals("foo", ps.getProperty("defaultDomainName"));
-        Assert.assertEquals("v1", ps.getProperty("k1"));
-        Assert.assertEquals("v2", ps.getProperty("k2"));
-        
-        factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:");
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(1, ps.size());
-        Assert.assertEquals("", ps.getProperty("defaultDomainName"));
-
-        factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:?");
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(1, ps.size());
-        Assert.assertEquals("default", ps.getProperty("defaultDomainName"));
-        
-        factory = (NodeFactoryImpl)NodeFactory.newInstance("uri:?foo");
-        factory.init();
-        utilities = factory.getExtensionPointRegistry().getExtensionPoint(UtilityExtensionPoint.class);
-        ps = utilities.getUtility(RuntimeProperties.class).getProperties();
-        Assert.assertEquals(2, ps.size());
-        Assert.assertEquals("default", ps.getProperty("defaultDomainName"));
-        Assert.assertEquals("", ps.getProperty("foo"));
-    }
-
-    @Test
-    public void testLoadNodeFactoryProperties() throws Exception {
-        URL url = getClass().getResource("/org/apache/tuscany/sca/node/configuration/test-node-factory.config");
-        Collection<Map<String, String>> items = ServiceDeclarationParser.load(url, false);
-        for (Map<String, String> attrs : items) {
-            System.out.println(attrs);
-        }
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
deleted file mode 100644
index 4b9dda4a71..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeUtilTestCase.java
+++ /dev/null
@@ -1,48 +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.node.impl;
-
-import java.net.URI;
-
-import org.apache.tuscany.sca.common.java.io.IOHelper;
-import org.junit.Assert;
-import org.junit.Test;
-
-
-/**
- *
- */
-public class NodeUtilTestCase {
-    @Test
-    public void testCreateURI() {
-        Assert.assertEquals("/a/b", IOHelper.createURI("/a/b").toString());
-        Assert.assertEquals("/a%20b", IOHelper.createURI("/a b").toString());
-        Assert.assertEquals("file:/a/b", IOHelper.createURI("file:/a/b").toString());
-        Assert.assertEquals("file:/a%20b", IOHelper.createURI("file:/a b").toString());
-        Assert.assertEquals("file:/a%20b", IOHelper.createURI("file:/a%20b").toString());
-    }
-
-    @Test
-    public void testDomainURI() {
-        Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("tuscany:foo")));
-        Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("vm:foo")));
-        Assert.assertEquals("foo", NodeFactoryImpl.getDomainURI(URI.create("bla://foo")));
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/HelloWorld.composite
deleted file mode 100644
index ca3c3eda7c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/HelloWorld.composite
+++ /dev/null
@@ -1,30 +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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-	targetNamespace="http://sample/composite"
-	xmlns:sc="http://sample/composite"
-	name="HelloWorld">
-
-    <component name="HelloWorld">
-        <implementation.java class="hello.HelloWorldImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 20627c3d2c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +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.    
--->
-
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
-              xmlns:sc="http://sample/composite">
-    <deployable composite="sc:HelloWorld" />
-</contribution>
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
deleted file mode 100644
index 4afc52d73b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/node1.xml
+++ /dev/null
@@ -1,58 +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.
--->
-<node xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns="http://tuscany.apache.org/xmlns/sca/1.1"
-    xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-    uri="http://sample/nodes/TestNode1"
-    domainRegistry = "vm://localhost"
-    domain="http://domain1">
-
-    <!-- Configure the base URIs for a given binding -->
-    <!-- Each base URI is for a protocol supported by the binding -->
-    <binding name="sca:binding.ws" baseURIs="http://localhost:8080/ws https://localhost:8081/ws"/>
-    <binding name="tuscany:binding.rmi" baseURIs="rmi://localhost:8080/rmi"/>
-    <binding name="tuscany:binding.jsonrpc">
-        <baseURI>http://localhost:8080/jsonrpc</baseURI>
-    </binding>
-
-    <!-- Configure a list of contributions -->
-    <contribution uri="http://c1" location="file:///a.jar"/>
-    <contribution uri="http://c2" location="http://locahost/repo/b.jar">
-        <!-- The deployment composite is optional -->
-        <!-- The deployment composite can be defined inline or referenced using a URI -->
-        <!-- Can we have more than one deployment composites -->
-        <deploymentComposite>
-            <sca:composite>
-                <sca:component name="Component1"> <!-- first component -->
-                    <sca:implementation.java class="a.b.Component1Impl"/>
-                    <sca:reference name="ref1">
-                        <tuscany:binding.rmi/>
-                    </sca:reference>
-                </sca:component>
-            </sca:composite>
-        </deploymentComposite>
-    </contribution>
-    <contribution uri="http://c3" location="http://locahost/repo/c.jar">
-        <deploymentComposite location="test/Test.composite">
-        </deploymentComposite>
-    </contribution>
-    <option name="debug" value="true"/>
-    <option name="validation">true</option>
-</node>
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config
deleted file mode 100644
index ec87f6a3e0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/org/apache/tuscany/sca/node/configuration/test-node-factory.config
+++ /dev/null
@@ -1,19 +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.

-# Configuration properties for NodeFactory

-org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint;enabled=true,attr="value"

-org.apache.tuscany.sca.runtime.DomainRegistryFactoryExtensionPoint;urn:MyDomain="multicast://200.0.0.100:50000/MyDomain"
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/test.properties b/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/test.properties
deleted file mode 100644
index df9d47b4eb..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/node-impl/src/test/resources/test.properties
+++ /dev/null
@@ -1,22 +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.    

-#

-defaultScheme = vm

-foo.bla = xyz

-

-