Delete very old beta2 release branch

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

15 files changed, 0 insertions, 1315 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
deleted file mode 100644
index 42f6193940..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.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.binding.hazelcast;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-
-public class EndpointStash {
-
-    // TODO a better way of sharing these endpoints than a static
-    //   the issue is that the ServiceInvoker needs to get hold of the Endpoint
-    //   for a URI. The ServiceInvoker runs in the context of a Hazelcast spawned 
-    //   thread so can only get to Tuscany via a static. The Hazelcast endpoint
-    //   registry does actually have these endpoints so perhaps an alternative could be
-    //   to use NodeFactory.getNodeFactories to get at the Hazelcast endpoint registry.
-    private static Map<String, RuntimeEndpoint> endpoints = new ConcurrentHashMap<String, RuntimeEndpoint>();
-    
-    public static void addEndpoint(RuntimeEndpoint endpoint) {
-        endpoints.put(endpoint.getURI(), endpoint);
-    }
-    
-    public static RuntimeEndpoint getEndpoint(String uri) {
-        for (RuntimeEndpoint ep : endpoints.values()) {
-            if (ep.matches(uri)) {
-                return ep;
-            }
-        }
-        return null;
-    }
-
-    public static void removeEndpoint(String uri) {
-        endpoints.remove(uri);
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
deleted file mode 100644
index 1636ed16ca..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.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.hazelcast;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.impl.BindingImpl;
-
-public class HazelcastBinding extends BindingImpl {
-
-    public static final QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.hazelcast");
-
-    public HazelcastBinding() {
-        super(TYPE);
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
deleted file mode 100644
index f202e16a69..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.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.binding.hazelcast;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Contract;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.xml.DOMDataBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeEndpointReference;
-
-public class HazelcastBindingProviderFactory implements BindingProviderFactory<HazelcastBinding> {
-
-    private ExtensionPointRegistry extensionsRegistry;
-
-    public HazelcastBindingProviderFactory(ExtensionPointRegistry extensionsRegistry) {
-        this.extensionsRegistry = extensionsRegistry;
-    }
-
-    public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpointReference) {
-        InterfaceContract interfaceContract = createDOMInterfaceContract(endpointReference.getComponent(), endpointReference.getReference());       
-        return new HazelcastReferenceBindingProvider(extensionsRegistry, endpointReference.getBinding().getURI(), interfaceContract);
-    }
-
-    public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) {
-        InterfaceContract interfaceContract = createDOMInterfaceContract(endpoint.getComponent(), endpoint.getService());       
-        return new HazelcastServiceBindingProvider(endpoint, interfaceContract);
-    }
-
-    private InterfaceContract createDOMInterfaceContract(Component component, Contract contract) {
-        WebServiceBindingFactory wsFactory = extensionsRegistry.getExtensionPoint(WebServiceBindingFactory.class);
-        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-        BindingWSDLGenerator.generateWSDL(component, contract, wsBinding, extensionsRegistry, null);
-        InterfaceContract interfaceContract = wsBinding.getBindingInterfaceContract();
-        interfaceContract.getInterface().resetDataBinding(DOMDataBinding.NAME);
-        return interfaceContract;
-    }
-
-    public Class<HazelcastBinding> getModelType() {
-        return HazelcastBinding.class;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
deleted file mode 100644
index 29546f405e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.hazelcast;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-
-public class HazelcastReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private ExtensionPointRegistry extensionsRegistry;
-    private String serviceURI;
-    private InterfaceContract interfaceContract;
-
-    public HazelcastReferenceBindingProvider(ExtensionPointRegistry extensionsRegistry, String serviceURI, InterfaceContract interfaceContract) {
-        this.extensionsRegistry = extensionsRegistry;
-        this.serviceURI = serviceURI;
-        this.interfaceContract = interfaceContract;
-    }
-
-    public Invoker createInvoker(Operation operation) {
-        return new ReferenceInvoker(extensionsRegistry, serviceURI, operation);
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
deleted file mode 100644
index 6ac3542a8e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
+++ /dev/null
@@ -1,52 +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.hazelcast;
-
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-public class HazelcastServiceBindingProvider implements ServiceBindingProvider {
-
-    private RuntimeEndpoint endpoint;
-    private InterfaceContract interfaceContract;
-
-
-    public HazelcastServiceBindingProvider(RuntimeEndpoint endpoint, InterfaceContract interfaceContract) {
-        this.endpoint = endpoint;
-        this.interfaceContract = interfaceContract;
-    }
-
-    public void start() {
-        EndpointStash.addEndpoint(endpoint);
-    }
-
-    public void stop() {
-        EndpointStash.removeEndpoint(endpoint.getURI());
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return interfaceContract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
deleted file mode 100644
index 7caf3e4841..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
+++ /dev/null
@@ -1,127 +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.hazelcast;
-
-import java.io.IOException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.FutureTask;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.DomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.ExtensibleDomainRegistryFactory;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-import com.hazelcast.core.DistributedTask;
-import com.hazelcast.core.Member;
-
-public class ReferenceInvoker implements Invoker {
-
-    HazelcastEndpointRegistry hzRegistry;
-    DOMHelper domHelper;
-    String serviceURI;
-    private Operation operation;
-    MessageFactory messageFactory;
-
-    public ReferenceInvoker(ExtensionPointRegistry extensionsRegistry, String serviceURI, Operation operation) {
-        this.serviceURI = serviceURI;
-        this.operation = operation;
-        DomainRegistryFactory domainRegistryFactory = ExtensibleDomainRegistryFactory.getInstance(extensionsRegistry);
-        for (EndpointRegistry r : domainRegistryFactory.getEndpointRegistries()) {
-            if (r instanceof HazelcastEndpointRegistry) {
-                hzRegistry = (HazelcastEndpointRegistry)r;
-                break;
-            }
-        }
-        this.domHelper = DOMHelper.getInstance(extensionsRegistry);
-        FactoryExtensionPoint modelFactories = extensionsRegistry.getExtensionPoint(FactoryExtensionPoint.class);
-        this.messageFactory = modelFactories.getFactory(MessageFactory.class);
-    }
-
-    public Message invoke(Message msg) {
-        Member owningMember = hzRegistry.getOwningMember(serviceURI);
-        if (owningMember == null) {
-            throw new ServiceRuntimeException("service not found: " + serviceURI);
-        }
-        String requestXML = getRequestXML(msg);
-        Callable<String> callable = new ServiceInvoker(serviceURI, operation.getName(), requestXML);
-        FutureTask<String> task = new DistributedTask<String>(callable, owningMember);
-        ExecutorService executorService = getExecutorService();
-        executorService.execute(task);
-        try {
-            return getResponseNode(task.get());
-        } catch (Exception e) {
-            throw new ServiceRuntimeException(e);
-        }
-    }
-
-    /**
-     * Hazelcast ExecutorService can't nest invocations so use a separate ExecutorService
-     * for nested calls. See http://groups.google.com/group/hazelcast/browse_thread/thread/1cc0b943716476e9
-     */
-    private ExecutorService getExecutorService() {
-        String threadName = Thread.currentThread().getName();
-        if (!threadName.startsWith("hz.executor.") || threadName.indexOf("binding.sca.") == -1) {
-            return hzRegistry.getHazelcastInstance().getExecutorService("binding.sca.1");
-        } else {
-            String oldName = threadName.substring(threadName.lastIndexOf("binding.sca."), threadName.lastIndexOf(".thread-"));
-            int x = Integer.parseInt(oldName.substring(oldName.lastIndexOf('.') + 1));
-            return hzRegistry.getHazelcastInstance().getExecutorService(oldName.substring(0, 12) + (x + 1));
-        }
-    }
-
-    private String getRequestXML(Message msg) {
-        Object[] args = msg.getBody();
-        String msgXML = domHelper.saveAsString((Node)args[0]);
-        return msgXML;
-    }
-
-    private Message getResponseNode(String responseXML) throws IOException, SAXException {
-        Message msg = messageFactory.createMessage();
-        if (responseXML.startsWith("DECLAREDEXCEPTION:")) {
-            Document responseDOM = domHelper.load(responseXML.substring(18));
-            FaultException e = new FaultException("remote exception", responseDOM);
-            Node node = ((Node)responseDOM).getFirstChild();
-            e.setFaultName(new QName(node.getNamespaceURI(), node.getLocalName()));
-            msg.setFaultBody(e);
-        } else if (responseXML.startsWith("EXCEPTION:")) {
-            throw new ServiceRuntimeException("Remote exception:" + responseXML.substring(10));
-        } else {
-            Document responseDOM = domHelper.load(responseXML);
-            msg.setBody(responseDOM);
-        }
-        return msg;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
deleted file mode 100644
index 42cac191aa..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
+++ /dev/null
@@ -1,98 +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.hazelcast;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.util.concurrent.Callable;
-
-import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.util.FaultException;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.ServiceRuntimeException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
-
-public class ServiceInvoker implements Callable<String>, Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // all fields MUST be Serializable
-    private String serviceURI;
-    private String operationName;
-    private String requestXML;
-
-    public ServiceInvoker(String serviceURI, String operationName, String msgXML) {
-        this.serviceURI = serviceURI;
-        this.operationName = operationName;
-        this.requestXML = msgXML;
-    }
-
-    public String call() throws Exception {
-        RuntimeEndpoint endpoint = EndpointStash.getEndpoint(serviceURI);
-        if (endpoint == null) {
-            throw new NoSuchServiceException(serviceURI);
-        }
-        Operation operation = getRequestOperation(endpoint);
-        DOMHelper domHelper = DOMHelper.getInstance(endpoint.getCompositeContext().getExtensionPointRegistry());
-        Object[] args = getRequestArgs(domHelper);
-        String responseXML;
-        try {
-            Object response = endpoint.invoke(operation, args);
-            responseXML = getResponseXML(domHelper, response);
-        } catch (Exception e) {
-           if (e instanceof InvocationTargetException && ((InvocationTargetException)e).getTargetException() instanceof FaultException) {
-               responseXML = "DECLAREDEXCEPTION:" + getResponseXML(domHelper, ((FaultException)((InvocationTargetException)e).getTargetException()).getFaultInfo());
-           } else {
-               responseXML = "EXCEPTION: " + e.getClass() + ":" + e.getMessage();
-           }
-        }
-        return responseXML;
-    }
-
-    private Operation getRequestOperation(RuntimeEndpoint endpoint) {
-        InterfaceContract ic = endpoint.getBindingInterfaceContract();
-        Interface iface = ic.getInterface();
-        for (Operation op : iface.getOperations()) {
-            if (op.getName().equals(operationName)) {
-                return op;
-            }
-
-        }
-        // TODO: return err msg
-        throw new ServiceRuntimeException("operation not found " + operationName);
-    }
-
-    private Object[] getRequestArgs(DOMHelper domHelper) throws IOException, SAXException {
-        Document requestDOM = domHelper.load(requestXML);
-        return new Object[] {requestDOM};
-    }
-
-    private String getResponseXML(DOMHelper domHelper, Object response) {
-        String responseXML = domHelper.saveAsString((Node)response);
-        return responseXML;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
deleted file mode 100644
index 87c60e4b38..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java
+++ /dev/null
@@ -1,49 +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.endpoint.hazelcast;
-
-import java.util.Properties;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.RuntimeProperties;
-
-/**
- * The utility responsible for finding the endpoint regstry by the scheme and creating instances for the
- * given domain
- */
-public class HazelcastDomainRegistryFactory extends BaseDomainRegistryFactory {
-    private final static String[] schemes = new String[] {"multicast", "wka", "tuscany", "hazelcast", "uri"};
-
-    public HazelcastDomainRegistryFactory(ExtensionPointRegistry registry) {
-        super(registry);
-    }
-
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
-        Properties properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-        return new HazelcastEndpointRegistry(registry, properties, domainURI);
-    }
-
-    public String[] getSupportedSchemes() {
-        return schemes;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
deleted file mode 100644
index 6d696dfaaa..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java
+++ /dev/null
@@ -1,372 +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.endpoint.hazelcast;
-
-import java.io.FileNotFoundException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.assembly.AssemblyFactory;
-import org.apache.tuscany.sca.assembly.Endpoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.core.LifeCycleListener;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.runtime.BaseEndpointRegistry;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.apache.tuscany.sca.runtime.RuntimeProperties;
-import org.oasisopen.sca.ServiceRuntimeException;
-
-import com.hazelcast.config.Config;
-import com.hazelcast.config.NearCacheConfig;
-import com.hazelcast.config.TcpIpConfig;
-import com.hazelcast.config.XmlConfigBuilder;
-import com.hazelcast.core.EntryEvent;
-import com.hazelcast.core.EntryListener;
-import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.core.ILock;
-import com.hazelcast.core.IMap;
-import com.hazelcast.core.Member;
-import com.hazelcast.core.MembershipEvent;
-import com.hazelcast.core.MembershipListener;
-import com.hazelcast.core.MultiMap;
-import com.hazelcast.core.Transaction;
-import com.hazelcast.nio.Address;
-
-/**
- * An EndpointRegistry using a Hazelcast
- */
-public class HazelcastEndpointRegistry extends BaseEndpointRegistry implements EndpointRegistry, LifeCycleListener, EntryListener<String, Endpoint>, MembershipListener {
-    private final static Logger logger = Logger.getLogger(HazelcastEndpointRegistry.class.getName());
-
-    private HazelcastInstance hazelcastInstance;
-    protected Map<Object, Object> endpointMap;
-    protected Map<String, Endpoint> localEndpoints = new ConcurrentHashMap<String, Endpoint>();
-    protected MultiMap<String, String> endpointOwners;
-    protected AssemblyFactory assemblyFactory;
-    protected Object shutdownMutex = new Object();
-    protected Properties properties;
-
-    public HazelcastEndpointRegistry(ExtensionPointRegistry registry, Properties properties, String domainURI) {
-        super(registry, null, null, domainURI);
-        this.assemblyFactory = registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(AssemblyFactory.class);
-        this.properties = properties;
-    }
-
-    public HazelcastEndpointRegistry(ExtensionPointRegistry registry,
-                                     Map<String, String> attributes,
-                                     String domainRegistryURI,
-                                     String domainURI) {
-        super(registry, attributes, domainRegistryURI, domainURI);
-        this.assemblyFactory = registry.getExtensionPoint(FactoryExtensionPoint.class).getFactory(AssemblyFactory.class);
-        this.properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-    }
-    
-    public HazelcastInstance getHazelcastInstance() {
-        return hazelcastInstance;
-    }
-
-    public void start() {
-        if (endpointMap != null) {
-            throw new IllegalStateException("The registry has already been started");
-        }
-//        if (configURI.toString().startsWith("tuscany:vm:")) {
-//            endpointMap = new HashMap<Object, Object>();
-//        } else {
-            initHazelcastInstance();
-            IMap imap = hazelcastInstance.getMap(domainURI + "/Endpoints");
-            imap.addEntryListener(this, true);
-            endpointMap = imap;
-            
-            endpointOwners = hazelcastInstance.getMultiMap(domainURI + "/EndpointOwners");
-
-            hazelcastInstance.getCluster().addMembershipListener(this);
-//        }
-    }
-
-    public void stop() {
-        if (hazelcastInstance != null) {
-            synchronized (shutdownMutex) {
-                hazelcastInstance.shutdown();
-                hazelcastInstance = null;
-                endpointMap = null;
-                endpointOwners = null;
-            }
-        }
-    }
-
-    private void initHazelcastInstance() {
-        Config config = getHazelcastConfig();
-
-        // do this when theres a way to have adders be the key owners
-        // config.getMapConfig(configURI.getDomainName() + "/Endpoints").setBackupCount(0);
-
-        // this caches reads locally
-        config.getMapConfig("default").setNearCacheConfig(new NearCacheConfig(0, 0, "NONE", 0, true));
-
-        // Disable the Hazelcast shutdown hook as Tuscany has its own and with both there are race conditions
-        config.setProperty("hazelcast.shutdownhook.enabled",
-                           // GroupProperties.PROP_SHUTDOWNHOOK_ENABLED, 
-                           "false");
-        
-        // By default this is 5 seconds, not sure what the implications are but dropping it down to 1 makes 
-        // things like the samples look much faster
-        config.setProperty("hazelcast.wait.seconds.before.join",
-                           // GroupProperties.PROP_WAIT_SECONDS_BEFORE_JOIN, 
-                           "1");
-
-        this.hazelcastInstance = Hazelcast.newHazelcastInstance(config);
-    }
-
-    protected Config getHazelcastConfig() {
-        Config config;
-        this.properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-        String configFile = properties.getProperty("hazelcastConfig");
-        if (configFile != null) {
-            try {
-                config = new XmlConfigBuilder(configFile).build();
-            } catch (FileNotFoundException e) {
-                throw new IllegalArgumentException(configFile, e);
-            }
-        } else {
-            // TUSCANY-3675 - domainRegistryURI properties don't seem to be copied into the
-            //                properties collection anywhere
-            config = new XmlConfigBuilder().build();
-            RegistryConfig rc = new RegistryConfig(properties);
-            config.setPort(rc.getBindPort());
-            //config.setPortAutoIncrement(false);
-
-            if (!rc.getBindAddress().equals("*")) {
-                config.getNetworkConfig().getInterfaces().setEnabled(true);
-                config.getNetworkConfig().getInterfaces().clear();
-                config.getNetworkConfig().getInterfaces().addInterface(rc.getBindAddress());
-            }
-
-            config.getGroupConfig().setName(rc.getUserid());
-            config.getGroupConfig().setPassword(rc.getPassword());
-
-            if (rc.isMulticastDisabled()) {
-                config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false);
-            } else {
-                config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(true);
-                config.getNetworkConfig().getJoin().getMulticastConfig().setMulticastPort(rc.getMulticastPort());
-                config.getNetworkConfig().getJoin().getMulticastConfig().setMulticastGroup(rc.getMulticastAddress());
-            }
-            
-            if (rc.getWKAs().size() > 0) {
-                TcpIpConfig tcpconfig = config.getNetworkConfig().getJoin().getTcpIpConfig();
-                tcpconfig.setEnabled(true);
-                List<Address> lsMembers = tcpconfig.getAddresses();
-                lsMembers.clear();
-                for (String addr : rc.getWKAs()) {
-                    String[] ipNPort = addr.split(":");
-                    try {
-                        lsMembers.add(new Address(ipNPort[0], Integer.parseInt(ipNPort[1])));
-                    } catch (UnknownHostException e) {
-                        throw new RuntimeException(e);
-                    }
-                }
-            }
-        }
-        return config;
-    }
-
-    public void addEndpoint(Endpoint endpoint) {
-        if (findEndpoint(endpoint.getURI()).size() > 0) {
-            Member m = getOwningMember(endpoint.getURI());
-            throw new IllegalStateException("Endpoint " + endpoint.getURI() + " already exists in domain " + domainURI + " at " + m.getInetSocketAddress());
-        }
-            
-        String localMemberAddr = hazelcastInstance.getCluster().getLocalMember().getInetSocketAddress().toString();
-        String endpointURI = endpoint.getURI();
-        Transaction txn = hazelcastInstance.getTransaction();
-        txn.begin();
-        try {
-            endpointMap.put(endpointURI, endpoint);
-            endpointOwners.put(localMemberAddr, endpointURI);
-            txn.commit();
-        } catch (Throwable e) {
-            txn.rollback();
-            throw new ServiceRuntimeException(e);
-        }
-        localEndpoints.put(endpointURI, endpoint);
-        logger.info("Add endpoint - " + endpoint);
-    }
-
-    public List<Endpoint> findEndpoint(String uri) {
-        List<Endpoint> foundEndpoints = new ArrayList<Endpoint>();
-        for (Object v : endpointMap.values()) {
-            Endpoint endpoint = (Endpoint)v;
-            logger.fine("Matching against - " + endpoint);
-            if (endpoint.matches(uri)) {
-                if (!isLocal(endpoint)) {
-                    endpoint.setRemote(true);
-                    ((RuntimeEndpoint)endpoint).bind(registry, this);
-                } else {
-                    // get the local version of the endpoint
-                    // this local version won't have been serialized
-                    // won't be marked as remote and will have the 
-                    // full interface contract information
-                    endpoint = localEndpoints.get(endpoint.getURI());
-                }
-                
-                foundEndpoints.add(endpoint);
-                logger.fine("Found endpoint with matching service  - " + endpoint);
-            }
-        }
-        return foundEndpoints;
-    }
-    
-
-    private boolean isLocal(Endpoint endpoint) {
-        return localEndpoints.containsKey(endpoint.getURI());
-    }
-
-    public Endpoint getEndpoint(String uri) {
-        return (Endpoint)endpointMap.get(uri);
-    }
-
-    public List<Endpoint> getEndpoints() {
-        return new ArrayList(endpointMap.values());
-    }
-
-    public void removeEndpoint(Endpoint endpoint) {
-        if (hazelcastInstance == null) {
-            return;
-        }
-        synchronized (shutdownMutex) {
-            String localMemberAddr = hazelcastInstance.getCluster().getLocalMember().getInetSocketAddress().toString();
-            String endpointURI = endpoint.getURI();
-            
-// TODO: seems to be a txn bug in Hazelcast, see http://code.google.com/p/hazelcast/issues/detail?id=258 
-//            Transaction txn = hazelcastInstance.getTransaction();
-//            txn.begin();
-//            try {
-                endpointOwners.remove(localMemberAddr, endpointURI);
-                endpointMap.remove(endpointURI);
-//                txn.commit();
-//            } catch (Throwable e) {
-//                txn.rollback();
-//                throw new ServiceRuntimeException(e);
-//            }
-            localEndpoints.remove(endpointURI);
-            logger.info("Removed endpoint - " + endpoint);
-        }
-    }
-
-
-    public void entryAdded(EntryEvent<String, Endpoint> event) {
-        entryAdded(event.getKey(), event.getValue());
-    }
-
-    public void entryEvicted(EntryEvent<String, Endpoint> event) {
-        // Should not happen
-    }
-
-    public void entryRemoved(EntryEvent<String, Endpoint> event) {
-        entryRemoved(event.getKey(), event.getValue());
-    }
-
-    public void entryUpdated(EntryEvent<String, Endpoint> event) {
-        entryUpdated(event.getKey(), null, event.getValue());
-    }
-
-    public void entryAdded(Object key, Object value) {
-        Endpoint newEp = (Endpoint)value;
-        if (!isLocal(newEp)) {
-            logger.info(" Remote endpoint added: " + newEp);
-        } 
-        endpointAdded(newEp);
-    }
-
-    public void entryRemoved(Object key, Object value) {
-        Endpoint oldEp = (Endpoint)value;
-        if (!isLocal(oldEp)) {
-            logger.info(" Remote endpoint removed: " + value);
-        }
-        endpointRemoved(oldEp);
-    }
-
-    public void entryUpdated(Object key, Object oldValue, Object newValue) {
-        Endpoint oldEp = (Endpoint)oldValue;
-        Endpoint newEp = (Endpoint)newValue;
-        if (!isLocal(newEp)) {
-            logger.info(" Remote endpoint updated: " + newEp);
-        }
-        endpointUpdated(oldEp, newEp);
-    }
-
-    public void memberAdded(MembershipEvent event) {
-    }
-
-    public void memberRemoved(MembershipEvent event) {
-        try {
-            String memberAddr = event.getMember().getInetSocketAddress().toString();
-            if (endpointOwners.containsKey(memberAddr)) {
-                synchronized (shutdownMutex) {
-                    ILock lock = hazelcastInstance.getLock("EndpointOwners/" + memberAddr);
-                    lock.lock();
-                    try {
-                        if (endpointOwners.containsKey(memberAddr)) {
-                            Collection<String> keys = endpointOwners.remove(memberAddr);
-                            for (Object k : keys) {
-                                endpointMap.remove(k);
-                            }
-                        }
-                    } finally {
-                        lock.unlock();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            if (e.getCause() != null && e.getCause().getCause() != null) {
-                // ignore hazelcast already shutdown exception
-                if (!"Hazelcast Instance is not active!".equals(e.getCause().getCause().getMessage())) {
-                    throw new ServiceRuntimeException(e);
-                }
-            }
-        }
-    }
-
-    public Member getOwningMember(String serviceURI) {
-        for (String memberAddr : endpointOwners.keySet()) {
-            for (String service : endpointOwners.get(memberAddr)) {
-                Endpoint ep = assemblyFactory.createEndpoint();
-                ep.setURI(service);
-                if (ep.matches(serviceURI)) {
-                    for (Member m : getHazelcastInstance().getCluster().getMembers()) {
-                        if (memberAddr.equals(m.getInetSocketAddress().toString())) {
-                            return m;
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
deleted file mode 100644
index 79bffd3b21..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java
+++ /dev/null
@@ -1,179 +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.endpoint.hazelcast;
-
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-
-/**
- * Utility to parse the config properties.
- * 
- * bind - ip[:port] - defines the local bind address and port, it defaults to the network interface with the widest 
- *                    class (ie class A is wider than class B) on port 14820 and if that port in use it will try 
- *                    incrementing by one till a free port is found.
- *             
- * multicast - groupip:port | off - defines if multicast discovery is used and if so what multicast ip group and port is used 
- *             defaults to 224.5.12.10:51482. A value of off means multicast is disabled.
- *             
- * wka - ip[:port] - a comma separated list of ip address and port for remote nodes in the domain group. The port defaults to 14820.
- *             
- * userid -  is the userid other nodes must use to connect to this domain group. The default is the default domain name.
- * 
- * password -  is the password other nodes must use to connect to this domain group. The default is 'tuscany'.
- *             
- * client - true means this is an SCAClient call           
- *             
- */
-public class RegistryConfig {
-    
-    private String bindAddress = "*";
-    private int bindPort = 14820;
-    private boolean multicastDisabled = false;
-    private String multicastAddress = "224.5.12.10";
-    private int multicastPort = 51482;
-    private List<String> wkas = new ArrayList<String>();
-    private String userid;
-    private String password;
-    boolean client;
-    
-    public RegistryConfig(Properties properties) {
-        init(properties);
-    }
-
-    private void init(Properties properties) {
-   
-        String bindValue = properties.getProperty("bind");
-        if (bindValue == null) {
-            InetAddress addr = chooseLocalAddress();
-            if (addr != null) {
-                this.bindAddress = addr.getHostAddress();
-            }
-        } else {
-            if (bindValue.indexOf(":") == -1) {
-                this.bindAddress = bindValue;
-            } else {
-                String[] addr = bindValue.split(":");
-                this.bindAddress = addr[0];
-                this.bindPort = Integer.parseInt(addr[1]);
-            }
-        }
-
-        String multicastValue = properties.getProperty("multicast");
-        if (multicastValue != null) {
-            if ("off".equalsIgnoreCase(multicastValue)) {
-                this.multicastDisabled = true;
-            } else {
-                if (multicastValue.indexOf(":") == -1) {
-                    this.multicastAddress = multicastValue;
-                } else {
-                    String[] addr = multicastValue.split(":");
-                    this.multicastAddress = addr[0];
-                    this.multicastPort = Integer.parseInt(addr[1]);
-                }
-            }
-        }
-        
-        String wkaValue = properties.getProperty("wka");
-        if (wkaValue != null) {
-            String[] ips = wkaValue.split(",");
-            for (String ip : ips) {
-                if (ip.indexOf(":") == -1) {
-                    wkas.add(ip + ":14820");
-                } else {
-                    wkas.add(ip);
-                }
-            }
-        }
-
-        this.client = Boolean.parseBoolean(properties.getProperty("client", "false"));
-        this.password = properties.getProperty("password", "tuscany");
-        this.userid = properties.getProperty("userid", properties.getProperty("defaultDomainName", "default"));
-
-    }
-
-    public String getBindAddress() {
-        return bindAddress;
-    }
-
-    public int getBindPort() {
-        return bindPort;
-    }
-
-    public boolean isMulticastDisabled() {
-        return multicastDisabled;
-    }
-
-    public String getMulticastAddress() {
-        return multicastAddress;
-    }
-
-    public int getMulticastPort() {
-        return multicastPort;
-    }
-
-    public List<String> getWKAs() {
-        return wkas;
-    }
-    
-    public String getUserid() {
-        return userid;
-    }
-    public String getPassword() {
-        return password;
-    }
-
-    /**
-     * Use the NIC address with the widest class, ie class A instead of class B or C.
-     * Bit crude but in a lot of environments a class A address (eg 10.x.x.x) is likely
-     * a better choice than a class C address (eg 192.x.x.x). And the alternative to 
-     * this is to just choose the first address of the first network interface which 
-     * likely isn't a better choice than this approach.
-     */
-    protected InetAddress chooseLocalAddress() {
-        InetAddress chosen = null;
-        try {
-            Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
-            while (nis.hasMoreElements()) {
-                NetworkInterface ni = nis.nextElement();
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    InetAddress addr = ips.nextElement();
-                    if (!addr.isLoopbackAddress()) {
-                        if (chosen == null) {
-                            chosen = addr;
-                        } else {
-                            if (((int) addr.getAddress()[0] & 0xFF) < ((int) chosen.getAddress()[0] & 0xFF)) {
-                                chosen = addr;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-            // ignore
-        }
-        return chosen;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
deleted file mode 100644
index ad4d6d9e64..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java
+++ /dev/null
@@ -1,49 +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.endpoint.hazelcast.client;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.runtime.BaseDomainRegistryFactory;
-import org.apache.tuscany.sca.runtime.EndpointRegistry;
-
-/**
- * The utility responsible for finding the endpoint regstry by the scheme and creating instances for the
- * given domain
- */
-public class HazelcastClientDomainRegistryFactory extends BaseDomainRegistryFactory {
-    private final static String[] schemes = new String[] {"hazelcastclient", "tuscanyclient"};
-
-    /**
-     * @param extensionRegistry
-     */
-    public HazelcastClientDomainRegistryFactory(ExtensionPointRegistry registry) {
-        super(registry);
-    }
-
-    protected EndpointRegistry createEndpointRegistry(String endpointRegistryURI, String domainURI) {
-        EndpointRegistry endpointRegistry =
-            new HazelcastClientEndpointRegistry(registry, null, endpointRegistryURI, domainURI);
-        return endpointRegistry;
-    }
-
-    public String[] getSupportedSchemes() {
-        return schemes;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
deleted file mode 100644
index 8b9e49ecd3..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java
+++ /dev/null
@@ -1,120 +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.endpoint.hazelcast.client;
-
-import java.net.BindException;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.util.Enumeration;
-import java.util.Map;
-
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
-import org.apache.tuscany.sca.endpoint.hazelcast.HazelcastEndpointRegistry;
-import org.apache.tuscany.sca.endpoint.hazelcast.RegistryConfig;
-import org.apache.tuscany.sca.runtime.RuntimeProperties;
-
-import com.hazelcast.client.HazelcastClient;
-import com.hazelcast.core.HazelcastInstance;
-
-/**
- * An EndpointRegistry using a Hazelcast Native Client
- */
-public class HazelcastClientEndpointRegistry extends HazelcastEndpointRegistry {
-
-    HazelcastClient hazelcastClient;
-
-    public HazelcastClientEndpointRegistry(ExtensionPointRegistry registry,
-                                     Map<String, String> attributes,
-                                     String domainRegistryURI,
-                                     String domainURI) {
-        super(registry, attributes, domainRegistryURI, domainURI);
-    }
-
-    @Override
-    public void start() {
-        if (endpointMap != null) {
-            throw new IllegalStateException("The registry has already been started");
-        }
-        initHazelcastClientInstance();
-        endpointMap = hazelcastClient.getMap(domainURI + "/Endpoints");
-        endpointOwners = hazelcastClient.getMultiMap(domainURI + "/EndpointOwners");
-    }
-
-    @Override
-    public void stop() {
-        if (hazelcastClient != null) {
-            hazelcastClient.shutdown();
-            hazelcastClient = null;
-            endpointMap = null;
-        }
-    }
-
-    private void initHazelcastClientInstance() {
-        this.properties = registry.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties();
-        RegistryConfig rc = new RegistryConfig(properties);
-        if (rc.getWKAs().size() < 1) {
-            String ip = getDefaultWKA();
-            if (ip != null) {
-                rc.getWKAs().add(ip);
-            }
-        }
-        if (rc.getWKAs().size() < 1) {
-            throw new IllegalArgumentException("Must specify remote IP address(es) for domain");
-        }
-        this.domainURI = properties.getProperty("defaultDomainName", "default");
-        this.hazelcastClient = HazelcastClient.newHazelcastClient(rc.getUserid(), rc.getPassword(), rc.getWKAs().toArray(new String[0]));
-    }
-
-    @Override
-    public HazelcastInstance getHazelcastInstance() {
-        return hazelcastClient;
-    }
-
-    /**
-     * See if there's a local IP listening on port 14820
-     */
-    protected static String getDefaultWKA() {
-        try {
-            Enumeration<NetworkInterface> nis = NetworkInterface.getNetworkInterfaces();
-            while (nis.hasMoreElements()) {
-                NetworkInterface ni = nis.nextElement();
-                Enumeration<InetAddress> ips = ni.getInetAddresses();
-                while (ips.hasMoreElements()) {
-                    InetAddress addr = ips.nextElement();
-                    ServerSocket ss = null;
-                    try {
-                        ss = new ServerSocket(14820, 0, addr);
-                    } catch (BindException e) {
-                        return addr.getHostAddress() + ":14820";
-                    } finally {
-                        if (ss != null) {
-                            ss.close();
-                        }
-                    }
-                }
-            }
-        } catch (Exception e) {
-        }
-        return null;
-    }    
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 2fc977b41f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,21 +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. 

-

-# Implementation class for the artifact processor extension

-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.hazelcast,model=org.apache.tuscany.sca.binding.hazelcast.HazelcastBinding

-

-

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 3878c5f0da..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-# 

-#   http://www.apache.org/licenses/LICENSE-2.0

-# 

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License. 

-

-# Implementation class for the binding extension

-org.apache.tuscany.sca.binding.hazelcast.HazelcastBindingProviderFactory;model=org.apache.tuscany.sca.binding.hazelcast.HazelcastBinding

diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
deleted file mode 100644
index 2dfacf1f82..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/domain-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one

-# or more contributor license agreements.  See the NOTICE file

-# distributed with this work for additional information

-# regarding copyright ownership.  The ASF licenses this file

-# to you under the Apache License, Version 2.0 (the

-# "License"); you may not use this file except in compliance

-# with the License.  You may obtain a copy of the License at

-#

-#   http://www.apache.org/licenses/LICENSE-2.0

-#

-# Unless required by applicable law or agreed to in writing,

-# software distributed under the License is distributed on an

-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-# KIND, either express or implied.  See the License for the

-# specific language governing permissions and limitations

-# under the License.

-org.apache.tuscany.sca.endpoint.hazelcast.HazelcastDomainRegistryFactory;ranking=100

-org.apache.tuscany.sca.endpoint.hazelcast.client.HazelcastClientDomainRegistryFactory;ranking=100