diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-21 21:29:53 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-21 21:29:53 +0000 |
commit | b8d8b9f78193c48ef63601da154d9ff092ae1dc3 (patch) | |
tree | 398c3bab973b8c631345e31948eaa9192443e1ef /branches/sca-equinox/modules/binding-rmi-runtime/src/main/java | |
parent | 3276158c86aa729f1162d9267bba4010b205c3e1 (diff) |
Another fix for JIRA TUSCANY-2396, split binding-rmi into two modules, binding-rmi and binding-rmi-runtime.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@697616 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java (renamed from branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java) | 6 | ||||
-rw-r--r-- | branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java | 65 | ||||
-rw-r--r-- | branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java | 81 | ||||
-rw-r--r-- | branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java (renamed from branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java) | 29 |
4 files changed, 169 insertions, 12 deletions
diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java index 069ed4a070..62218a1d9c 100644 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java +++ b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.tuscany.sca.binding.rmi; +package org.apache.tuscany.sca.binding.rmi.provider; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -32,7 +32,7 @@ import org.apache.tuscany.sca.invocation.DataExchangeSemantics; * * @version $Rev$ $Date$ */ -public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics { +public class RMIBindingInvoker implements Invoker, DataExchangeSemantics { private RMIHost rmiHost; private String host; @@ -41,7 +41,7 @@ public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics { private Method remoteMethod; private Remote proxy; - public RMIReferenceInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) { + public RMIBindingInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) { this.rmiHost = rmiHost; this.remoteMethod = remoteMethod; this.host = host; diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java new file mode 100644 index 0000000000..11a03a4768 --- /dev/null +++ b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIBindingProviderFactory.java @@ -0,0 +1,65 @@ +/* + * 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.rmi.provider; + +import org.apache.tuscany.sca.binding.rmi.RMIBinding; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.rmi.ExtensibleRMIHost; +import org.apache.tuscany.sca.host.rmi.RMIHost; +import org.apache.tuscany.sca.host.rmi.RMIHostExtensionPoint; +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.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentReference; +import org.apache.tuscany.sca.runtime.RuntimeComponentService; + +/** + * RMI Binding Provider Factory + * + * @version $Rev$ $Date$ + */ +public class RMIBindingProviderFactory implements BindingProviderFactory<RMIBinding> { + + private RMIHost rmiHost; + + public RMIBindingProviderFactory(ExtensionPointRegistry extensionPoints) { + RMIHostExtensionPoint rmiHosts = extensionPoints.getExtensionPoint(RMIHostExtensionPoint.class); + this.rmiHost = new ExtensibleRMIHost(rmiHosts); + } + + public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, + RuntimeComponentReference reference, + RMIBinding binding) { + + return new RMIReferenceBindingProvider(component, reference, binding, rmiHost); + } + + public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, + RuntimeComponentService service, + RMIBinding binding) { + return new RMIServiceBindingProvider(component, service, binding, rmiHost); + } + + public Class<RMIBinding> getModelType() { + return RMIBinding.class; + } + +} diff --git a/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java new file mode 100644 index 0000000000..e5302c2a98 --- /dev/null +++ b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java @@ -0,0 +1,81 @@ +/* + * 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.rmi.provider; + +import java.lang.reflect.Method; + +import org.apache.tuscany.sca.binding.rmi.RMIBinding; +import org.apache.tuscany.sca.host.rmi.RMIHost; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.provider.ReferenceBindingProvider; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentReference; + +/** + * Implementation of the RMI Binding Provider for References + * + * @version $Rev$ $Date$ + */ +public class RMIReferenceBindingProvider implements ReferenceBindingProvider { + + private RuntimeComponentReference reference; + private RMIBinding binding; + private RMIHost rmiHost; + + public RMIReferenceBindingProvider(RuntimeComponent component, + RuntimeComponentReference reference, + RMIBinding binding, + RMIHost rmiHost) { + this.reference = reference; + this.binding = binding; + this.rmiHost = rmiHost; + } + + public InterfaceContract getBindingInterfaceContract() { + return reference.getInterfaceContract(); + } + + public Invoker createInvoker(Operation operation) { + Class<?> iface = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass(); + Method remoteMethod; + try { + remoteMethod = JavaInterfaceUtil.findMethod(iface, operation); + } catch (NoSuchMethodException e) { + throw new IllegalArgumentException(e); + } + + return new RMIBindingInvoker(rmiHost, binding.getHost(), binding.getPort(), binding.getServiceName(), remoteMethod); + } + + public void start() { + } + + public void stop() { + } + + public boolean supportsOneWayInvocation() { + return false; + } + +} diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java index 25beb58820..a239d924bb 100644 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java +++ b/branches/sca-equinox/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.tuscany.sca.binding.rmi; +package org.apache.tuscany.sca.binding.rmi.provider; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -34,13 +34,15 @@ import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; import net.sf.cglib.proxy.MethodProxy; -import org.apache.tuscany.sca.extension.helper.ComponentLifecycle; +import org.apache.tuscany.sca.binding.rmi.RMIBinding; import org.apache.tuscany.sca.host.rmi.RMIHost; import org.apache.tuscany.sca.host.rmi.RMIHostException; 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.java.JavaInterface; import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceUtil; +import org.apache.tuscany.sca.provider.ServiceBindingProvider; import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; import org.apache.tuscany.sca.runtime.RuntimeWire; @@ -51,7 +53,7 @@ import org.osoa.sca.ServiceRuntimeException; * * @version $Rev$ $Date$ */ -public class RMIService implements ComponentLifecycle { +public class RMIServiceBindingProvider implements ServiceBindingProvider { private RuntimeComponent component; private RuntimeComponentService service; @@ -59,7 +61,7 @@ public class RMIService implements ComponentLifecycle { private RMIHost rmiHost; private RuntimeWire wire; - public RMIService(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) { + public RMIServiceBindingProvider(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) { this.component = rc; this.service = rcs; this.binding = binding; @@ -87,7 +89,7 @@ public class RMIService implements ComponentLifecycle { public void stop() { } - protected int getPort(String port) { + private int getPort(String port) { int portNumber = RMIHost.RMI_DEFAULT_PORT; if (port != null && port.length() > 0) { portNumber = Integer.decode(port); @@ -95,7 +97,7 @@ public class RMIService implements ComponentLifecycle { return portNumber; } - protected Remote createRmiService(final Interface serviceInterface) { + private Remote createRmiService(final Interface serviceInterface) { Enhancer enhancer = new Enhancer(); enhancer.setSuperclass(UnicastRemoteObject.class); enhancer.setCallback(new MethodInterceptor() { @@ -138,7 +140,7 @@ public class RMIService implements ComponentLifecycle { return (Remote)enhancer.create(); } - protected Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException { + private Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException { return wire.invoke(op, args); } @@ -148,7 +150,7 @@ public class RMIService implements ComponentLifecycle { * generating the bytecode. Defining the class from the byte code must be the responsibility of the * caller of this method, since it requires a ClassLoader to be created to define and load this interface. */ - protected byte[] generateRemoteInterface(Class serviceInterface) { + private byte[] generateRemoteInterface(Class serviceInterface) { String interfazeName = serviceInterface.getCanonicalName(); ClassWriter cw = new ClassWriter(false); @@ -179,7 +181,7 @@ public class RMIService implements ComponentLifecycle { return cw.toByteArray(); } - protected Class<?> getTargetJavaClass(Interface targetInterface) { + private Class<?> getTargetJavaClass(Interface targetInterface) { // TODO: right now assume that the target is always a Java // Implementation. Need to figure out // how to generate Java Interface in cases where the target is not a @@ -196,4 +198,13 @@ public class RMIService implements ComponentLifecycle { return defineClass(null, byteArray, 0, byteArray.length); } } + + public InterfaceContract getBindingInterfaceContract() { + return service.getInterfaceContract(); + } + + public boolean supportsOneWayInvocation() { + return false; + } + } |