97 files changed, 0 insertions, 4487 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/pom.xml
deleted file mode 100644
index 74f3a768df..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/pom.xml
+++ /dev/null
@@ -1,94 +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-Beta1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>itest-nodes-binding-sca-hazelcast</artifactId>
-    <name>Apache Tuscany SCA iTest Nodes binding.sca Using Hazelcast Registry</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-client-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint-hazelcast</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-    <build>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.5</version>
-                    <configuration>
-                        <includes>
-                            <include>**/*TestCase.java</include>
-                        </includes>
-                        <reportFormat>brief</reportFormat>
-                        <useFile>true</useFile>
-                        <forkMode>once</forkMode>
-                        <argLine>-ea -Xmx256m</argLine>
-                        <parallel>off</parallel>
-                    </configuration>
-                </plugin>
-            </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.java
deleted file mode 100644
index ef2565b750..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Client.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 org.apache.tuscany.sca.itest.bindingsca;
-
-/**
- * 
- */
-public interface Client {
-    String getName(String id);
-
-    String create(String name);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
deleted file mode 100644
index 96a0f2dadd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/ClientImpl.java
+++ /dev/null
@@ -1,53 +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.itest.bindingsca;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(Client.class)
-public class ClientImpl implements Client {
-    @Reference
-    protected Local local;
-
-    @Reference
-    protected Remote remote;
-
-    public String getName(String id) {
-        Customer customer = null;
-        try {
-            customer = remote.getCustomer(id);
-        } catch (CustomerNotFoundException e) {
-            return null;
-        }
-        customer.dump("Client.getName()");
-        return local.getName(customer);
-    }
-
-    public String create(String name) {
-        String id = remote.generateId();
-        Customer customer = remote.createCustomer(id, name);
-        customer.dump("Client.create()");
-        return remote.getId(customer);
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
deleted file mode 100644
index f2b7b1e41d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Customer.java
+++ /dev/null
@@ -1,70 +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.itest.bindingsca;
-
-/**
- * 
- */
-public class Customer {
-    private String id;
-    private String name;
-
-    public Customer() {
-    }
-
-    /**
-     * @param id
-     * @param name
-     */
-    public Customer(String id, String name) {
-        super();
-        this.id = id;
-        this.name = name;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "Customer [id=" + id + ", name=" + name + "]";
-    }
-
-    public void dump(String prefix) {
-        System.out.print(prefix);
-        System.out.print(": ");
-        System.out.print(toString());
-        System.out.println(" @" + System.identityHashCode(this));
-        System.out.println(getClass().getClassLoader());
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
deleted file mode 100644
index a6e80c9eca..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/CustomerNotFoundException.java
+++ /dev/null
@@ -1,64 +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.itest.bindingsca;
-
-/**
- * 
- */
-public class CustomerNotFoundException extends Exception {
-    private String customerId;
-
-    /**
-     * 
-     */
-    public CustomerNotFoundException() {
-    }
-
-    /**
-     * @param message
-     */
-    public CustomerNotFoundException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public CustomerNotFoundException(Throwable cause) {
-        super(cause);
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public CustomerNotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
deleted file mode 100644
index 0fe30c9d53..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Local.java
+++ /dev/null
@@ -1,27 +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.itest.bindingsca;
-
-/**
- * 
- */
-public interface Local {
-    String getName(Customer customer);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
deleted file mode 100644
index 8783808334..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/LocalServiceImpl.java
+++ /dev/null
@@ -1,38 +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.itest.bindingsca;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(Local.class)
-public class LocalServiceImpl implements Local {
-
-    public String getName(Customer customer) {
-        if (customer == null) {
-            return null;
-        }
-        customer.dump("Local.getName()");
-        return customer.getName();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
deleted file mode 100644
index 050d35007b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/Remote.java
+++ /dev/null
@@ -1,36 +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.itest.bindingsca;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * 
- */
-@Remotable
-public interface Remote {
-    String generateId();
-
-    String getId(Customer customer);
-
-    Customer getCustomer(String id) throws CustomerNotFoundException;
-
-    Customer createCustomer(String id, String name);
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
deleted file mode 100644
index 6c432a500a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/RemoteServiceImpl.java
+++ /dev/null
@@ -1,66 +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.itest.bindingsca;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.oasisopen.sca.annotation.AllowsPassByReference;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * 
- */
-@Service(Remote.class)
-@Scope("COMPOSITE")
-public class RemoteServiceImpl implements Remote {
-    private Map<String, Customer> customers = new HashMap<String, Customer>();
-
-    public String generateId() {
-        return UUID.randomUUID().toString();
-    }
-
-    @AllowsPassByReference
-    public String getId(Customer customer) {
-        customer.dump("Remote.getId()");
-        return customer.getId();
-    }
-
-    public Customer getCustomer(String id) throws CustomerNotFoundException {
-        Customer customer = customers.get(id);
-        if (customer == null) {
-            CustomerNotFoundException ex = new CustomerNotFoundException("Customer not found");
-            ex.setCustomerId(id);
-            throw ex;
-        }
-        customer.dump("Remote.getCustomer()");
-        return customer;
-    }
-
-    public Customer createCustomer(String id, String name) {
-        Customer customer = new Customer(id, name);
-        customer.dump("Remote.createCustomer()");
-        customers.put(id, customer);
-        return customer;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
deleted file mode 100644
index 3573eea978..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/java/org/apache/tuscany/sca/itest/bindingsca/SCAClientImpl.java
+++ /dev/null
@@ -1,57 +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.itest.bindingsca;
-
-import java.net.URI;
-
-import org.oasisopen.sca.client.SCAClientFactory;
-
-/**
- * 
- */
-public class SCAClientImpl implements Client {
-    private Local local;
-    private Remote remote;
-
-    public SCAClientImpl(String domainURI) throws Exception {
-        SCAClientFactory factory = SCAClientFactory.newInstance(URI.create(domainURI));
-        local = factory.getService(Local.class, "LocalComponent/Local");
-        remote = factory.getService(Remote.class, "RemoteComponent/Remote");
-    }
-
-    public String getName(String id) {
-        Customer customer = null;
-        try {
-            customer = remote.getCustomer(id);
-        } catch (CustomerNotFoundException e) {
-            return null;
-        }
-        customer.dump("Client.getName()");
-        return local.getName(customer);
-    }
-
-    public String create(String name) {
-        String id = remote.generateId();
-        Customer customer = remote.createCustomer(id, name);
-        customer.dump("Client.create()");
-        return remote.getId(customer);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.composite
deleted file mode 100644
index b04cc33023..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Client.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
-    * 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://client"
-    name="Client">
-
-    <component name="ClientComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.ClientImpl" />
-        <reference name="local" target="LocalComponent" />
-        <reference name="remote" target="RemoteComponent" />
-    </component>
-
-
-</composite>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.composite
deleted file mode 100644
index fe282d291c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/main/resources/org/apache/tuscany/sca/itest/bindingsca/Service.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
-    * 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://service"
-    name="Service">
-
-    <component name="LocalComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.LocalServiceImpl" />
-    </component>
-
-    <component name="RemoteComponent">
-        <implementation.java class="org.apache.tuscany.sca.itest.bindingsca.RemoteServiceImpl" />
-    </component>
-    
-</composite>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
deleted file mode 100644
index 9efa1a99ec..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
+++ /dev/null
@@ -1,79 +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.binding.sca.axis2;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-// @Ignore("TUSCANY-3138")
-public class AsynchTestCase {
-        
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("asynch", "./target/test-classes/ws/asynchReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("asynch", "./target/test-classes/ws/asynchService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-    }    
-    
-    @Test
-    public void testHelloWorldAsynch() throws Exception {        
-        HelloWorldClient helloWorldClientB;
-        helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
-        helloWorldClientB.getGreetings("fred");
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        System.out.println("... Done");
-        Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result );
-        
-    }      
-       
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
deleted file mode 100644
index efa84e92a5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
+++ /dev/null
@@ -1,83 +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.binding.sca.axis2;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-// @Ignore("TUSCANY-3138")
-public class CallbackTestCase {
-    
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/ws/callbackReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/ws/callbackService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-    } 
-    
-    //@Test
-    public void testKeepServerRunning() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    } 
-    
-    @Test
-    public void testHelloWorldCallbackLocal() throws Exception {  
-        HelloWorldClient helloWorldClientB;
-        helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");
-        Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));  
-    }     
-    
-    @Test
-    public void testHelloWorldCallbackRemote() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
-        Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));
-    }    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
deleted file mode 100644
index 45d28140b4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
+++ /dev/null
@@ -1,74 +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.binding.sca.axis2;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class PromotionTestCase {
-    
-    
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/ws/promotionReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/ws/promotionService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-    }     
-    
-    @Test
-    @Ignore
-    public void testHelloWorldPromotion() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
-    }      
-  
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
deleted file mode 100644
index a5d6529895..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
+++ /dev/null
@@ -1,110 +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.binding.sca.axis2;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-public class SimpleTestCase {
-    
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/ws/simpleReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/ws/simpleService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-    }    
-    
-    @Test
-    public void testHelloWorldLocal() throws Exception {  
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        
-    }
-        
-    @Test
-    public void testHelloWorldRemote() throws Exception { 
-        
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote");
-        
-        try {
-            helloWorldClientA.getGreetings("fred");
-        } catch (ServiceUnavailableException ex){
-            Assert.fail(); 
-        }
-    }     
-    
-    @Test
-    public void testHelloWorldLocalAndRemote() throws Exception {
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); 
-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); 
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
-    }   
-    
-    @Test
-    public void testHelloWorldMultipleServices() throws Exception {
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); 
-        HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2");
-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices");        
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
-    }   
-    
-    @Test
-    public void testHelloWorldMultipleBindings() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        
-    }   
-  
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java
deleted file mode 100644
index f7ab3dfe98..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-public interface HelloWorldCallbackRemote {
-    
-    String getGreetingsCallbackRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
deleted file mode 100644
index 3d25d37708..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,27 +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.binding.sca.axis2.helloworld;
-
-
-public interface HelloWorldClient {
-    
-    String getGreetings(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
deleted file mode 100644
index a469d197d6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackOnewayRemote {
-    
-    @OneWay
-    void getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
deleted file mode 100644
index 3f5a21fddd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java
+++ /dev/null
@@ -1,31 +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.binding.sca.axis2.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackRemote {
-    
-    String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
deleted file mode 100644
index 49e5232b31..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java
+++ /dev/null
@@ -1,27 +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.binding.sca.axis2.helloworld;
-
-
-public interface HelloWorldServiceLocal {
-    
-    String getGreetingsLocal(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java
deleted file mode 100644
index ccc77c142b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote {
-    
-    String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java
deleted file mode 100644
index c2be798d1a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote2 {
-    
-    String getGreetingsRemote2(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 9355aece1f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {
-    
-    public static String result;
-
-    @Reference
-    public HelloWorldServiceCallbackOnewayRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        helloWorldService.getGreetingsRemote(s);
-        return null;
-    }
-    
-    public String getGreetingsCallbackRemote(String s) {
-        result =  "callback " + s;
-        return result;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
deleted file mode 100644
index efc47aa94d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ /dev/null
@@ -1,42 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
-    
-    public static String result;
-
-    @Reference
-    public HelloWorldServiceCallbackRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote(s);
-    }
-    
-    public String getGreetingsCallbackRemote(String s) {
-        result =  "callback " + s;
-        return result;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
deleted file mode 100644
index 6ed813ff0a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientLocalImpl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceLocal helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsLocal(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
deleted file mode 100644
index ba70573efb..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemote2Impl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceRemote2 helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote2(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
deleted file mode 100644
index a87d6eb49a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemoteImpl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 3dc0b12b82..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {
-
-    @Callback
-    protected HelloWorldCallbackRemote theCallback;
-
-    public void getGreetingsRemote(String s) {
-        theCallback.getGreetingsCallbackRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
deleted file mode 100644
index b15d6dea80..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ /dev/null
@@ -1,39 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {
-    
-    @Callback
-    protected HelloWorldCallbackRemote theCallback;
-    
-    public HelloWorldServiceCallbackRemoteImpl() {
-        System.out.println("Constructor");
-    }
-
-    public String getGreetingsRemote(String s) {
-        return "Hello " + theCallback.getGreetingsCallbackRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java
deleted file mode 100644
index c4347b084a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
-
-public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal {
-
-    public String getGreetingsLocal(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
deleted file mode 100644
index 846bff02e1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ /dev/null
@@ -1,41 +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.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )
-public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2  {
-
-    public String getGreetingsLocal(String s) {
-        return "Hello " + s;
-    }
-    
-    public String getGreetingsRemote(String s) {
-        return "Hello " + s;
-    }    
-
-    public String getGreetingsRemote2(String s) {
-        return "Hello " + s;
-    } 
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java
deleted file mode 100644
index d69f442879..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.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 org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote;
-
-public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote {
-
-    public String getGreetingsRemote(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
deleted file mode 100644
index cbcc06056a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ /dev/null
@@ -1,79 +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.binding.sca.rmi;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class AsynchTestCase {
-        
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-        // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("asynch", "./target/test-classes/rmi/asynchService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-        // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-    }    
-    
-    @Test
-    public void testHelloWorldAsynch() throws Exception {        
-        HelloWorldClient helloWorldClientB;
-        helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
-        helloWorldClientB.getGreetings("fred");
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        System.out.println("... Done");
-        Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result );
-        
-    }      
-       
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
deleted file mode 100644
index dccd2dace8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ /dev/null
@@ -1,84 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallbackTestCase {
-    
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-        // System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", RMIBinding.TYPE.toString());
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/callbackReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/rmi/callbackService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-        // System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-    } 
-    
-    //@Test
-    public void testKeepServerRunning() throws Exception {
-        System.out.println("press enter to continue");
-        System.in.read();
-    } 
-    
-    @Test
-    public void testHelloWorldCallbackLocal() throws Exception {  
-        HelloWorldClient helloWorldClientB;
-        helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal");
-        Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred"));  
-    }     
-    
-    @Test
-    public void testHelloWorldCallbackRemote() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote");
-        Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred"));
-    }    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
deleted file mode 100644
index 7aac95a8ff..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ /dev/null
@@ -1,76 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class PromotionTestCase {
-    
-    
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding", 
-                           "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
-        try {
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/promotionReference");
-            nodeA = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/rmi/promotionService");
-            nodeB = NodeFactory.getInstance().createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }    
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-
-    }     
-    
-    @Test
-    public void testHelloWorldPromotion() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-
-    }      
-  
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
deleted file mode 100644
index f748beb6cb..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ /dev/null
@@ -1,116 +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.binding.sca.rmi;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceUnavailableException;
-
-public class SimpleTestCase {
-    
-    private static NodeFactory factory;
-    public static Node nodeA;
-    public static Node nodeB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        System.out.println("Setting up nodes");
-        System.setProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding",
-                           "{http://tuscany.apache.org/xmlns/sca/1.1}binding.rmi");
-
-        try {
-            factory = NodeFactory.getInstance();
-            // create and start nodes
-            Contribution contrib = new Contribution("reference", "./target/test-classes/rmi/simpleReference");
-            nodeA = factory.createNode("HelloWorld.composite", contrib);
-            nodeA.start();
-            
-            contrib = new Contribution("service", "./target/test-classes/rmi/simpleService");
-            nodeB = factory.createNode("HelloWorld.composite", contrib);
-            nodeB.start();
-
-        } catch (Exception ex) {
-            System.err.println("Exception when creating domain " + ex.getMessage());
-            ex.printStackTrace(System.err);
-            throw ex;
-        }     
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        nodeA.stop();
-        nodeB.stop();
-        factory.destroy();
-        System.clearProperty("org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper.mappedBinding");
-    }    
-    
-    @Test
-    public void testHelloWorldLocal() throws Exception {  
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        
-    }
-        
-    @Test
-    public void testHelloWorldRemote() throws Exception { 
-        
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote");
-        
-        try {
-            helloWorldClientA.getGreetings("fred");
-        } catch (ServiceUnavailableException ex){
-            Assert.fail(); 
-        }
-    }     
-    
-    @Test
-    public void testHelloWorldLocalAndRemote() throws Exception {
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); 
-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); 
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
-    }   
-    
-    @Test
-    public void testHelloWorldMultipleServices() throws Exception {
-        HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); 
-        HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2");
-        HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices");        
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred");
-        Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred");
-    }   
-    
-    @Test
-    public void testHelloWorldMultipleBindings() throws Exception {  
-        HelloWorldClient helloWorldClientA;
-        helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings");
-        Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred");
-        
-    }   
-  
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
deleted file mode 100644
index 7c4cf4b0b7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.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 org.apache.tuscany.sca.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-
-@Remotable
-public interface HelloWorldCallbackRemote {
-    
-    String getGreetingsCallbackRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
deleted file mode 100644
index 017acee582..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldClient {
-    
-    String getGreetings(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
deleted file mode 100644
index 86f984e61a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.OneWay;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackOnewayRemote {
-    
-    @OneWay
-    void getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
deleted file mode 100644
index 8e19fd7382..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ /dev/null
@@ -1,31 +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.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(HelloWorldCallbackRemote.class)
-public interface HelloWorldServiceCallbackRemote {
-    
-    String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
deleted file mode 100644
index b0d623e2e4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ /dev/null
@@ -1,27 +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.binding.sca.rmi.helloworld;
-
-
-public interface HelloWorldServiceLocal {
-    
-    String getGreetingsLocal(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
deleted file mode 100644
index ccb44694d9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.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 org.apache.tuscany.sca.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote {
-    
-    String getGreetingsRemote(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
deleted file mode 100644
index 5c8bb13f43..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.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 org.apache.tuscany.sca.binding.sca.rmi.helloworld;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface HelloWorldServiceRemote2 {
-    
-    String getGreetingsRemote2(String s);
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 1ff1792bb7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ /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.    
- */
-
-package org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient {
-    
-    public static String result;
-
-    @Reference
-    public HelloWorldServiceCallbackOnewayRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        helloWorldService.getGreetingsRemote(s);
-        return null;
-    }
-    
-    public String getGreetingsCallbackRemote(String s) {
-        result =  "callback " + s;
-        return result;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
deleted file mode 100644
index b17d8e2016..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ /dev/null
@@ -1,42 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient {
-    
-    public static String result;
-
-    @Reference
-    public HelloWorldServiceCallbackRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote(s);
-    }
-    
-    public String getGreetingsCallbackRemote(String s) {
-        result =  "callback " + s;
-        return result;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
deleted file mode 100644
index e230326f5f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientLocalImpl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceLocal helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsLocal(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
deleted file mode 100644
index 77df8c2c39..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemote2Impl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceRemote2 helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote2(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
deleted file mode 100644
index 8effa3ac36..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloWorldClientRemoteImpl implements HelloWorldClient {
-
-    @Reference
-    public HelloWorldServiceRemote helloWorldService;
-    
-    public String getGreetings(String s) {
-        return helloWorldService.getGreetingsRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
deleted file mode 100644
index 2467ddab88..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ /dev/null
@@ -1,35 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackOnewayRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote {
-
-    @Callback
-    protected HelloWorldCallbackRemote theCallback;
-
-    public void getGreetingsRemote(String s) {
-        theCallback.getGreetingsCallbackRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
deleted file mode 100644
index d1b75d0a2c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ /dev/null
@@ -1,39 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldCallbackRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceCallbackRemote;
-import org.oasisopen.sca.annotation.Callback;
-
-public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote {
-    
-    @Callback
-    protected HelloWorldCallbackRemote theCallback;
-    
-    public HelloWorldServiceCallbackRemoteImpl() {
-        System.out.println("Constructor");
-    }
-
-    public String getGreetingsRemote(String s) {
-        return "Hello " + theCallback.getGreetingsCallbackRemote(s);
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
deleted file mode 100644
index 44e7efc668..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.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 org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-
-public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal {
-
-    public String getGreetingsLocal(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
deleted file mode 100644
index 88440de023..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ /dev/null
@@ -1,41 +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.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceLocal;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote2;
-import org.oasisopen.sca.annotation.Service;
-
-@Service({HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} )
-public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2  {
-
-    public String getGreetingsLocal(String s) {
-        return "Hello " + s;
-    }
-    
-    public String getGreetingsRemote(String s) {
-        return "Hello " + s;
-    }    
-
-    public String getGreetingsRemote2(String s) {
-        return "Hello " + s;
-    } 
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
deleted file mode 100644
index 06dc2c3f79..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.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 org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl;
-
-import org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote;
-
-public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote {
-
-    public String getGreetingsRemote(String s) {
-        return "Hello " + s;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
deleted file mode 100644
index fcd0d39162..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/BindingSCATestCase.java
+++ /dev/null
@@ -1,170 +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.itest.bindingsca;
-
-import java.io.File;
-
-import org.apache.tuscany.sca.assembly.SCABinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.apache.tuscany.sca.node.configuration.NodeConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-/**
- * Test binding.sca in the same classloader
- */
-public class BindingSCATestCase {
-    static final String DOMAIN_URI = "my-domain";
-    private static final String REGISTRY_URI = "tuscany:bindingScaTestDomain";
-    private static final String PKG = "org/apache/tuscany/sca/itest/bindingsca/";
-    private static final String CLIENT = "Client.composite";
-    private static final String SERVICE = "Service.composite";
-    private static final String ROOT = new File("target/classes/" + PKG).toURI().toString();
-
-    /**
-     * One NodeFactory and two nodes
-     */
-    @Test
-    public void testOneFactoryTwoNodes() {
-        NodeFactory factory1 = NodeFactory.getInstance();
-        Node node1 = createClientNode(factory1);
-        Node node2 = createServiceNode(factory1);
-        node1.start();
-        node2.start();
-        try {
-            runClient(node1);
-        } finally {
-            node2.stop();
-            node1.stop();
-            factory1.destroy();
-        }
-    }
-
-    /**
-     * Create the service node
-     * @param factory
-     * @return
-     */
-    static Node createServiceNode(NodeFactory factory) {
-        NodeConfiguration config2 =
-            factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node2").addContribution("c2", ROOT)
-                .addDeploymentComposite("c2", SERVICE).setDomainRegistryURI(REGISTRY_URI)
-                .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE,
-                                                                                         "http://localhost:8085/");
-
-        Node node2 = factory.createNode(config2);
-        return node2;
-    }
-
-    /**
-     * Create the client node
-     * @param factory
-     * @return
-     */
-    static Node createClientNode(NodeFactory factory) {
-        NodeConfiguration config1 =
-            factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT)
-                .addDeploymentComposite("c1", CLIENT).setDomainRegistryURI(REGISTRY_URI)
-                .addBinding(WebServiceBinding.TYPE, "http://localhost:8085/").addBinding(SCABinding.TYPE,
-                                                                                         "http://localhost:8085/");
-        Node node1 = factory.createNode(config1);
-        return node1;
-    }
-
-    /**
-     * Two node factories and two nodes
-     */
-    @Test
-    public void testTwoFactoriesTwoNodes() throws Exception {
-        NodeFactory factory1 = NodeFactory.newInstance();
-        Node node1 = createClientNode(factory1);
-        NodeFactory factory2 = NodeFactory.newInstance();
-        Node node2 = createServiceNode(factory2);
-        node1.start();
-        node2.start();
-        Thread.sleep(1000);
-        try {
-            // This call doesn't require the Local service, it should be successful
-            createCustomer(node1);
-            try {
-                runClient(node1);
-                // We cannot make local call to remote endpoints
-                Assert.fail("ServiceRuntimeException should have been thrown.");
-            } catch (ServiceRuntimeException e) {
-                // ignore
-            }
-        } finally {
-            node2.stop();
-            node1.stop();
-            factory2.destroy();
-            factory1.destroy();
-        }
-    }
-
-    /**
-     * Run the client
-     * @param node
-     */
-    static void runClient(Node node) {
-        Client client = node.getService(Client.class, "ClientComponent/Client");
-        runClient(client);
-    }
-
-    static void runClient(Client client) {
-        String id = client.create("Ray");
-        Assert.assertEquals("Ray", client.getName(id));
-    }
-    
-    static void runClientNotFound(Client client) {
-        String id = "not-there";
-        Assert.assertNull(client.getName(id));
-    }
-
-    static String createCustomer(Node node) {
-        Client client = node.getService(Client.class, "ClientComponent/Client");
-        String id = client.create("John");
-        Assert.assertNotNull(id);
-        return id;
-    }
-
-    /**
-     * One node factory and one node for both composites
-     */
-    @Test
-    public void testOneFactoryOneNode() {
-        NodeFactory factory = NodeFactory.getInstance();
-        NodeConfiguration config1 =
-            factory.createNodeConfiguration().setDomainURI(DOMAIN_URI).setURI("node1").addContribution("c1", ROOT)
-                .addDeploymentComposite("c1", CLIENT).addDeploymentComposite("c1", SERVICE);
-
-        Node node1 = factory.createNode(config1);
-        node1.start();
-        try {
-            runClient(node1);
-        } finally {
-            node1.stop();
-            factory.destroy();
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
deleted file mode 100644
index 7255697d4b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedCustomerTestCase.java
+++ /dev/null
@@ -1,62 +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.itest.bindingsca;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Running the client node and service node with two different classloaders that share the Customer class
- */
-public class ClientNodeSharedCustomerTestCase {
-    private static Node clientNode;
-    private static TestCaseRunner runner;
-    private static NodeFactory factory;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName());
-        runner.beforeClass();
-        factory = NodeFactory.getInstance();
-        clientNode = BindingSCATestCase.createClientNode(factory).start();
-        Thread.sleep(1000);
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        BindingSCATestCase.runClient(clientNode);
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (runner != null) {
-            runner.afterClass();
-        }
-        if (factory != null) {
-            factory.destroy();
-        }
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
deleted file mode 100644
index 51fafae32c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientNodeSharedLocalTestCase.java
+++ /dev/null
@@ -1,62 +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.itest.bindingsca;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Running the client node and service node with two different classloaders that share the Local class 
- * (but not Customer)
- */
-public class ClientNodeSharedLocalTestCase {
-    private static Node clientNode;
-    private static TestCaseRunner runner;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        runner =
-            new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(),
-                               Customer.class.getName());
-        runner.beforeClass();
-        NodeFactory factory = NodeFactory.getInstance();
-        clientNode = BindingSCATestCase.createClientNode(factory).start();
-        Thread.sleep(1000);
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        BindingSCATestCase.runClient(clientNode);
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (clientNode != null) {
-            clientNode.stop();
-        }
-        if (runner != null) {
-            runner.afterClass();
-        }
-        NodeFactory.getInstance().destroy();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
deleted file mode 100644
index b8ff0c58ba..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedCustomerTestCase.java
+++ /dev/null
@@ -1,54 +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.itest.bindingsca;
-
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Running the client api and service node with two different classloaders that share the Customer class
- */
-public class ClientSharedCustomerTestCase {
-    private static Client client;
-    private static TestCaseRunner runner;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        runner = new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName());
-        runner.beforeClass();
-        client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI);
-        Thread.sleep(1000);
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        BindingSCATestCase.runClient(client);
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (runner != null) {
-            runner.afterClass();
-        }
-        NodeFactory.getInstance().destroy();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
deleted file mode 100644
index 633e1a767c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ClientSharedLocalTestCase.java
+++ /dev/null
@@ -1,63 +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.itest.bindingsca;
-
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Running the client api and service node with two different classloaders that share the Local class 
- * (but not Customer)
- */
-public class ClientSharedLocalTestCase {
-    private static Client client;
-    private static TestCaseRunner runner;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        runner =
-            new TestCaseRunner(ServiceNode.class, Remote.class.getName(), RemoteServiceImpl.class.getName(),
-                               Customer.class.getName(), CustomerNotFoundException.class.getName());
-        runner.beforeClass();
-        client = new SCAClientImpl(BindingSCATestCase.DOMAIN_URI);
-        Thread.sleep(1000);
-    }
-
-    @Test
-    public void testClient() throws Exception {
-        BindingSCATestCase.runClient(client);
-    }
-    
-    @Test
-    public void testClientNotFound() throws Exception {
-        BindingSCATestCase.runClientNotFound(client);
-    }
-
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (runner != null) {
-            runner.afterClass();
-        }
-        NodeFactory.getInstance().destroy();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.java
deleted file mode 100644
index 1cba2b57c2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/ServiceNode.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.itest.bindingsca;
-
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class ServiceNode {
-    private static Node serviceNode;
-
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        /*        System.setProperty("org.apache.tuscany.sca.contribution.processor.ValidationSchemaExtensionPoint.enabled",
-                                   "false");
-        */
-        NodeFactory factory = NodeFactory.getInstance();
-        serviceNode = BindingSCATestCase.createServiceNode(factory).start();
-    }
-
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (serviceNode != null) {
-            serviceNode.stop();
-        }
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
deleted file mode 100644
index c0960ffe95..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/java/org/apache/tuscany/sca/itest/bindingsca/TestCaseRunner.java
+++ /dev/null
@@ -1,329 +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.itest.bindingsca;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader.
- *
- * @version $Rev$ $Date$
- */
-public class TestCaseRunner {
-
-    private ClassLoader classLoader;
-    private Class<?> testSuiteClass;
-    private Object testSuite;
-    private Class<?> testResultClass;
-    private Class<?> testCaseClass;
-    private Object testCase;
-
-    private Class<?> beforeAnnotation;
-    private Class<?> beforeClassAnnotation;
-    private Class<?> afterAnnotation;
-    private Class<?> afterClassAnnotation;
-    private Class<?> junit4AdapterClass;
-    private Class<?> junit3TestCaseClass;
-
-    /**
-     * Constructs a new TestCase runner.
-     *
-     * @param testClass
-     */
-    public TestCaseRunner(Class<?> testClass, String... isolatedClasses) {
-        try {
-            ClassLoader tccl = setupClassLoader(testClass, isolatedClasses);
-
-            try {
-                // Thread.currentThread().setContextClassLoader(classLoader);
-                // Allow privileged access to set class loader. Requires RuntimePermission
-                // setContextClassLoader in security policy.
-                final ClassLoader finalClassLoader = classLoader;
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        Thread.currentThread().setContextClassLoader(finalClassLoader);
-                        return null;
-                    }
-                });
-
-                testCaseClass = Class.forName(testClass.getName(), true, classLoader);
-                testCase = testCaseClass.newInstance();
-                ClassLoader testClassLoader = testCaseClass.getClassLoader();
-
-                junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader);
-
-                testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader);
-                Constructor<?> testSuiteConstructor = testSuiteClass.getConstructor(Class.class);
-                testSuite = testSuiteConstructor.newInstance(testCaseClass);
-
-                testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader);
-
-                try {
-                    beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader);
-                    afterAnnotation = Class.forName("org.junit.After", true, testClassLoader);
-                    beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader);
-                    afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader);
-                    junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader);
-                } catch (Exception e) {
-                    // Unexpected
-                    throw new AssertionError(e);
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-            } finally {
-                // Thread.currentThread().setContextClassLoader(tccl);
-                // Allow privileged access to set class loader. Requires RuntimePermission
-                // setContextClassLoader in security policy.
-                final ClassLoader finaltccl = tccl;
-                AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                    public Object run() {
-                        Thread.currentThread().setContextClassLoader(finaltccl);
-                        return null;
-                    }
-                });
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private ClassLoader setupClassLoader(Class<?> testClass, String... isolatedClasses) {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        classLoader = testClass.getClassLoader();
-        if (classLoader instanceof URLClassLoader) {
-            URL[] urls = ((URLClassLoader)classLoader).getURLs();
-            classLoader = new ClassLoaderImpl(urls, classLoader, isolatedClasses);
-        } else if (classLoader == tccl || classLoader.getParent() == tccl) {
-            classLoader = new URLClassLoader(new URL[0], classLoader);
-        } else {
-            classLoader = tccl;
-        }
-        return tccl;
-    }
-
-    /**
-     * Run the test case
-     */
-    public void run() {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });
-
-            if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) {
-                Object testResult = testResultClass.newInstance();
-                Method runMethod = testSuiteClass.getMethod("run", testResultClass);
-                runMethod.invoke(testSuite, testResult);
-            } else {
-                Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass);
-                Object testResult = testResultClass.newInstance();
-                Method runMethod = junit4AdapterClass.getMethod("run", testResultClass);
-                runMethod.invoke(junit4Adapter, testResult);
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-    /**
-     * Invoke the setUp method
-     */
-    public void setUp() {
-        execute("setUp");
-    }
-
-    /**
-     * Invoke the before methods
-     */
-    public void before() {
-        execute(beforeAnnotation);
-    }
-
-    /**
-     * Invoke the beforeClass methods
-     */
-    public void beforeClass() {
-        execute(beforeClassAnnotation);
-    }
-
-    /**
-     * Invoke the tearDown method
-     */
-    public void tearDown() {
-        execute("tearDown");
-    }
-
-    /**
-     * Invoke the after methods
-     */
-    public void after() {
-        execute(afterAnnotation);
-    }
-
-    /**
-     * Invoke the afterClass methods
-     */
-    public void afterClass() {
-        execute(afterClassAnnotation);
-    }
-
-    /**
-     * Invoke the specified test method.
-     */
-    public void run(String methodName) {
-        execute(methodName);
-    }
-
-    /**
-     * Invoke the methods annotated with the specified annotation.
-     */
-    private void execute(Class<?> annotationClass) {
-        if (annotationClass == null) {
-            throw new RuntimeException(new NoSuchMethodException());
-        }
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });
-
-            for (Method method : testCaseClass.getDeclaredMethods()) {
-                for (Annotation annotation : method.getAnnotations()) {
-                    if (annotation.annotationType() == annotationClass) {
-                        method.invoke(testCase);
-                    }
-                }
-            }
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-    /**
-     * Invoke the specified method
-     */
-    private void execute(String methodName) {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Thread.currentThread().setContextClassLoader(classLoader);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finalClassLoader = classLoader;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finalClassLoader);
-                    return null;
-                }
-            });
-            Method setUpMethod = testCaseClass.getDeclaredMethod(methodName);
-            setUpMethod.setAccessible(true);
-            setUpMethod.invoke(testCase);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        } finally {
-            // Thread.currentThread().setContextClassLoader(tccl);
-            // Allow privileged access to set class loader. Requires RuntimePermission
-            // setContextClassLoader in security policy.
-            final ClassLoader finaltccl = tccl;
-            AccessController.doPrivileged(new PrivilegedAction<Object>() {
-                public Object run() {
-                    Thread.currentThread().setContextClassLoader(finaltccl);
-                    return null;
-                }
-            });
-        }
-    }
-
-    public static class ClassLoaderImpl extends URLClassLoader {
-        private Set<String> isolatedClasses = new HashSet<String>();
-
-        /**
-         * @param urls
-         * @param parent
-         */
-        public ClassLoaderImpl(URL[] urls, ClassLoader parent, String... sharedClasses) {
-            super(urls, parent);
-            this.isolatedClasses.addAll(Arrays.asList(sharedClasses));
-        }
-
-        @Override
-        protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
-            if (!isolatedClasses.contains(name)) {
-                return super.loadClass(name, resolve);
-            } else {
-                Class<?> cls = findLoadedClass(name);
-                if (cls == null) {
-                    cls = findClass(name);
-                }
-                if (resolve) {
-                    resolveClass(cls);
-                }
-                return cls;
-            }
-        }
-
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
deleted file mode 100644
index 8c825ca805..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
deleted file mode 100644
index 79b1a5d794..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/HelloWorld.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />
-        <service name="HelloWorldServiceCallbackOnewayRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/asynchService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
deleted file mode 100644
index e8924d2728..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
deleted file mode 100644
index 4edc8df5cd..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/HelloWorld.composite
+++ /dev/null
@@ -1,43 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />
-        <service name="HelloWorldServiceCallbackRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-    <!-- callback local wire -->   
-    <component name="BHelloWorldClientCallbackLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/callbackService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
deleted file mode 100644
index 823cab4f56..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorld.composite
+++ /dev/null
@@ -1,33 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-    
-    <!-- composite hierarchy -->
-    <component name="AHelloWorldClientRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
-    </component>
-    
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
deleted file mode 100644
index 088fd616f4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldClient"/>
-    </service>
-    
-    <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService"  multiplicity="1..1">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote"/>
-    </reference>
-    
-    <component name="AHelloWorldClientRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl"/>
-    </component>
-   
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
deleted file mode 100644
index 454e9c55cf..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorld.composite
+++ /dev/null
@@ -1,35 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- composite hierarchy -->
-    <component name="BHelloWorldServiceRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<service name="BHelloWorldServiceRemoteService">
-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
-		</service>
-    </component>   
-
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
deleted file mode 100644
index a313fb8f68..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="BHelloWorldServiceRemoteService" 
-               promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
-    
-    <component name="BHelloWorldServiceRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl"/>
-    </component>
-    
-    <component name="BHelloWorldServiceLocalAndRemoteNested">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
-    </component>
-    
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/promotionService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
deleted file mode 100644
index 4151749523..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/HelloWorld.composite
+++ /dev/null
@@ -1,67 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-	
-    <!-- local only wire -->
-    <component name="AHelloWorldClientLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl"/>
-        <reference name="helloWorldService" target="AHelloWorldServiceLocal" />
-    </component>
-    
-    <component name="AHelloWorldServiceLocal">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceLocalImpl" />
-    </component> 
-    
-    <!-- unresolved remote wire -->   
-    <component name="AHelloWorldClientRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceRemote" />
-    </component>
-    
-    <!-- local and remote wires -->    
-    <component name="AHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
-    </component>  
-    
-    <!-- multiple services -->
-    <component name="AHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-    </component>  
-    
-    <component name="AHelloWorldClientMultipleServices2">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemote2Impl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>       
-    </component> 
-    
-    <!-- multiple bindings -->   
-    <component name="AHelloWorldClientMultipleBindings">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />        
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
deleted file mode 100644
index 37af7625ff..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/HelloWorld.composite
+++ /dev/null
@@ -1,85 +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"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- local only wire -->
-     
-     
-    <!-- unresolved remote wire --> 
-    <component name="BHelloWorldServiceRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>
-        </service>
-    </component>
-    
-    <!-- local and remote wires -->
-    <component name="BHelloWorldServiceLocalAndRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />
-    </component>
-    
-    <!-- multiple services -->
-    <component name="BHelloWorldServiceMultipleServices">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />
-        <service name="HelloWorldServiceLocal">
-        </service>        
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-        </service>        
-        <service name="HelloWorldServiceRemote2">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldClientLocalImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
-    </component>
-    
-    <!-- multiple bindings --> 
-    <component name="BHelloWorldMultipleBindings">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.rmi.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.rmi.helloworld.HelloWorldServiceRemote" />
-            <!-- tuscany:binding.rmi name="rmiBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/ -->
-            <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
-        </service>
-    </component>
-     
-    
-    <!-- Dynamic interfaces -->
-    <!--component name="BHelloWorldServiceScript">
-        <implementation.script script="calculator/AddServiceImpl.js"/>
-    </component--> 
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
deleted file mode 100644
index ab75f7d225..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/rmi/simpleService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
deleted file mode 100644
index e797a0aa9c..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
deleted file mode 100644
index 079ee49380..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/HelloWorld.composite
+++ /dev/null
@@ -1,38 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackOnewayRemoteImpl" />
-        <service name="HelloWorldServiceCallbackOnewayRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/asynchService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
deleted file mode 100644
index 1d5630f3d0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/HelloWorld.composite
+++ /dev/null
@@ -1,36 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-   
-    <!-- callback remote wire -->   
-    <component name="AHelloWorldClientCallbackRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote">
-            <binding.sca/>
-            <callback>
-                <binding.sca uri="http://localhost:8084/AHelloWorldClientCallbackRemote"/>
-            </callback>
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
deleted file mode 100644
index ded3766d49..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/HelloWorld.composite
+++ /dev/null
@@ -1,43 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-            
-     
-    <!-- callback remote wire --> 
-    <component name="BHelloWorldServiceCallbackRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceCallbackRemoteImpl" />
-        <service name="HelloWorldServiceCallbackRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceCallbackRemote"/>
-            <callback>
-                <binding.sca/>
-            </callback>            
-        </service>
-    </component>
-    
-    <!-- callback local wire -->   
-    <component name="BHelloWorldClientCallbackLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceCallbackRemote" />
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/callbackService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
deleted file mode 100644
index 4513f21acf..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorld.composite
+++ /dev/null
@@ -1,33 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-    
-    <!-- composite hierarchy -->
-    <component name="AHelloWorldClientRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<reference name="AHelloWorldClientRemoteReference" target="BHelloWorldServiceRemotePromotion"/>
-    </component>
-    
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
deleted file mode 100644
index 22c20ff94a..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="AHelloWorldClientRemoteService" promote="AHelloWorldClientRemoteComponent">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient"/>
-    </service>
-    
-    <reference name="AHelloWorldClientRemoteReference" promote="AHelloWorldClientRemoteComponent/helloWorldService"  multiplicity="1..1">
-        <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote"/>
-    </reference>
-    
-    <component name="AHelloWorldClientRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl"/>
-    </component>
-   
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
deleted file mode 100644
index e6a7d776c9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorld.composite
+++ /dev/null
@@ -1,35 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- composite hierarchy -->
-    <component name="BHelloWorldServiceRemotePromotion">
-		<implementation.composite name="sample:HelloWorldComponent" />
-		<service name="BHelloWorldServiceRemoteService">
-		    <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemotePromotion"/>
-		</service>
-    </component>   
-
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
deleted file mode 100644
index 0393280625..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/HelloWorldComponent.composite
+++ /dev/null
@@ -1,37 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorldComponent">
-
-    <service name="BHelloWorldServiceRemoteService" 
-               promote="BHelloWorldServiceRemoteComponent/HelloWorldServiceRemote"/>
-    
-    <component name="BHelloWorldServiceRemoteComponent">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl"/>
-    </component>
-    
-    <component name="BHelloWorldServiceLocalAndRemoteNested">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-    </component>
-    
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/promotionService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
deleted file mode 100644
index f4d2789ff7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/HelloWorld.composite
+++ /dev/null
@@ -1,67 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-
-	
-    <!-- local only wire -->
-    <component name="AHelloWorldClientLocal">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl"/>
-        <reference name="helloWorldService" target="AHelloWorldServiceLocal" />
-    </component>
-    
-    <component name="AHelloWorldServiceLocal">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceLocalImpl" />
-    </component> 
-    
-    <!-- unresolved remote wire -->   
-    <component name="AHelloWorldClientRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceRemote" />
-    </component>
-    
-    <!-- local and remote wires -->    
-    <component name="AHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote"/>
-    </component>  
-    
-    <!-- multiple services -->
-    <component name="AHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-    </component>  
-    
-    <component name="AHelloWorldClientMultipleServices2">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemote2Impl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>       
-    </component> 
-    
-    <!-- multiple bindings -->   
-    <component name="AHelloWorldClientMultipleBindings">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldMultipleBindings/HelloWorldServiceRemote/scaBinding">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />        
-        </reference>
-    </component>
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleReference/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
deleted file mode 100644
index 7e6311a22d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/HelloWorld.composite
+++ /dev/null
@@ -1,84 +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://sample"
-           xmlns:sample="http://sample"
-           name="HelloWorld">
-           
-
-    <!-- local only wire -->
-     
-     
-    <!-- unresolved remote wire --> 
-    <component name="BHelloWorldServiceRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceRemote"/>
-        </service>
-    </component>
-    
-    <!-- local and remote wires -->
-    <component name="BHelloWorldServiceLocalAndRemote">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceLocalAndRemote"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientLocalAndRemote">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientRemoteImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceLocalAndRemote" />
-    </component>
-    
-    <!-- multiple services -->
-    <component name="BHelloWorldServiceMultipleServices">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceMultipleServicesImpl" />
-        <service name="HelloWorldServiceLocal">
-        </service>        
-        <service name="HelloWorldServiceRemote">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote"/>
-        </service>        
-        <service name="HelloWorldServiceRemote2">
-            <binding.sca uri="http://localhost:8085/BHelloWorldServiceMultipleServices/HelloWorldServiceRemote2"/>
-        </service>
-    </component>
-    
-    <component name="BHelloWorldClientMultipleServices">
-		<implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientLocalImpl" />
-        <reference name="helloWorldService" target="BHelloWorldServiceMultipleServices/HelloWorldServiceLocal" />
-    </component>
-    
-    <!-- multiple bindings --> 
-    <component name="BHelloWorldMultipleBindings">
-        <implementation.java class="org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldServiceRemoteImpl" />
-        <service name="HelloWorldServiceRemote">
-            <interface.java interface="org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote" />
-            <binding.ws name="wsBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-wsbinding"/>
-            <binding.sca name="scaBinding" uri="http://localhost:8085/BHelloWorldMultipleBindings/HelloWorldServiceRemote-scabinding"/>
-        </service>
-    </component>
-     
-    
-    <!-- Dynamic interfaces -->
-    <!--component name="BHelloWorldServiceScript">
-        <implementation.script script="calculator/AddServiceImpl.js"/>
-    </component--> 
-    
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
deleted file mode 100644
index e6ccae5c73..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/itest/nodes/binding-sca-hazelcast/src/test/resources/ws/simpleService/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +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:sample="http://sample">
-   <deployable composite="sample:HelloWorld"/>
-</contribution>
-\ No newline at end of file