[jboss-remoting-commits] JBoss Remoting SVN: r3994 - in remoting3/trunk: api/src/main/java/org/jboss/cx/remoting/spi/wrapper and 2 other directories.

[jboss-remoting-commits at lists.jboss.org]

Author: david.lloyd at jboss.com
Date: 2008-04-15 22:24:45 -0400 (Tue, 15 Apr 2008)
New Revision: 3994

Modified:
   remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java
   remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientWrapper.java
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealClient.java
   remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundClient.java
   remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java
Log:
JBREM-896 - associate a classloader with a client

Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java	2008-04-16 02:16:32 UTC (rev 3993)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java	2008-04-16 02:24:45 UTC (rev 3994)
@@ -59,9 +59,11 @@
      */
     ConcurrentMap<Object, Object> getAttributes();
 
-    void close() throws RemotingException;
-
-    void closeImmediate() throws RemotingException;
-
-    void addCloseHandler(final CloseHandler<Client<I, O>> closeHandler);
+    /**
+     * Get the classloader associated with this client.  This is the classloader that will be used to resolve any
+     * remote classes.
+     *
+     * @return the classloader
+     */
+    ClassLoader getClassLoader();
 }

Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientWrapper.java	2008-04-16 02:16:32 UTC (rev 3993)
+++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientWrapper.java	2008-04-16 02:24:45 UTC (rev 3994)
@@ -49,4 +49,7 @@
         return delegate.getAttributes();
     }
 
+    public ClassLoader getClassLoader() {
+        return delegate.getClassLoader();
+    }
 }

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealClient.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealClient.java	2008-04-16 02:16:32 UTC (rev 3993)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractRealClient.java	2008-04-16 02:24:45 UTC (rev 3994)
@@ -8,15 +8,24 @@
 public abstract class AbstractRealClient<I, O> implements Client<I, O> {
 
     private ClientResponder<I,O> clientResponder;
+    private ClassLoader classLoader;
 
-    protected AbstractRealClient(final ClientResponder<I, O> clientResponder) {
+    protected AbstractRealClient(final ClientResponder<I, O> clientResponder, final ClassLoader classLoader) {
         if (clientResponder == null) {
             throw new NullPointerException("clientResponder is null");
         }
+        if (classLoader == null) {
+            throw new NullPointerException("classLoader is null");
+        }
         this.clientResponder = clientResponder;
+        this.classLoader = classLoader;
     }
 
     protected ClientResponder<I, O> getContextServer() {
         return clientResponder;
     }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
 }

Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundClient.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundClient.java	2008-04-16 02:16:32 UTC (rev 3993)
+++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundClient.java	2008-04-16 02:24:45 UTC (rev 3994)
@@ -76,7 +76,7 @@
     public final class UserClient extends AbstractRealClient<I, O> {
 
         private UserClient() {
-            super(clientResponder);
+            super(clientResponder, Thread.currentThread().getContextClassLoader() /* TODO */);
         }
 
         private void doClose(final boolean immediate, final boolean cancel) throws RemotingException {

Modified: remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java
===================================================================
--- remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java	2008-04-16 02:16:32 UTC (rev 3993)
+++ remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java	2008-04-16 02:24:45 UTC (rev 3994)
@@ -1,16 +1,15 @@
 package org.jboss.cx.remoting;
 
-import java.net.URI;
+import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
-import java.io.IOException;
-import org.jboss.cx.remoting.log.Logger;
+import java.util.concurrent.Executors;
 import org.jboss.cx.remoting.core.CoreEndpoint;
 import org.jboss.cx.remoting.core.protocol.LocalProtocolHandlerFactory;
 import org.jboss.cx.remoting.jrpp.JrppProtocolSupport;
 import org.jboss.cx.remoting.jrpp.JrppServer;
+import org.jboss.cx.remoting.log.Logger;
 import org.jboss.cx.remoting.util.AttributeMap;
 
 /**
@@ -69,14 +68,6 @@
         return jrppServer;
     }
 
-    public static Session createEndpointAndSession(String endpointName, URI remoteUri, final String userName, final char[] password) throws RemotingException {
-        return null;
-    }
-
-    public static <I, O> ClientSource<I, O> createEndpointAndOpenService(String endpointName, URI remoteUri, String userName, char[] password, Class<I> requestType, Class<O> replyType, String serviceType, String serviceGroupName) throws RemotingException {
-        return null;
-    }
-
     // privates
 
     private Remoting() { /* empty */ }