From b8d8b9f78193c48ef63601da154d9ff092ae1dc3 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Sun, 21 Sep 2008 21:29:53 +0000 Subject: 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 --- .../apache/tuscany/sca/binding/rmi/RMIBinding.java | 37 +++- .../sca/binding/rmi/RMIBindingActivator.java | 58 ------ .../sca/binding/rmi/RMIReferenceInvoker.java | 88 --------- .../binding/rmi/RMIReferenceInvokerFactory.java | 65 ------- .../apache/tuscany/sca/binding/rmi/RMIService.java | 199 --------------------- 5 files changed, 35 insertions(+), 412 deletions(-) delete mode 100644 branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java delete mode 100644 branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java delete mode 100644 branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java delete mode 100644 branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java (limited to 'branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi') diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java b/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java index 906e0df652..fd9cc016bd 100644 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java +++ b/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java @@ -18,18 +18,20 @@ */ package org.apache.tuscany.sca.binding.rmi; -import org.apache.tuscany.sca.extension.helper.utils.AbstractBinding; +import org.apache.tuscany.sca.assembly.Binding; /** * Represents a binding to an RMI service. * * @version $Rev$ $Date$ */ -public class RMIBinding extends AbstractBinding { +public class RMIBinding implements Binding { private String host; private String port; private String serviceName; + private String uri; + private String name; /** * @return the host name of the RMI Service @@ -74,4 +76,35 @@ public class RMIBinding extends AbstractBinding { public void setServiceName(String rmiServiceName) { this.serviceName = rmiServiceName; } + + public String getURI() { + return uri; + } + + public void setURI(String uri) { + this.uri = uri; + } + + public void setName(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public boolean isUnresolved() { + // The binding is always resolved + return false; + } + + public void setUnresolved(boolean unresolved) { + // The binding is always resolved + } + + @Override + public Object clone() throws CloneNotSupportedException { + // TODO Auto-generated method stub + return super.clone(); + } } diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java b/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.java deleted file mode 100644 index 1be70f57f7..0000000000 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBindingActivator.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.rmi; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.extension.helper.BindingActivator; -import org.apache.tuscany.sca.extension.helper.ComponentLifecycle; -import org.apache.tuscany.sca.extension.helper.InvokerFactory; -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.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - -/** - * Binding Activator for the RMI Binding. - * - * @version $Rev$ $Date$ - */ -public class RMIBindingActivator implements BindingActivator { - - private RMIHost rmiHost; - - public RMIBindingActivator(RMIHostExtensionPoint rmiHosts) { - this.rmiHost = new ExtensibleRMIHost(rmiHosts); - } - - public Class getBindingClass() { - return RMIBinding.class; - } - - public InvokerFactory createInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, Binding b, RMIBinding binding) { - return new RMIReferenceInvokerFactory(rc, rcr, binding, rmiHost); - } - - public ComponentLifecycle createService(RuntimeComponent rc, RuntimeComponentService rcs, Binding b, RMIBinding binding) { - return new RMIService(rc, rcs, binding, rmiHost); - } - -} 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/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java deleted file mode 100644 index 069ed4a070..0000000000 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java +++ /dev/null @@ -1,88 +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.rmi; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.rmi.Remote; - -import org.apache.tuscany.sca.host.rmi.RMIHost; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.invocation.DataExchangeSemantics; - -/** - * Invoker for RMI References. - * - * @version $Rev$ $Date$ - */ -public class RMIReferenceInvoker implements Invoker, DataExchangeSemantics { - - private RMIHost rmiHost; - private String host; - private String port; - private String svcName; - private Method remoteMethod; - private Remote proxy; - - public RMIReferenceInvoker(RMIHost rmiHost, String host, String port, String svcName, Method remoteMethod) { - this.rmiHost = rmiHost; - this.remoteMethod = remoteMethod; - this.host = host; - this.port = port; - this.svcName = svcName; - } - - public Message invoke(Message msg) { - try { - - Object[] args = msg.getBody(); - Object resp = invokeTarget(args); - msg.setBody(resp); - - } catch (InvocationTargetException e) { - msg.setFaultBody(e.getCause()); - } catch (Throwable e) { - msg.setFaultBody(e); - } - - return msg; - } - - public Object invokeTarget(final Object payload) throws InvocationTargetException, SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException { - if (proxy == null) { - proxy = rmiHost.findService(host, port, svcName); - // proxy = Naming.lookup(serviceURI); - } - - remoteMethod = proxy.getClass().getMethod(remoteMethod.getName(), remoteMethod.getParameterTypes()); - - if (payload != null && !payload.getClass().isArray()) { - return remoteMethod.invoke(proxy, payload); - } else { - return remoteMethod.invoke(proxy, (Object[])payload); - } - } - - public boolean allowsPassByReference() { - // RMI always pass by value - return true; - } - -} diff --git a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java b/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java deleted file mode 100644 index c67bd910ba..0000000000 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java +++ /dev/null @@ -1,65 +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.rmi; - -import java.lang.reflect.Method; - -import org.apache.tuscany.sca.extension.helper.InvokerFactory; -import org.apache.tuscany.sca.host.rmi.RMIHost; -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.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.ServiceRuntimeException; - -/** - * InvokerFactory that creates RMIReferenceInvoker instances for the - * RMIBinding. - * - * @version $Rev$ $Date$ - */ -public class RMIReferenceInvokerFactory implements InvokerFactory { - - RuntimeComponentReference reference; - RMIHost rmiHost; - RMIBinding binding; - - public RMIReferenceInvokerFactory(RuntimeComponent rc, RuntimeComponentReference rcr, RMIBinding binding, RMIHost rmiHost) { - this.reference = rcr; - this.rmiHost = rmiHost; - this.binding = binding; - } - - public Invoker createInvoker(Operation operation) { - try { - - Class iface = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass(); - Method remoteMethod = JavaInterfaceUtil.findMethod(iface, operation); - - return new RMIReferenceInvoker(rmiHost, binding.getHost(), binding.getPort(), binding.getServiceName(), remoteMethod); - - } catch (NoSuchMethodException e) { - throw new ServiceRuntimeException(operation.toString(), e); - } - } - -} 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/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java deleted file mode 100644 index 25beb58820..0000000000 --- a/branches/sca-equinox/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java +++ /dev/null @@ -1,199 +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.rmi; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.rmi.Remote; -import java.rmi.server.UnicastRemoteObject; -import java.security.AccessController; -import java.security.PrivilegedExceptionAction; - -import net.sf.cglib.asm.ClassWriter; -import net.sf.cglib.asm.Constants; -import net.sf.cglib.asm.Type; -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.host.rmi.RMIHost; -import org.apache.tuscany.sca.host.rmi.RMIHostException; -import org.apache.tuscany.sca.interfacedef.Interface; -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.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.osoa.sca.ServiceRuntimeException; - -/** - * Implementation of a Service for the RMIBinding. - * - * @version $Rev$ $Date$ - */ -public class RMIService implements ComponentLifecycle { - - private RuntimeComponent component; - private RuntimeComponentService service; - private RMIBinding binding; - private RMIHost rmiHost; - private RuntimeWire wire; - - public RMIService(RuntimeComponent rc, RuntimeComponentService rcs, RMIBinding binding, RMIHost rmiHost) { - this.component = rc; - this.service = rcs; - this.binding = binding; - this.rmiHost = rmiHost; - } - - public void start() { - // URI uri = URI.create(component.getURI() + "/" + binding.getName()); - // binding.setURI(uri.toString()); - - wire = service.getRuntimeWire(binding); - Interface serviceInterface = service.getInterfaceContract().getInterface(); - - Remote rmiProxy = createRmiService(serviceInterface); - - try { - - rmiHost.registerService(binding.getServiceName(), getPort(binding.getPort()), rmiProxy); - - } catch (RMIHostException e) { - throw new ServiceRuntimeException(e); - } - } - - public void stop() { - } - - protected int getPort(String port) { - int portNumber = RMIHost.RMI_DEFAULT_PORT; - if (port != null && port.length() > 0) { - portNumber = Integer.decode(port); - } - return portNumber; - } - - protected Remote createRmiService(final Interface serviceInterface) { - Enhancer enhancer = new Enhancer(); - enhancer.setSuperclass(UnicastRemoteObject.class); - enhancer.setCallback(new MethodInterceptor() { - public Object intercept(Object arg0, Method method, Object[] args, MethodProxy arg3) throws Throwable { - try { - return invokeTarget(JavaInterfaceUtil.findOperation(method, serviceInterface.getOperations()), args); - } catch (InvocationTargetException e) { - final Throwable cause = e.getCause(); - for (Class declaredType : method.getExceptionTypes()) { - if (declaredType.isInstance(cause)) { - throw e; - } - } - - if (cause.getCause() != null) { - // TUSCANY-2545: don't inlcude nested cause object - AccessController.doPrivileged(new PrivilegedExceptionAction() { - public Object run() throws Exception { - Field field = Throwable.class.getDeclaredField("cause"); - field.setAccessible(true); - field.set(cause, null); - field.setAccessible(false); - return null; - } - }); - } - - throw cause; - } - } - }); - Class targetJavaInterface = getTargetJavaClass(serviceInterface); - if (!Remote.class.isAssignableFrom(targetJavaInterface)) { - RMIServiceClassLoader classloader = new RMIServiceClassLoader(getClass().getClassLoader()); - final byte[] byteCode = generateRemoteInterface(targetJavaInterface); - targetJavaInterface = classloader.defineClass(byteCode); - enhancer.setClassLoader(classloader); - } - enhancer.setInterfaces(new Class[] {targetJavaInterface}); - return (Remote)enhancer.create(); - } - - protected Object invokeTarget(Operation op, Object[] args) throws InvocationTargetException { - return wire.invoke(op, args); - } - - /** - * if the interface of the component whose serviceBindings must be exposed as RMI Service, does not - * implement java.rmi.Remote, then generate such an interface. This method will stop with just - * 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) { - String interfazeName = serviceInterface.getCanonicalName(); - ClassWriter cw = new ClassWriter(false); - - String simpleName = serviceInterface.getSimpleName(); - cw.visit(Constants.V1_5, Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT + Constants.ACC_INTERFACE, interfazeName - .replace('.', '/'), "java/lang/Object", new String[] {"java/rmi/Remote"}, simpleName + ".java"); - - StringBuffer argsAndReturn = null; - Method[] methods = serviceInterface.getMethods(); - for (Method method : methods) { - argsAndReturn = new StringBuffer("("); - Class[] paramTypes = method.getParameterTypes(); - Class returnType = method.getReturnType(); - - for (Class paramType : paramTypes) { - argsAndReturn.append(Type.getType(paramType)); - } - argsAndReturn.append(")"); - argsAndReturn.append(Type.getType(returnType)); - - cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT, - method.getName(), - argsAndReturn.toString(), - new String[] {"java/rmi/RemoteException"}, - null); - } - cw.visitEnd(); - return cw.toByteArray(); - } - - protected 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 - // Java Implementation - return ((JavaInterface)targetInterface).getJavaClass(); - } - - protected class RMIServiceClassLoader extends ClassLoader { - public RMIServiceClassLoader(ClassLoader parent) { - super(parent); - } - - public Class defineClass(byte[] byteArray) { - return defineClass(null, byteArray, 0, byteArray.length); - } - } -} -- cgit v1.2.3