Delete old beta3 branch as its going to be recreated from the current trunk

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

13 files changed, 0 insertions, 564 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/pom.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/pom.xml
deleted file mode 100644
index ed1bcc62b0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/pom.xml
+++ /dev/null
@@ -1,63 +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-itest</artifactId>
-        <version>2.0-Beta3-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>itest-scabindingmapper</artifactId>
-    <name>Apache Tuscany Integration Tests SCA Binding Mapper</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-base-runtime-pom</artifactId>
-            <version>2.0-Beta3-SNAPSHOT</version>
-            <type>pom</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta3-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-            <version>2.0-Beta3-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>jetty</artifactId>
-            <version>6.1.19</version>
-        </dependency>
-
-    </dependencies>
-    <build>
-        <plugins>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
deleted file mode 100644
index 77c7cc0cbe..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java
+++ /dev/null
@@ -1,80 +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 itest.scabindingmapper;
-
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.jsonp.JSONPBinding;
-import org.apache.tuscany.sca.binding.sca.provider.DefaultSCABindingMapper;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-/**
- * A test SCABindingMapper to demonstrate changing the protocol on a per service basis. 
- * This uses JSONP if the service name ends with a "2" character.
- * Uses a high ranking in the The meta-inf/services file to override the default mapper.
- */
-public class MyMapper extends DefaultSCABindingMapper {
-
-    public MyMapper(ExtensionPointRegistry registry, Map<String, String> attributes) {
-        super(registry, attributes);
-    }
-
-    @Override
-    protected QName chooseBinding(RuntimeEndpoint endpoint) {
-        QName bindingType = super.chooseBinding(endpoint);
-        
-        if (!bindingType.equals(super.defaultLocalBinding)) {
-            if (endpoint.getComponent().getName().endsWith("2")) {
-                bindingType = JSONPBinding.TYPE;
-            } else {
-                bindingType = super.defaultMappedBinding;
-            }
-        }
-        return bindingType;
-    }
-
-    @Override
-    protected QName chooseBinding(RuntimeEndpointReference endpointReference) {
-        QName bindingType = super.chooseBinding(endpointReference);
-        
-        if (!bindingType.equals(super.defaultLocalBinding)) {
-            if (endpointReference.getBinding().getURI().contains("Service2")) {
-                bindingType = JSONPBinding.TYPE;
-            } else {
-                bindingType = super.defaultMappedBinding;
-            }
-        }
-        return bindingType;
-    }
-
-    /*
-     * Probably others don't need to override this is they have a remotable endpoint registry, this itest
-     * doesn't so just fiddle the test  
-     */
-    @Override
-    protected boolean isDistributed() {
-        return true;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java
deleted file mode 100644
index 1b75cf5bf5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java
+++ /dev/null
@@ -1,47 +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 itest.scabindingmapper;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.assembly.impl.SCABindingFactoryImpl;
-import org.apache.tuscany.sca.runtime.UnknownEndpointHandler;
-
-public class MyUnknownEndpointHandler implements UnknownEndpointHandler {
-
-    @Override
-    public Binding handleUnknownEndpoint(EndpointReference endpointReference) {
-        
-        if (endpointReference.getTargetEndpoint().getURI().endsWith("Service1")) {
-            SCABinding b = new SCABindingFactoryImpl().createSCABinding();
-            b.setURI("http://localhost:8085/Service1/Helloworld");
-            return b;
-            
-        } else if (endpointReference.getTargetEndpoint().getURI().endsWith("Service2")) {
-            SCABinding b = new SCABindingFactoryImpl().createSCABinding();
-            b.setURI("http://localhost:8085/Service2/Helloworld");
-            return b;
-        }
-
-        return null;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper
deleted file mode 100644
index ef32d42058..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper
+++ /dev/null
@@ -1,18 +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. 

-itest.scabindingmapper.MyMapper,ranking=4321

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler
deleted file mode 100644
index 11828b7b2b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler
+++ /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. 

-itest.scabindingmapper.MyUnknownEndpointHandler

-

-

diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java
deleted file mode 100644
index 244d077f0b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java
+++ /dev/null
@@ -1,28 +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 itest.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
-    String sayHello(String name);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java
deleted file mode 100644
index 8d69e1d31b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java
+++ /dev/null
@@ -1,34 +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 itest.helloworld;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloworldClientImpl implements Helloworld{
-
-    @Reference
-    public Helloworld ref;
-
-    @Override
-    public String sayHello(String name) {
-        return ref.sayHello(name);
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java
deleted file mode 100644
index 12e194f6dc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,29 +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 itest.helloworld;
-
-public class HelloworldServiceImpl implements Helloworld {
-
-    @Override
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java
deleted file mode 100644
index b6b6d406f8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java
+++ /dev/null
@@ -1,82 +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 itest.helloworld;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class Mapper1TestCase {
-
-    static {
-        org.apache.tuscany.sca.http.jetty.JettyServer.portDefault = 8085;
-    }
-    
-    Node node;
-    
-    @Test
-    public void testSCABindingFactory() throws IOException {
-        node = NodeFactory.newInstance().createNode("test.composite", new String[]{"target/test-classes"}) ;
-        node.start();
-        
-        // test the service invocations work
-        Helloworld helloworld = node.getService(Helloworld.class, "Client1");
-        Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra"));
-
-        helloworld = node.getService(Helloworld.class, "Client2");
-        Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra"));
-        
-        // verify service1 is exposed as a WS endpoint and service2 is a jsonp endpoint
-        URL wsService = new URL("http://localhost:8085/Service1/Helloworld?wsdl");
-        Assert.assertTrue(getContent(wsService).contains("definitions name=\"HelloworldService\""));
-
-        URL jsonpService = new URL("http://localhost:8085/Client2/Helloworld/sayHello?name=Petra");
-        Assert.assertEquals("\"Hello Petra\"", getContent(jsonpService));
-    }
-
-    private String getContent(URL url) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(url.openStream()));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-    
-    @After
-    public void shutdown() {
-        node.stop();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java
deleted file mode 100644
index f35a71b30e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java
+++ /dev/null
@@ -1,58 +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 itest.helloworld;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-
-public class UnknownEndpointTestCase {
-
-    static {
-        org.apache.tuscany.sca.http.jetty.JettyServer.portDefault = 8085;
-    }
-
-    Node servicesnode;
-    Node node;
-    
-    @Test
-    public void testUnknownEndpoints() throws IOException, InterruptedException {
-        servicesnode = NodeFactory.getInstance().createNode("services.composite", new String[]{"target/test-classes"}) ;
-        servicesnode.start();
-        node = NodeFactory.getInstance().createNode("clients.composite", new String[]{"target/test-classes"}) ;
-        node.start();
-        
-        // test the service invocations work
-        Helloworld helloworld = node.getService(Helloworld.class, "Client1");
-        Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra"));
-
-        helloworld = node.getService(Helloworld.class, "Client2");
-        Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra"));
-    }
-
-    @After
-    public void shutdown() throws InterruptedException {
-        node.stop();
-        servicesnode.stop();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/clients.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/clients.composite
deleted file mode 100644
index 5597ec112c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/clients.composite
+++ /dev/null
@@ -1,34 +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"
-           targetNamespace="http://Scopes"
-           name="clients">
-
- 	<component name="Client1">
-		<implementation.java class="itest.helloworld.HelloworldClientImpl"/>
-		<reference name="ref" target="Service1" />
-    </component>
-
- 	<component name="Client2">
-		<implementation.java class="itest.helloworld.HelloworldClientImpl"/>
-		<reference name="ref" target="Service2" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/services.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/services.composite
deleted file mode 100644
index bb1161c1ac..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/services.composite
+++ /dev/null
@@ -1,31 +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"
-           targetNamespace="http://Scopes"
-           name="services">
-
-	<component name="Service1">
-		<implementation.java class="itest.helloworld.HelloworldServiceImpl"/>
-    </component>
-    
-	<component name="Service2">
-		<implementation.java class="itest.helloworld.HelloworldServiceImpl"/>
-    </component>
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/test.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/test.composite
deleted file mode 100644
index d29c636f77..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/scabindingmapper/src/test/resources/test.composite
+++ /dev/null
@@ -1,41 +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"
-           targetNamespace="http://Scopes"
-           name="mappertest">
-
- 	<component name="Client1">
-		<implementation.java class="itest.helloworld.HelloworldClientImpl"/>
-		<reference name="ref" target="Service1" />
-    </component>
-
-	<component name="Service1">
-		<implementation.java class="itest.helloworld.HelloworldServiceImpl"/>
-    </component>
-    
- 	<component name="Client2">
-		<implementation.java class="itest.helloworld.HelloworldClientImpl"/>
-		<reference name="ref" target="Service2" />
-    </component>
-
-	<component name="Service2">
-		<implementation.java class="itest.helloworld.HelloworldServiceImpl"/>
-    </component>
-</composite>