diff options
43 files changed, 9 insertions, 2297 deletions
diff --git a/sca-java-2.x/trunk/features/all/pom.xml b/sca-java-2.x/trunk/features/all/pom.xml index 6edfccb18a..3f36996871 100644 --- a/sca-java-2.x/trunk/features/all/pom.xml +++ b/sca-java-2.x/trunk/features/all/pom.xml @@ -349,7 +349,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast-client</artifactId> + <artifactId>tuscany-domain-hazelcast</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/features/ejava/pom.xml b/sca-java-2.x/trunk/features/ejava/pom.xml index 970d2e759c..7fd3a4442c 100644 --- a/sca-java-2.x/trunk/features/ejava/pom.xml +++ b/sca-java-2.x/trunk/features/ejava/pom.xml @@ -162,12 +162,7 @@ <!-- Hazelcast registry --> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast-client</artifactId> + <artifactId>tuscany-domain-hazelcast</artifactId> <version>2.0-SNAPSHOT</version> </dependency> diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF deleted file mode 100644 index ab90529320..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Binding Hazelcast Runtime
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany Hazelcast Binding
-Bundle-SymbolicName: org.apache.tuscany.sca.binding.hazelcast.runtime
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 -Import-Package: javax.xml.namespace,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
- org.apache.tuscany.sca.assembly.impl;version="2.0.0",
- org.apache.tuscany.sca.binding.ws;version="2.0.0",
- org.apache.tuscany.sca.binding.ws.wsdlgen;version="2.0.0",
- org.apache.tuscany.sca.common.xml.dom;version="2.0.0",
- org.apache.tuscany.sca.context;version="2.0.0",
- org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.databinding.xml;version="2.0.0",
- org.apache.tuscany.sca.endpoint.hazelcast;version="2.0.0",
- org.apache.tuscany.sca.interfacedef;version="2.0.0",
- org.apache.tuscany.sca.interfacedef.util;version="2.0.0",
- org.apache.tuscany.sca.invocation;version="2.0.0",
- org.apache.tuscany.sca.provider;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0",
- org.oasisopen.sca,
- org.oasisopen.sca.annotation,
- org.w3c.dom,
- org.xml.sax
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/pom.xml deleted file mode 100644 index 189ab5d9e5..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <artifactId>tuscany-binding-hazelcast-runtime</artifactId> - <name>Apache Tuscany SCA Binding Hazelcast Runtime</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-wsdlgen</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> 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 deleted file mode 100644 index 42f6193940..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 1636ed16ca..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index f202e16a69..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 29546f405e..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 6ac3542a8e..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 7caf3e4841..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 42cac191aa..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/trunk/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/trunk/modules/binding-hazelcast-runtime/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/trunk/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index 3878c5f0da..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/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/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 deleted file mode 100644 index 937046f0b1..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/BadStringException.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.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 deleted file mode 100644 index 68353c89cf..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/ComplexType.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; - -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 deleted file mode 100644 index 18831eafac..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/HazelcastBindingTestCase.java +++ /dev/null @@ -1,114 +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 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 deleted file mode 100644 index 3ffcb0d384..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestService.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.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 deleted file mode 100644 index 4b462068f0..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceClient.java +++ /dev/null @@ -1,45 +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.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 deleted file mode 100644 index 1f5a3872c6..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/java/org/apache/tuscany/sca/binding/hazelcast/TestServiceImpl.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.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); - } - -} diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client.composite b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client.composite deleted file mode 100644 index 7436a5e24b..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client.composite +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="TestServiceClient">
-
- <component name="TestServiceClient">
- <implementation.java class="org.apache.tuscany.sca.binding.hazelcast.TestServiceClient"/>
- <reference name="service" target="TestService"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client2.composite b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client2.composite deleted file mode 100644 index 20667984ca..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/client2.composite +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="TestServiceClient2">
-
- <component name="TestServiceClient2">
- <implementation.java class="org.apache.tuscany.sca.binding.hazelcast.TestServiceClient"/>
- <reference name="service" target="TestServiceClient"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/service.composite b/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/service.composite deleted file mode 100644 index 83f13a35f2..0000000000 --- a/sca-java-2.x/trunk/modules/binding-hazelcast-runtime/src/test/resources/service.composite +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://itest"
- name="TestService">
-
- <component name="TestService">
- <implementation.java class="org.apache.tuscany.sca.binding.hazelcast.TestServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF deleted file mode 100644 index ea13b89d17..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/META-INF/MANIFEST.MF +++ /dev/null @@ -1,18 +0,0 @@ -Manifest-Version: 1.0
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Hazelcast Client Based EndPoint Registry
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany Hazelcast Client Endpoint Regsitry
-Bundle-SymbolicName: org.apache.tuscany.sca.endpoint.hazelcast.client
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Import-Package: com.hazelcast.client,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.endpoint.hazelcast;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0"
-Export-Package: org.apache.tuscany.sca.endpoint.hazelcast.client;version="2.0.0";
- uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core,org.apache.tuscany.sca.endpoint.hazelcast"
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/pom.xml b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/pom.xml deleted file mode 100644 index 7553c09045..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-endpoint-hazelcast-client</artifactId> - <name>Apache Tuscany SCA EndPoint Registry using Hazelcast Native Client</name> - - <dependencies> - <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast-client</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientDomainRegistryFactory.java deleted file mode 100644 index ad4d6d9e64..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/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/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/client/HazelcastClientEndpointRegistry.java deleted file mode 100644 index 8b9e49ecd3..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/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/trunk/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory deleted file mode 100644 index b15ea6a58f..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast-client/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory +++ /dev/null @@ -1,17 +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.client.HazelcastClientDomainRegistryFactory;ranking=100
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/endpoint-hazelcast/META-INF/MANIFEST.MF deleted file mode 100644 index 9680bb9038..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA Hazelcast Based EndPoint Registry
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-Bundle-ManifestVersion: 2
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-Description: Apache Tuscany Hazelcast Endpoint Regsitry
-Bundle-SymbolicName: org.apache.tuscany.sca.endpoint.hazelcast
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 -Import-Package: com.hazelcast.config,
- com.hazelcast.core,
- com.hazelcast.nio,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.core;version="2.0.0",
- org.apache.tuscany.sca.runtime;version="2.0.0"
-Export-Package: org.apache.tuscany.sca.endpoint.hazelcast;version="2.0.0";
- uses:="org.apache.tuscany.sca.runtime,org.apache.tuscany.sca.assembly,org.apache.tuscany.sca.core"
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/pom.xml b/sca-java-2.x/trunk/modules/endpoint-hazelcast/pom.xml deleted file mode 100644 index 0b7857afa5..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-modules</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <name>Apache Tuscany SCA EndPoint Registry using Hazelcast</name> - - <dependencies> - <dependency> - <groupId>com.hazelcast</groupId> - <artifactId>hazelcast</artifactId> - <version>1.8.3</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core-spi</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-core</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-deployment</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastDomainRegistryFactory.java deleted file mode 100644 index 87c60e4b38..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-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/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java deleted file mode 100644 index c041914de8..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/HazelcastEndpointRegistry.java +++ /dev/null @@ -1,370 +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 { - 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/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryConfig.java deleted file mode 100644 index 79bffd3b21..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-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/trunk/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory deleted file mode 100644 index 23551701a5..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.DomainRegistryFactory +++ /dev/null @@ -1,17 +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
diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java deleted file mode 100644 index 67ce2bb50b..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/MultiRegTestCase.java +++ /dev/null @@ -1,163 +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.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.runtime.RuntimeEndpoint; -import org.apache.tuscany.sca.runtime.RuntimeProperties; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -public class MultiRegTestCase { - private static ExtensionPointRegistry extensionPoints; - private static AssemblyFactory assemblyFactory; - private static SCABindingFactory scaBindingFactory; - - @BeforeClass - public static void init() { - extensionPoints = new DefaultExtensionPointRegistry(); - FactoryExtensionPoint factories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class); - assemblyFactory = factories.getFactory(AssemblyFactory.class); - scaBindingFactory = factories.getFactory(SCABindingFactory.class); - Properties properties = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class).getUtility(RuntimeProperties.class).getProperties(); - properties.setProperty("bind", "127.0.0.1"); - } - - @Test - public void testReplication() throws Exception { - - System.out.println("Starting reg1"); - HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, null, null, "bar"); - reg1.start(); - - System.out.println("Adding ep1"); - RuntimeEndpoint ep1 = createEndpoint("ep1uri"); - ep1.bind(extensionPoints, reg1); - reg1.addEndpoint(ep1); - - System.out.println("Starting reg3"); - HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9877&multicast=off&remotes=127.0.0.1:9876", "bar"); - reg2.start(); - - System.out.println("Starting reg2"); - HazelcastEndpointRegistry reg3 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9878&multicast=off&remotes=127.0.0.1:9877", "bar"); - reg3.start(); - - assertExists(reg1, "ep1uri"); - assertExists(reg2, "ep1uri"); - assertExists(reg3, "ep1uri"); - - System.out.println("Adding ep2"); - RuntimeEndpoint ep2 = createEndpoint("ep2uri"); - ep2.bind(extensionPoints, reg2); - reg2.addEndpoint(ep2); - - assertExists(reg2, "ep2uri"); - assertExists(reg1, "ep2uri"); - assertExists(reg3, "ep2uri"); - - System.out.println("Stopping reg1"); - reg1.stop(); - System.out.println("Stopped reg1"); - Thread.sleep(500); - - Assert.assertNull(reg2.getEndpoint("ep1uri")); - Assert.assertNull(reg3.getEndpoint("ep1uri")); - - assertExists(reg2, "ep2uri"); - assertExists(reg3, "ep2uri"); - - System.out.println("Starting reg1"); - reg1.start(); - ep1.bind(extensionPoints, reg1); - - System.out.println("adding ep1"); - reg1.addEndpoint(ep1); - assertExists(reg1, "ep1uri"); - assertExists(reg2, "ep1uri"); - assertExists(reg3, "ep1uri"); - - System.out.println("Stopping reg1"); - reg1.stop(); - System.out.println("Stopping reg2"); - reg2.stop(); - System.out.println("Stopping reg3"); - reg3.stop(); - System.out.println("done"); - } - - @Test - public void testDuplicates() throws Exception { - HazelcastEndpointRegistry reg1 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9876&multicast=off", "bar"); - reg1.start(); - RuntimeEndpoint ep1 = createEndpoint("ep1uri"); - ep1.bind(extensionPoints, reg1); - reg1.addEndpoint(ep1); - - HazelcastEndpointRegistry reg2 = new HazelcastEndpointRegistry(extensionPoints, null, "tuscany:foo?listen=127.0.0.1:9877&multicast=off&remotes=127.0.0.1:9876", "bar"); - reg2.start(); - - try { - reg2.addEndpoint(ep1); - Assert.fail(); - } catch (IllegalStateException e) { - // expected - } - - reg1.stop(); - - Thread.sleep(200); - - // now it should work - reg2.addEndpoint(ep1); - - reg2.stop(); - } - - private Endpoint assertExists(HazelcastEndpointRegistry reg, String uri) throws InterruptedException { - Endpoint ep = reg.getEndpoint(uri); - Assert.assertNotNull(ep); - Assert.assertEquals(uri, ep.getURI()); - return ep; - } - - private RuntimeEndpoint createEndpoint(String uri) { - RuntimeEndpoint ep = (RuntimeEndpoint) assemblyFactory.createEndpoint(); - Component comp = assemblyFactory.createComponent(); - ep.setComponent(comp); - ep.setService(assemblyFactory.createComponentService()); - Binding b = scaBindingFactory.createSCABinding(); - ep.setBinding(b); - ep.setURI(uri); - return ep; - } - -} diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java deleted file mode 100644 index 12b420f010..0000000000 --- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/test/java/org/apache/tuscany/sca/endpoint/hazelcast/RegistryTestCase.java +++ /dev/null @@ -1,142 +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.UnknownHostException; -import java.util.List; - -import junit.framework.Assert; - -import org.junit.Ignore; -import org.junit.Test; - -import com.hazelcast.config.Config; -import com.hazelcast.config.TcpIpConfig; -import com.hazelcast.config.XmlConfigBuilder; -import com.hazelcast.core.Hazelcast; -import com.hazelcast.core.HazelcastInstance; -import com.hazelcast.core.IMap; -import com.hazelcast.nio.Address; - -@Ignore -public class RegistryTestCase { - - @Test - public void test1() throws UnknownHostException { - - HazelcastInstance h1 = create("54327", 9001); - - IMap<Object, Object> h1map = h1.getMap("mymap"); - h1map.put("key1", "bla1"); - Assert.assertEquals("bla1", h1map.get("key1")); - - HazelcastInstance h2 = create("false", 9002, 9001); - IMap<Object, Object> h2map = h2.getMap("mymap"); - Assert.assertEquals("bla1", h2map.get("key1")); - - HazelcastInstance h3 = create("false", 9003, 9002); - IMap<Object, Object> h3map = h3.getMap("mymap"); - Assert.assertEquals("bla1", h3map.get("key1")); - - h3map.put("k3", "v3"); - h2map.put("k2", "v2"); - - Assert.assertEquals("v2", h1map.get("k2")); - Assert.assertEquals("v3", h1map.get("k3")); - Assert.assertEquals("v2", h2map.get("k2")); - Assert.assertEquals("v3", h2map.get("k3")); - Assert.assertEquals("v2", h3map.get("k2")); - Assert.assertEquals("v3", h3map.get("k3")); - - HazelcastInstance h4 = create("54328", 9004, 9001); - IMap<Object, Object> h4map = h4.getMap("mymap"); -// Assert.assertNull(h4map.get("k2")); -// Assert.assertNull(h4map.get("k3")); - Assert.assertEquals("v2", h4map.get("k2")); - Assert.assertEquals("v3", h4map.get("k3")); - -// HazelcastInstance h5 = create("false", 9005, 9003, 9004); - HazelcastInstance h5 = create("54328", 9005); - -// Assert.assertEquals("v2", h4map.get("k2")); -// Assert.assertEquals("v3", h4map.get("k3")); - - IMap<Object, Object> h5map = h5.getMap("mymap"); - Assert.assertEquals("v2", h5map.get("k2")); - Assert.assertEquals("v3", h5map.get("k3")); - - h1.shutdown(); - - Assert.assertEquals("v2", h2map.get("k2")); - Assert.assertEquals("v3", h2map.get("k3")); - Assert.assertEquals("v2", h3map.get("k2")); - Assert.assertEquals("v3", h3map.get("k3")); - Assert.assertEquals("v2", h4map.get("k2")); - Assert.assertEquals("v3", h4map.get("k3")); - - h3map.put("key1a", "bla1a"); - - Assert.assertEquals("bla1a", h2map.get("key1a")); - Assert.assertEquals("bla1a", h3map.get("key1a")); - Assert.assertEquals("bla1a", h4map.get("key1a")); - -// HazelcastInstance h4 = create(true, 9004, 9003); -// HazelcastInstance h5 = create(true, 9005); -// IMap<Object, Object> h5map = h5.getMap("mymap"); -// Assert.assertEquals("bla1", h5map.get("key1")); - -// HazelcastInstance h6 = create(false, 9006, 9005); -// IMap<Object, Object> h6map = h6.getMap("mymap"); -// Assert.assertEquals("bla1", h6map.get("key1")); - - } - - private HazelcastInstance create(String multicast, int listenPort, int... connectPorts) throws UnknownHostException { - Config config = new XmlConfigBuilder().build(); - config.setPort(listenPort); - config.setPortAutoIncrement(false); - - // declare the interface Hazelcast should bind to - config.getNetworkConfig().getInterfaces().clear(); - config.getNetworkConfig().getInterfaces().addInterface(InetAddress.getLocalHost().getHostAddress()); - config.getNetworkConfig().getInterfaces().setEnabled(true); - - if ("false".equals(multicast)) { - config.getNetworkConfig().getJoin().getMulticastConfig().setEnabled(false); - } else { - config.getNetworkConfig().getJoin().getMulticastConfig().setMulticastPort(Integer.parseInt(multicast)); - } - - if (connectPorts.length > 0) { - TcpIpConfig tcpconfig = config.getNetworkConfig().getJoin().getTcpIpConfig(); - tcpconfig.setEnabled(true); - - List<Address> lsMembers = tcpconfig.getAddresses(); - lsMembers.clear(); - for (int p : connectPorts) { - lsMembers.add(new Address(InetAddress.getLocalHost(), p)); - } - } - - return Hazelcast.newHazelcastInstance(config); - } - -} diff --git a/sca-java-2.x/trunk/modules/pom.xml b/sca-java-2.x/trunk/modules/pom.xml index c7ab3ae107..f694a3cf5f 100644 --- a/sca-java-2.x/trunk/modules/pom.xml +++ b/sca-java-2.x/trunk/modules/pom.xml @@ -82,8 +82,6 @@ <module>domain-hazelcast</module> <module>domain-node</module> <module>endpoint-tribes</module> - <module>endpoint-hazelcast</module> - <module>endpoint-hazelcast-client</module> <module>extensibility</module> <module>extensibility-equinox</module> <module>host-http</module> diff --git a/sca-java-2.x/trunk/pom.xml b/sca-java-2.x/trunk/pom.xml index 52b727c2ae..69fe5f1853 100644 --- a/sca-java-2.x/trunk/pom.xml +++ b/sca-java-2.x/trunk/pom.xml @@ -693,8 +693,7 @@ org.apache.tuscany.sca.assembly:org.apache.tuscany.sca.assembly.builder:org.apac <module>modules/databinding-jaxb</module> <module>modules/deployment</module> <module>modules/domain-node</module> - <module>modules/endpoint-hazelcast</module> - <module>modules/endpoint-hazelcast-client</module> + <module>modules/domain-hazelcast</module> <module>modules/extensibility</module> <module>modules/host-http</module> <module>modules/host-jetty</module> diff --git a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml b/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml index bacd95d894..6413273d55 100644 --- a/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/callback-two-nodes/pom.xml @@ -72,7 +72,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> + <artifactId>tuscany-domain-hazelcast</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> diff --git a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml index aa08bfde8e..b1dcb1b327 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/binding-sca-hazelcast/pom.xml @@ -36,12 +36,7 @@ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
+ <artifactId>tuscany-domain-hazelcast</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml index 30d509ecc6..30af1a9c61 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast-client/pom.xml @@ -41,12 +41,7 @@ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
+ <artifactId>tuscany-domain-hazelcast</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml index 4d5fb61d2b..4e00d0759b 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/one-jvm-hazelcast/pom.xml @@ -46,12 +46,7 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-endpoint-hazelcast</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-hazelcast-runtime</artifactId> + <artifactId>tuscany-domain-hazelcast</artifactId> <version>2.0-SNAPSHOT</version> </dependency> <dependency> diff --git a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml index 05fec4cb54..8f5a4d3ed8 100644 --- a/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/nodes/two-nodes-two-vms-hazelcast/pom.xml @@ -36,16 +36,11 @@ </dependency-->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
+ <artifactId>tuscany-domain-hazelcast</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>itest-nodes-helloworld-iface</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
diff --git a/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml b/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml index f807c9883f..9051e82584 100644 --- a/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml +++ b/sca-java-2.x/trunk/testing/itest/scaclient-api-remote/pom.xml @@ -37,21 +37,9 @@ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-hazelcast-runtime</artifactId>
+ <artifactId>tuscany-domain-hazelcast</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-endpoint-hazelcast-client</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
|