You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/08/28 04:21:44 UTC
svn commit: r437510 - in /incubator/tuscany/java/sca:
bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/
bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/
runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/web...
Author: jmarino
Date: Sun Aug 27 19:21:42 2006
New Revision: 437510
URL: http://svn.apache.org/viewvc?rev=437510&view=rev
Log:
sourcheck and pmd cleanup
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/RMIHostImpl.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
incubator/tuscany/java/sca/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java
incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletLauncherListenerTestCase.java
incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHost.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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -20,7 +20,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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -18,6 +18,8 @@
import java.rmi.Remote;
+import org.osoa.sca.annotations.Constructor;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.component.SCAObject;
@@ -26,11 +28,10 @@
import org.apache.tuscany.spi.host.RMIHost;
import org.apache.tuscany.spi.model.BoundReferenceDefinition;
import org.apache.tuscany.spi.model.BoundServiceDefinition;
-import org.osoa.sca.annotations.Constructor;
/**
* Builds a Service or Reference for an RMI binding.
- *
+ *
* @version $Rev$ $Date$
*/
@@ -42,7 +43,7 @@
public RMIBindingBuilder(@Autowire RMIHost rHost) {
this.rmiHost = rHost;
}
-
+
protected Class<RMIBinding> getBindingType() {
return RMIBinding.class;
}
@@ -52,14 +53,11 @@
BoundServiceDefinition<RMIBinding> boundServiceDefinition,
DeploymentContext deploymentContext) {
- String name = boundServiceDefinition.getName();
Class intf = boundServiceDefinition.getServiceContract().getInterfaceClass();
- String host = boundServiceDefinition.getBinding().getHost();
- RMIService rmiService = new RMIService<Remote>(boundServiceDefinition.getName(), parent, wireService, rmiHost,
- boundServiceDefinition.getBinding().getHost(), boundServiceDefinition.getBinding().getPort(),
- boundServiceDefinition.getBinding().getServiceName(), intf);
- return rmiService;
+ return new RMIService<Remote>(boundServiceDefinition.getName(), parent, wireService, rmiHost,
+ boundServiceDefinition.getBinding().getHost(), boundServiceDefinition.getBinding().getPort(),
+ boundServiceDefinition.getBinding().getServiceName(), intf);
}
@SuppressWarnings({"unchecked"})
@@ -71,10 +69,9 @@
String port = boundReferenceDefinition.getBinding().getPort();
String svcName = boundReferenceDefinition.getBinding().getServiceName();
// Class<?> interfaze = boundReferenceDefinition.getServiceContract().getInterfaceClass();
- RMIReference rmiReference = new RMIReference(name, parent, wireService, rmiHost, host, port, svcName,
- boundReferenceDefinition.getServiceContract().getInterfaceClass());
- return rmiReference;
+ return new RMIReference(name, parent, wireService, rmiHost, host, port, svcName,
+ boundReferenceDefinition.getServiceContract().getInterfaceClass());
}
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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -20,6 +20,8 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.osoa.sca.annotations.Scope;
+
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.deployer.DeploymentContext;
@@ -27,20 +29,18 @@
import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.LoaderRegistry;
import org.apache.tuscany.spi.loader.LoaderUtil;
-import org.osoa.sca.annotations.Scope;
/**
* 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");
+ "http://tuscany.apache.org/xmlns/binding/rmi/1.0-SNAPSHOT", "binding.rmi");
- public RMIBindingLoader(@Autowire
- LoaderRegistry registry) {
+ public RMIBindingLoader(@Autowire LoaderRegistry registry) {
super(registry);
}
@@ -50,17 +50,11 @@
public RMIBinding load(CompositeComponent parent,
XMLStreamReader reader,
- DeploymentContext deploymentContext) throws XMLStreamException,
- LoaderException {
- String host = reader.getAttributeValue(null,
- "host");
- String port = reader.getAttributeValue(null,
- "port");
- String svcName = reader.getAttributeValue(null,
- "serviceName");
-
+ DeploymentContext deploymentContext) throws XMLStreamException, LoaderException {
+ String host = reader.getAttributeValue(null, "host");
+ String port = reader.getAttributeValue(null, "port");
+ String svcName = reader.getAttributeValue(null, "serviceName");
LoaderUtil.skipToEndElement(reader);
-
RMIBinding binding = new RMIBinding();
binding.setHost(host);
binding.setPort(port);
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIHostImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIHostImpl.java?rev=437510&r1=437509&r2=437510&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIHostImpl.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIHostImpl.java Sun Aug 27 19:21:42 2006
@@ -17,18 +17,19 @@
package org.apache.tuscany.binding.rmi;
import java.rmi.AlreadyBoundException;
-import java.rmi.RMISecurityManager;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
-import java.util.Hashtable;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
-import org.apache.tuscany.spi.host.RMIHost;
-import org.apache.tuscany.spi.host.RemoteServiceException;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Scope;
+import org.apache.tuscany.spi.host.RMIHost;
+import org.apache.tuscany.spi.host.RemoteServiceException;
+
/**
* This class provides an implementation for the RMI Host SPIs
*/
@@ -36,10 +37,10 @@
public class RMIHostImpl implements RMIHost {
// map of RMI registries started and running
- private Hashtable<String, Registry> rmiRegistries;
+ private Map<String, Registry> rmiRegistries;
public RMIHostImpl() {
- rmiRegistries = new Hashtable<String, Registry>();
+ rmiRegistries = new ConcurrentHashMap<String, Registry>();
/*if (System.getSecurityManager() == null) {
System.setSecurityManager(new RMISecurityManager());
}*/
@@ -50,16 +51,15 @@
}
public void registerService(String serviceName, int port, Remote serviceObject) throws RemoteServiceException {
- Registry registry = null;
-
+ Registry registry;
try {
- if ((registry = rmiRegistries.get(Integer.toString(port))) == null) {
+ registry = rmiRegistries.get(Integer.toString(port));
+ if (registry == null) {
registry = LocateRegistry.createRegistry(port);
rmiRegistries.put(Integer.toString(port),
- registry);
+ registry);
}
- registry.bind(serviceName,
- serviceObject);
+ registry.bind(serviceName, serviceObject);
} catch (AlreadyBoundException e) {
throw new RemoteServiceException(e);
} catch (RemoteException e) {
@@ -69,19 +69,17 @@
}
public void registerService(String serviceName, Remote serviceObject) throws RemoteServiceException {
- registerService(serviceName,
- RMI_DEFAULT_PORT,
- serviceObject);
+ registerService(serviceName, RMI_DEFAULT_PORT, serviceObject);
}
public void unregisterService(String serviceName, int port) throws RemoteServiceException {
- Registry registry = null;
+ Registry registry;
try {
- if ((registry = rmiRegistries.get(Integer.toString(port))) == null) {
+ registry = rmiRegistries.get(Integer.toString(port));
+ if (registry == null) {
registry = LocateRegistry.createRegistry(port);
- rmiRegistries.put(Integer.toString(port),
- registry);
+ rmiRegistries.put(Integer.toString(port), registry);
}
registry.unbind(serviceName);
} catch (Exception e) {
@@ -92,20 +90,20 @@
public void unregisterService(String serviceName) throws RemoteServiceException {
unregisterService(serviceName,
- RMI_DEFAULT_PORT);
+ RMI_DEFAULT_PORT);
}
public Remote findService(String host, String port, String svcName) throws RemoteServiceException {
- Registry registry = null;
+ Registry registry;
Remote remoteService = null;
host = (host == null || host.length() <= 0) ? "localhost" : host;
- int portNumber = (port == null || port.length() <= 0) ? RMI_DEFAULT_PORT : Integer.decode(port).intValue();
+ int portNumber = (port == null || port.length() <= 0) ? RMI_DEFAULT_PORT : Integer.decode(port);
try {
registry = LocateRegistry.getRegistry(host,
- portNumber);
+ portNumber);
if (registry != null) {
remoteService = registry.lookup(svcName);
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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -28,20 +28,15 @@
/**
* Invoke an RMI reference.
- *
+ *
* @version $Rev$ $Date$
*/
public class RMIInvoker implements TargetInvoker {
private Method remoteMethod;
-
private String host;
-
private String port;
-
private String svcName;
-
private RMIHost rmiHost;
-
private Remote proxy;
/*@Constructor({"rmiHost", "host", "port", "svnName", "remoteMethod"})
@@ -81,13 +76,10 @@
public Object invokeTarget(Object payload) throws InvocationTargetException {
try {
if (proxy == null) {
- proxy = rmiHost.findService(host,
- port,
- svcName);
+ proxy = rmiHost.findService(host, port, svcName);
// proxy = Naming.lookup(serviceURI);
}
- return remoteMethod.invoke(proxy,
- (Object[]) payload);
+ return remoteMethod.invoke(proxy, (Object[]) payload);
} catch (RemoteServiceException 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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -59,24 +59,24 @@
(Class[]) operation.getParameterTypes());
return new RMIInvoker(proxy, remoteMethod);
*/
- Method remoteMethod = getInterface().getMethod(operation.getName(),
- (Class[]) operation.getParameterTypes());
+ Method remoteMethod =
+ getInterface().getMethod(operation.getName(), (Class[]) operation.getParameterTypes());
return new RMIInvoker(rmiHost, host, port, svcName, remoteMethod);
} catch (NoSuchMethodException e) {
- throw new NoRemoteMethodException(operation.toString(), e);
- }
- }
+ throw new NoRemoteMethodException(operation.toString(), e);
+ }
+ }
/*protected Remote getProxy() {
- try {
- // todo do we need to cache this result?
- return Naming.lookup(uri);
- } catch (NotBoundException e) {
- throw new NoRemoteServiceException(uri);
- } catch (MalformedURLException e) {
- throw new NoRemoteServiceException(uri);
- } catch (RemoteException e) {
- throw new NoRemoteServiceException(uri);
- }
- }*/
+ try {
+ // todo do we need to cache this result?
+ return Naming.lookup(uri);
+ } catch (NotBoundException e) {
+ throw new NoRemoteServiceException(uri);
+ } catch (MalformedURLException e) {
+ throw new NoRemoteServiceException(uri);
+ } catch (RemoteException e) {
+ throw new NoRemoteServiceException(uri);
+ }
+ }*/
}
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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -20,33 +20,28 @@
import java.rmi.Remote;
import java.rmi.server.UnicastRemoteObject;
-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 org.apache.tuscany.spi.component.CompositeComponent;
import org.apache.tuscany.spi.extension.ServiceExtension;
import org.apache.tuscany.spi.host.RMIHost;
import org.apache.tuscany.spi.host.RemoteServiceException;
import org.apache.tuscany.spi.wire.WireService;
+import net.sf.cglib.asm.ClassWriter;
+import net.sf.cglib.asm.Constants;
+import net.sf.cglib.asm.Type;
+import net.sf.cglib.proxy.Enhancer;
+
/**
* @version $Rev$ $Date$
*/
public class RMIService<T extends Remote> extends ServiceExtension<T> {
- public static final String URI_PREFIX = "//localhost";
+ public static final String URI_PREFIX = "//localhost";
public static final String SLASH = "/";
-
public static final String COLON = ":";
-
- private final String host;
-
+ //private final String host;
private final String port;
-
private final String serviceName;
-
private RMIHost rmiHost;
// need this member to morph the service interface to extend from Remote if it does not
@@ -67,7 +62,7 @@
this.serviceInterface = service;
this.rmiHost = rHost;
- this.host = host;
+ //this.host = host;
this.port = port;
this.serviceName = svcName;
}
@@ -79,8 +74,8 @@
try {
// startRMIRegistry();
rmiHost.registerService(serviceName,
- getPort(port),
- rmiProxy);
+ getPort(port),
+ rmiProxy);
// bindRmiService(uri,rmiProxy);
} catch (RemoteServiceException e) {
throw new NoRemoteServiceException(e);
@@ -114,7 +109,7 @@
private int getPort(String port) {
int portNumber = RMIHost.RMI_DEFAULT_PORT;
if (port != null && port.length() > 0) {
- portNumber = Integer.decode(port).intValue();
+ portNumber = Integer.decode(port);
}
return portNumber;
@@ -129,45 +124,32 @@
String interfazeName = serviceInterface.getCanonicalName();
ClassWriter cw = new ClassWriter(false);
- cw.visit(Constants.V1_5,
- Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT + Constants.ACC_INTERFACE,
- interfazeName.replace('.',
- '/'),
- "java/lang/Object",
- new String[]{"java/rmi/Remote"},
- serviceInterface.getSimpleName() + ".java");
+ 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 = new StringBuffer("(");
Method[] methods = serviceInterface.getMethods();
- for (int count = 0; count < methods.length; ++count) {
- Class[] paramTypes = methods[count].getParameterTypes();
- Class returnType = methods[count].getReturnType();
+ for (Method method : methods) {
+ Class[] paramTypes = method.getParameterTypes();
+ Class returnType = method.getReturnType();
- for (int paramCount = 0; paramCount < paramTypes.length; ++paramCount) {
- argsAndReturn.append(Type.getType(paramTypes[paramCount]));
+ for (Class paramType : paramTypes) {
+ argsAndReturn.append(Type.getType(paramType));
}
argsAndReturn.append(")");
argsAndReturn.append(Type.getType(returnType));
- cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT,
- methods[count].getName(),
- argsAndReturn.toString(),
- new String[]{"java/rmi/RemoteException"},
- null);
+ cw.visitMethod(Constants.ACC_PUBLIC + Constants.ACC_ABSTRACT, method.getName(), argsAndReturn.toString(),
+ new String[]{"java/rmi/RemoteException"}, null);
}
-
cw.visitEnd();
-
return cw.toByteArray();
}
private class RMIServiceClassLoader extends ClassLoader {
public Class defineClass(byte[] byteArray) {
- return defineClass(null,
- byteArray,
- 0,
- byteArray.length);
+ return defineClass(null, byteArray, 0, byteArray.length);
}
-
}
}
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=437510&r1=437509&r2=437510&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 Sun Aug 27 19:21:42 2006
@@ -18,11 +18,11 @@
import java.lang.reflect.Method;
+import org.apache.tuscany.spi.wire.WireInvocationHandler;
+
import net.sf.cglib.proxy.MethodInterceptor;
import net.sf.cglib.proxy.MethodProxy;
-import org.apache.tuscany.spi.wire.WireInvocationHandler;
-
public class RemoteMethodHandler implements MethodInterceptor {
public static final String FINALIZE_METHOD = "finalize";
@@ -40,8 +40,8 @@
// wired component's method signatures. Hence need to pull in the corresponding method from the
// component's service contract interface to make this invocation.
return wireHandler.invoke(compSvcIntf.getMethod(method.getName(),
- (Class[]) method.getParameterTypes()),
- args);
+ (Class[]) method.getParameterTypes()),
+ args);
}
}
Modified: incubator/tuscany/java/sca/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java?rev=437510&r1=437509&r2=437510&view=diff
==============================================================================
--- incubator/tuscany/java/sca/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java (original)
+++ incubator/tuscany/java/sca/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java Sun Aug 27 19:21:42 2006
@@ -1,16 +1,14 @@
-package org.apache.tuscany.binding.rmi;
-
-import helloworld.HelloWorldRmiService;
-import helloworld.HelloWorldService;
+package org.apache.tuscany.binding.rmi;
import org.apache.tuscany.test.SCATestCase;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
public class BindingTestCase extends SCATestCase {
- HelloWorldService helloWorldService;
+ //private HelloWorldService helloWorldService;
+ //private HelloWorldRmiService helloWorldRmiService;
- HelloWorldRmiService helloWorldRmiService;
+ public void testRmiService() {
+ // System.out.println(helloWorldRmiService.sayRmiHello("Tuscany World!"));
+ }
protected void setUp() throws Exception {
//addExtension("rmi.binding",
@@ -23,15 +21,12 @@
//CompositeContext context = CurrentCompositeContext.getContext();
//helloWorldRmiService = context.locateService(HelloWorldRmiService.class,
// "HelloWorldRmiServiceComponent");
-
- }
- public void testRmiService() {
- // System.out.println(helloWorldRmiService.sayRmiHello("Tuscany World!"));
}
+
protected void tearDown() throws Exception {
- //super.tearDown();
+// super.tearDown();
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletLauncherListenerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletLauncherListenerTestCase.java?rev=437510&r1=437509&r2=437510&view=diff
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletLauncherListenerTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/ServletLauncherListenerTestCase.java Sun Aug 27 19:21:42 2006
@@ -21,7 +21,6 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import org.apache.tuscany.spi.loader.LoaderException;
import org.apache.tuscany.spi.loader.MissingResourceException;
import junit.framework.TestCase;
@@ -72,7 +71,8 @@
}
/**
- * Verifies a {@link LoaderException} is thrown when the application SCDL is not found
+ * Verifies a {@link org.apache.tuscany.spi.loader.LoaderException} is thrown when the application SCDL is not
+ * found
* <p/>
* FIXME Uncomment this test case when the webapp project is fixed by removing the dependency on web services
*/
Modified: incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHost.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHost.java?rev=437510&r1=437509&r2=437510&view=diff
==============================================================================
--- incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHost.java (original)
+++ incubator/tuscany/java/sca/spi/src/main/java/org/apache/tuscany/spi/host/RMIHost.java Sun Aug 27 19:21:42 2006
@@ -21,24 +21,24 @@
import java.rmi.Remote;
/**
- * RMI Service hosting interface to be implemented by host environments that allows SCA Components
- * to register RMI Services to handle inbound service requests over RMI to SCA Components
+ * Implementations register RMI Services for handling inbound requests over RMI to SCA services
*/
public interface RMIHost {
- public static final int RMI_DEFAULT_PORT = 1099;
+
+ int RMI_DEFAULT_PORT = 1099;
// registers an RMI service with the given name and port
- public void registerService(String serviceName, int port, Remote serviceObject) throws RemoteServiceException;
+ void registerService(String serviceName, int port, Remote serviceObject) throws RemoteServiceException;
// registers an RMI service with the given name and default port (1099)
- public void registerService(String serviceName, Remote serviceObject) throws RemoteServiceException;
+ void registerService(String serviceName, Remote serviceObject) throws RemoteServiceException;
// unregister a service registered under the given service name and port number
- public void unregisterService(String serviceName, int port) throws RemoteServiceException;
+ void unregisterService(String serviceName, int port) throws RemoteServiceException;
// unregister a service registered under the given service name and defalut port number (1099)
- public void unregisterService(String serviceName) throws RemoteServiceException;
+ void unregisterService(String serviceName) throws RemoteServiceException;
// find a remote service hosted on the given host, port and service name
- public Remote findService(String host, String port, String svcName) throws RemoteServiceException;
+ Remote findService(String host, String port, String svcName) throws RemoteServiceException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org