You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2006/08/24 10:50:17 UTC
svn commit: r434341 - in
/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi:
RMIBinding.java RMIBindingBuilder.java RMIBindingLoader.java
RMIInvoker.java RMIReference.java RMIService.java RemoteMethodHandler.java
Author: antelder
Date: Thu Aug 24 01:50:16 2006
New Revision: 434341
URL: http://svn.apache.org/viewvc?rev=434341&view=rev
Log:
Apply patch for TUSCANY-611
No code changes, just format the code - Tuscany-RMI-Binding-Formatted-Aug-15-1.diff
Thanks for the patch Venkat
Modified:
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIReference.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RemoteMethodHandler.java
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBinding.java Thu Aug 24 01:50:16 2006
@@ -22,7 +22,7 @@
/**
* Represents a binding to an RMI service.
- *
+ *
* @version $Rev$ $Date$
*/
public class RMIBinding extends Binding {
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingBuilder.java Thu Aug 24 01:50:16 2006
@@ -17,9 +17,9 @@
* under the License.
*/
package org.apache.tuscany.binding.rmi;
-
+
import java.rmi.Remote;
-
+
import org.apache.tuscany.spi.builder.InvalidServiceInterfaceException;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObject;
@@ -44,7 +44,7 @@
String name = boundServiceDefinition.getName();
Class<Remote> service = getServiceInterface(boundServiceDefinition);
String uri = boundServiceDefinition.getBinding().getURI();
-
+
RMIService rmiService = new RMIService<Remote>(name, parent, wireService, uri, service);
return rmiService;
}
@@ -65,14 +65,10 @@
String name = boundReferenceDefinition.getName();
String uri = boundReferenceDefinition.getBinding().getURI();
Class<?> interfaze = boundReferenceDefinition.getServiceContract().getInterfaceClass();
- RMIReference rmiReference = new RMIReference(name,
- parent,
- wireService,
- uri,
- boundReferenceDefinition.getServiceContract().getInterfaceClass());
-
+ RMIReference rmiReference = new RMIReference(name, parent, wireService, uri, boundReferenceDefinition
+ .getServiceContract().getInterfaceClass());
-return rmiReference;
+ return rmiReference;
}
}
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIBindingLoader.java Thu Aug 24 01:50:16 2006
@@ -33,13 +33,14 @@
/**
* Loader for handling <binding.rmi> elements.
- *
+ *
* @version $Rev$ $Date$
*/
@Scope("MODULE")
public class RMIBindingLoader extends LoaderExtension<RMIBinding> {
- public static final QName BINDING_RMI = new QName("http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT",
- "binding.rmi");
+ public static final QName BINDING_RMI =
+ new QName("http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT",
+ "binding.rmi");
public RMIBindingLoader(@Autowire LoaderRegistry registry) {
super(registry);
@@ -49,11 +50,12 @@
return BINDING_RMI;
}
- public RMIBinding load(CompositeComponent parent,
- XMLStreamReader reader,
- DeploymentContext deploymentContext)
- throws XMLStreamException, LoaderException {
- String uri = reader.getAttributeValue(null, "uri");
+ public RMIBinding load(CompositeComponent parent,
+ XMLStreamReader reader,
+ DeploymentContext deploymentContext) throws XMLStreamException,
+ LoaderException {
+ String uri = reader.getAttributeValue(null,
+ "uri");
LoaderUtil.skipToEndElement(reader);
RMIBinding binding = new RMIBinding();
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIInvoker.java Thu Aug 24 01:50:16 2006
@@ -28,11 +28,12 @@
/**
* Invoke an RMI reference.
- *
+ *
* @version $Rev$ $Date$
*/
public class RMIInvoker implements TargetInvoker {
private final Method remoteMethod;
+
private final Remote proxy;
public RMIInvoker(Remote proxy, Method remoteMethod) {
@@ -40,7 +41,7 @@
this.remoteMethod = remoteMethod;
this.proxy = proxy;
}
-
+
public Message invoke(Message msg) throws InvocationRuntimeException {
try {
Object resp = invokeTarget(msg.getBody());
@@ -53,7 +54,8 @@
public Object invokeTarget(Object payload) throws InvocationTargetException {
try {
- return remoteMethod.invoke(proxy, (Object[]) payload);
+ return remoteMethod.invoke(proxy,
+ (Object[]) payload);
} catch (IllegalAccessException e) {
// the method we are passed must be accessible
throw new AssertionError(e);
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIReference.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIReference.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIReference.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIReference.java Thu Aug 24 01:50:16 2006
@@ -34,14 +34,13 @@
* @version $Rev$ $Date$
*/
public class RMIReference<T> extends ReferenceExtension<T> {
- private final String uri;
+ private final String uri;
public RMIReference(String name,
CompositeComponent<?> parent,
WireService wireService,
- String uri,
- Class<T> service)
- {
+ String uri,
+ Class<T> service) {
super(name, service, parent, wireService);
setInterface(service);
this.uri = uri;
@@ -50,7 +49,8 @@
public TargetInvoker createTargetInvoker(Method operation) {
try {
Remote proxy = getProxy();
- Method remoteMethod = proxy.getClass().getMethod(operation.getName(), operation.getParameterTypes());
+ Method remoteMethod = proxy.getClass().getMethod(operation.getName(),
+ operation.getParameterTypes());
return new RMIInvoker(proxy, remoteMethod);
} catch (NoSuchMethodException e) {
throw new NoRemoteMethodException(operation.toString(), e);
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java Thu Aug 24 01:50:16 2006
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.binding.rmi;
+package org.apache.tuscany.binding.rmi;
-import java.net.MalformedURLException;
+import java.net.MalformedURLException;
import java.rmi.AlreadyBoundException;
import java.rmi.Naming;
import java.rmi.NotBoundException;
@@ -33,23 +33,27 @@
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ServiceExtension;
import org.apache.tuscany.spi.wire.WireService;
-
+
/**
* @version $Rev$ $Date$
*/
-public class RMIService<T extends Remote> extends ServiceExtension<T>
-{
+public class RMIService<T extends Remote> extends ServiceExtension<T> {
public static final String URI_PREFIX = "//localhost";
+
public static final String SLASH = "/";
- public static final String COLON = ":";
+
+ public static final String COLON = ":";
+
private final String uri;
- private Class service = null;
- int rmiPort = 1099;
- public RMIService(String name,
- CompositeComponent parent,
- WireService wireService,
- String uri,
+ private Class service;
+
+ private int rmiPort = 1099;
+
+ public RMIService(String name,
+ CompositeComponent parent,
+ WireService wireService,
+ String uri,
Class<T> service) {
super(name, service, parent, wireService);
this.uri = uri;
@@ -60,11 +64,11 @@
super.start();
Remote rmiProxy = createProxy();//createRmiService();
- try
- {
+ try {
startRMIRegistry();
- bindRmiService(uri, rmiProxy);
-
+ bindRmiService(uri,
+ rmiProxy);
+
} catch (AlreadyBoundException e) {
throw new NoRemoteServiceException(e);
} catch (RemoteException e) {
@@ -86,75 +90,66 @@
}
super.stop();
}
-
- private Remote createRmiService()
- {
+
+ private Remote createRmiService() {
Enhancer enhancer = new Enhancer();
enhancer.setSuperclass(UnicastRemoteObject.class);
//Class remoteIfc = RemoteInterfaceGenerator.generateRemoteInterface(serviceInterface, cl);
enhancer.setInterfaces(new Class[]{service});
enhancer.setCallback(new RemoteMethodHandler(getHandler()));
-
- return (Remote)enhancer.create();
+
+ return (Remote) enhancer.create();
}
-
- private void bindRmiService(String uri, Remote rmiService) throws MalformedURLException,
- RemoteException,
- AlreadyBoundException
- {
+
+ private void bindRmiService(String uri, Remote rmiService) throws MalformedURLException,
+ RemoteException,
+ AlreadyBoundException {
StringBuffer serverUri = new StringBuffer(URI_PREFIX);
-
+
serverUri.append(COLON);
serverUri.append(rmiPort);
serverUri.append(SLASH);
serverUri.append(uri);
-
- Naming.bind(uri.toString(), rmiService);
+
+ Naming.bind(uri.toString(),
+ rmiService);
System.out.println("RMI srevice started - " + uri.toString());
-
- }
+ }
//how will you stop the registry... no APIs for that...
- private void startRMIRegistry() throws RemoteException
- {
- try
- {
+ private void startRMIRegistry() throws RemoteException {
+ try {
Registry registry = LocateRegistry.createRegistry(rmiPort);
- }
- catch ( Exception e )
- {
+ } catch (Exception e) {
LocateRegistry.getRegistry(rmiPort);
}
}
-
- protected T createProxy()
- {
+
+ protected T createProxy() {
//InvocationHandler handler = new RMIInvocationHandler(getHandler());
return interfaze.cast(createRmiService());
}
-
-
/*protected Remote createProxy()
- {
-=======
- protected T createProxy() {
->>>>>>> .r429120
- InvocationHandler handler = new RMIInvocationHandler(getHandler());
- return interfaze.cast(Proxy.newProxyInstance(interfaze.getClassLoader(), new Class[]{interfaze}, handler));
- }
-
- private static class RMIInvocationHandler implements InvocationHandler {
- private final WireInvocationHandler wireHandler;
-
- public RMIInvocationHandler(WireInvocationHandler wireHandler) {
- this.wireHandler = wireHandler;
- }
-
- public Object invoke(Object object, Method method, Object[] objects) throws Throwable {
- return wireHandler.invoke(method, objects);
- }
- }*/
+ {
+ =======
+ protected T createProxy() {
+ >>>>>>> .r429120
+ InvocationHandler handler = new RMIInvocationHandler(getHandler());
+ return interfaze.cast(Proxy.newProxyInstance(interfaze.getClassLoader(), new Class[]{interfaze}, handler));
+ }
+
+ private static class RMIInvocationHandler implements InvocationHandler {
+ private final WireInvocationHandler wireHandler;
+
+ public RMIInvocationHandler(WireInvocationHandler wireHandler) {
+ this.wireHandler = wireHandler;
+ }
+
+ public Object invoke(Object object, Method method, Object[] objects) throws Throwable {
+ return wireHandler.invoke(method, objects);
+ }
+ }*/
}
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RemoteMethodHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RemoteMethodHandler.java?rev=434341&r1=434340&r2=434341&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RemoteMethodHandler.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RemoteMethodHandler.java Thu Aug 24 01:50:16 2006
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.binding.rmi;
-
+package org.apache.tuscany.binding.rmi;
+
import java.lang.reflect.Method;
import net.sf.cglib.proxy.MethodInterceptor;
@@ -25,28 +25,24 @@
import org.apache.tuscany.spi.wire.WireInvocationHandler;
-public class RemoteMethodHandler implements MethodInterceptor
-{
+public class RemoteMethodHandler implements MethodInterceptor {
public static final String FINALIZE_METHOD = "finalize";
- private WireInvocationHandler wireHandler = null;
-
- public RemoteMethodHandler(WireInvocationHandler handler )
- {
+ private WireInvocationHandler wireHandler;
+
+ public RemoteMethodHandler(WireInvocationHandler handler) {
this.wireHandler = handler;
}
-
- public Object intercept(Object object, Method method, Object[] args, MethodProxy methodProxy) throws Throwable
- {
- //TO BE FIXED: don't know why it hangs for the finalize method... so blocking it for now
- if ( !method.getName().equals(FINALIZE_METHOD) )
- {
- return wireHandler.invoke(method, args);
+ public Object intercept(Object object, Method method, Object[] args, MethodProxy methodProxy) throws Throwable {
+ // TO BE FIXED: don't know why it hangs for the finalize method... so blocking it for now
+ if (!method.getName().equals(FINALIZE_METHOD)) {
+ return wireHandler.invoke(method,
+ args);
}
- return methodProxy.invoke(object, args);
+ return methodProxy.invoke(object,
+ args);
//return null;
}
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org