Setting svn:eol-style for java and xml files

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

13 files changed, 782 insertions, 782 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
index 36d4e74813..42f6193940 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/EndpointStash.java
@@ -1,54 +1,54 @@
-/*

- * 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);

-    }

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
index 63b18ce8a2..1636ed16ca 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBinding.java
@@ -1,33 +1,33 @@
-/*

- * 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);

-    }

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
index b56d8a1e50..f202e16a69 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingProviderFactory.java
@@ -1,66 +1,66 @@
-/*

- * 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;

-    }

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
index f7cb0ffeee..29546f405e 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastReferenceBindingProvider.java
@@ -1,58 +1,58 @@
-/*

- * 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() {

-    }

-

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
index d911e5b245..6ac3542a8e 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastServiceBindingProvider.java
@@ -1,52 +1,52 @@
-/*

- * 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;

-    }

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
index f588f87bdd..7caf3e4841 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ReferenceInvoker.java
@@ -1,127 +1,127 @@
-/*

- * 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;

-    }

-

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
index d25c32a68c..42cac191aa 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/java/org/apache/tuscany/sca/binding/hazelcast/ServiceInvoker.java
@@ -1,98 +1,98 @@
-/*

- * 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;

-    }

-

-}

+/*
+ * 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/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
index f7ca89e7bb..937046f0b1 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java
@@ -1,29 +1,29 @@
-/*

- * 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;

-

-public class BadStringException extends Exception {

-    private static final long serialVersionUID = 1L;

-

-    public BadStringException(String msg) {

-        super(msg);

-    }

-

-}

+/*
+ * 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;
+
+public class BadStringException extends Exception {
+    private static final long serialVersionUID = 1L;
+
+    public BadStringException(String msg) {
+        super(msg);
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
index 79e695d38a..68353c89cf 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.java
@@ -1,33 +1,33 @@
-/*

- * 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;

-

-public class ComplexType {

-    

-    private String s;

-    

-    public void setString(String s) {

-        this.s = s;

-    }

-

-    public String getString() {

-        return s;

-    }

-}

+/*
+ * 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;
+
+public class ComplexType {
+    
+    private String s;
+    
+    public void setString(String s) {
+        this.s = s;
+    }
+
+    public String getString() {
+        return s;
+    }
+}
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
index 1183ae9732..18831eafac 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java
@@ -1,114 +1,114 @@
-/*

- * 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 static org.junit.Assert.assertEquals;

-import static org.junit.Assert.assertNotNull;

-import static org.junit.Assert.fail;

-

-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.ServiceRuntimeException;

-

-public class HazelcastBindingTestCase {

-

-    private static Node serviceNode;

-    private static Node clientNode;

-

-    @BeforeClass

-    public static void setUpBeforeClass() throws Exception {

-        // Note use of NodeFactory.newInstance() so as to start separate runtimes

-        serviceNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("service.composite", new String[]{"target/test-classes"});

-        serviceNode.start();

-        clientNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client.composite", new String[]{"target/test-classes"});

-        clientNode.start();

-    }

-

-    @Test

-    public void testNestedClient() throws Exception {

-        Node client2Node = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client2.composite", new String[]{"target/test-classes"});

-        client2Node.start();

-        TestService service = client2Node.getService(TestService.class, "TestServiceClient2");

-        assertNotNull(service);

-        assertEquals("Petra", service.echoString("Petra"));

-        client2Node.stop();

-    }

-

-    @Test

-    public void testEchoString() throws Exception {

-        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

-        assertNotNull(service);

-        assertEquals("Petra", service.echoString("Petra"));

-    }

-

-    @Test

-    public void testOnewayString() throws Exception {

-        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

-        assertNotNull(service);

-        service.onewayString("Petra");

-    }

-

-    @Test

-    public void testEchoComplexType() throws Exception {

-        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

-        assertNotNull(service);

-        ComplexType ct = new ComplexType();

-        ct.setString("beate");

-        assertEquals("beate", service.echoComplexType(ct).getString());

-    }

-

-    @Test

-    public void testDeclaredException() throws Exception {

-        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

-        assertNotNull(service);

-        try {

-            service.testExceptions("Sue");

-            fail();

-        } catch (BadStringException e) {

-            assertEquals("Sue", e.getMessage());

-        }

-    }

-

-    @Test

-    public void testRuntimeException() throws Exception {

-        TestService service = clientNode.getService(TestService.class, "TestServiceClient");

-        assertNotNull(service);

-        try {

-            service.testExceptions("runtime");

-            fail();

-        } catch (ServiceRuntimeException e) {

-            assertEquals("org.oasisopen.sca.ServiceRuntimeException: Remote exception: class java.lang.RuntimeException:runtime", e.getMessage());

-        }

-    }

-

-    @AfterClass

-    public static void tearDownAfterClass() throws Exception {

-        if (clientNode != null) {

-            clientNode.stop();

-        }

-        if (serviceNode != null) {

-            serviceNode.stop();

-        }

-    }

-}

-

+/*
+ * 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 static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+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.ServiceRuntimeException;
+
+public class HazelcastBindingTestCase {
+
+    private static Node serviceNode;
+    private static Node clientNode;
+
+    @BeforeClass
+    public static void setUpBeforeClass() throws Exception {
+        // Note use of NodeFactory.newInstance() so as to start separate runtimes
+        serviceNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("service.composite", new String[]{"target/test-classes"});
+        serviceNode.start();
+        clientNode = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client.composite", new String[]{"target/test-classes"});
+        clientNode.start();
+    }
+
+    @Test
+    public void testNestedClient() throws Exception {
+        Node client2Node = NodeFactory.newInstance("uri:HazelcastBindingTestCase?bind=127.0.0.1").createNode("client2.composite", new String[]{"target/test-classes"});
+        client2Node.start();
+        TestService service = client2Node.getService(TestService.class, "TestServiceClient2");
+        assertNotNull(service);
+        assertEquals("Petra", service.echoString("Petra"));
+        client2Node.stop();
+    }
+
+    @Test
+    public void testEchoString() throws Exception {
+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");
+        assertNotNull(service);
+        assertEquals("Petra", service.echoString("Petra"));
+    }
+
+    @Test
+    public void testOnewayString() throws Exception {
+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");
+        assertNotNull(service);
+        service.onewayString("Petra");
+    }
+
+    @Test
+    public void testEchoComplexType() throws Exception {
+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");
+        assertNotNull(service);
+        ComplexType ct = new ComplexType();
+        ct.setString("beate");
+        assertEquals("beate", service.echoComplexType(ct).getString());
+    }
+
+    @Test
+    public void testDeclaredException() throws Exception {
+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");
+        assertNotNull(service);
+        try {
+            service.testExceptions("Sue");
+            fail();
+        } catch (BadStringException e) {
+            assertEquals("Sue", e.getMessage());
+        }
+    }
+
+    @Test
+    public void testRuntimeException() throws Exception {
+        TestService service = clientNode.getService(TestService.class, "TestServiceClient");
+        assertNotNull(service);
+        try {
+            service.testExceptions("runtime");
+            fail();
+        } catch (ServiceRuntimeException e) {
+            assertEquals("org.oasisopen.sca.ServiceRuntimeException: Remote exception: class java.lang.RuntimeException:runtime", e.getMessage());
+        }
+    }
+
+    @AfterClass
+    public static void tearDownAfterClass() throws Exception {
+        if (clientNode != null) {
+            clientNode.stop();
+        }
+        if (serviceNode != null) {
+            serviceNode.stop();
+        }
+    }
+}
+
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
index e2462daa76..3ffcb0d384 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java
@@ -1,30 +1,30 @@
-/*

- * 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.oasisopen.sca.annotation.Remotable;

-

-@Remotable

-public interface TestService {

-    String echoString(String s);

-    void onewayString(String s);

-    ComplexType echoComplexType(ComplexType ct);

-    String testExceptions(String s) throws BadStringException;

-}

+/*
+ * 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.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface TestService {
+    String echoString(String s);
+    void onewayString(String s);
+    ComplexType echoComplexType(ComplexType ct);
+    String testExceptions(String s) throws BadStringException;
+}
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
index 18cd2555b3..4b462068f0 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java
@@ -1,45 +1,45 @@
-/*

- * 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.oasisopen.sca.annotation.Reference;

-

-public class TestServiceClient implements TestService {

-

-    @Reference

-    public TestService service;

-    

-    public String echoString(String s) {

-        return service.echoString(s);

-    }

-

-    public void onewayString(String s) {

-        service.onewayString(s);

-    }

-

-    public ComplexType echoComplexType(ComplexType ct) {

-        return service.echoComplexType(ct);

-    }

-

-    public String testExceptions(String s) throws BadStringException {

-        return service.testExceptions(s);

-    }

-

-}

+/*
+ * 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.oasisopen.sca.annotation.Reference;
+
+public class TestServiceClient implements TestService {
+
+    @Reference
+    public TestService service;
+    
+    public String echoString(String s) {
+        return service.echoString(s);
+    }
+
+    public void onewayString(String s) {
+        service.onewayString(s);
+    }
+
+    public ComplexType echoComplexType(ComplexType ct) {
+        return service.echoComplexType(ct);
+    }
+
+    public String testExceptions(String s) throws BadStringException {
+        return service.testExceptions(s);
+    }
+
+}
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
index 6c9a5d71bf..1f5a3872c6 100644
--- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java
@@ -1,43 +1,43 @@
-/*

- * 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;

-

-public class TestServiceImpl implements TestService {

-

-    public String echoString(String s) {

-        return s;

-    }

-

-    public void onewayString(String s) {

-        System.out.println("onewayString " + s);

-    }

-

-    public ComplexType echoComplexType(ComplexType ct) {

-        return ct;

-    }

-

-    public String testExceptions(String s) throws BadStringException {

-        if (s.equals("runtime")) {

-            throw new RuntimeException("runtime");

-        }

-        throw new BadStringException(s);

-    }

-

-}

+/*
+ * 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;
+
+public class TestServiceImpl implements TestService {
+
+    public String echoString(String s) {
+        return s;
+    }
+
+    public void onewayString(String s) {
+        System.out.println("onewayString " + s);
+    }
+
+    public ComplexType echoComplexType(ComplexType ct) {
+        return ct;
+    }
+
+    public String testExceptions(String s) throws BadStringException {
+        if (s.equals("runtime")) {
+            throw new RuntimeException("runtime");
+        }
+        throw new BadStringException(s);
+    }
+
+}