From: Tom E. <tom...@jb...> - 2005-12-18 19:55:53
|
User: telrod Date: 05/12/18 14:55:45 Modified: src/main/org/jboss/remoting InvokerRegistry.java Log: JBREM-253 - changed to use coyote connector by default instead of http server invoker. Also adding many fixes so now only ssl related http tests are failing within the tests suite. Revision Changes Path 1.13 +9 -8 JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java (In the diff below, changes in quantity of whitespace are not shown.) Index: InvokerRegistry.java =================================================================== RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/InvokerRegistry.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- InvokerRegistry.java 30 Aug 2005 19:37:40 -0000 1.12 +++ InvokerRegistry.java 18 Dec 2005 19:55:45 -0000 1.13 @@ -18,13 +18,12 @@ import java.util.Set; import org.jboss.logging.Logger; import org.jboss.remoting.transport.ClientInvoker; -import org.jboss.remoting.transport.multiplex.MultiplexClientInvoker; -import org.jboss.remoting.transport.multiplex.MultiplexServerInvoker; +import org.jboss.remoting.transport.coyote.CoyoteInvoker; import org.jboss.remoting.transport.http.HTTPClientInvoker; -import org.jboss.remoting.transport.http.HTTPServerInvoker; import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker; -import org.jboss.remoting.transport.http.ssl.HTTPSServerInvoker; import org.jboss.remoting.transport.local.LocalClientInvoker; +import org.jboss.remoting.transport.multiplex.MultiplexClientInvoker; +import org.jboss.remoting.transport.multiplex.MultiplexServerInvoker; import org.jboss.remoting.transport.rmi.RMIClientInvoker; import org.jboss.remoting.transport.rmi.RMIServerInvoker; import org.jboss.remoting.transport.servlet.ServletServerInvoker; @@ -40,7 +39,7 @@ * * @author <a href="mailto:jh...@vo...">Jeff Haynie</a> * @author <a href="mailto:te...@e2...">Tom Elrod</a> - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ */ public class InvokerRegistry { @@ -61,8 +60,10 @@ registerInvoker("socket", SocketClientInvoker.class, SocketServerInvoker.class); registerInvoker("sslsocket", SSLSocketClientInvoker.class, SSLSocketServerInvoker.class); registerInvoker("rmi", RMIClientInvoker.class, RMIServerInvoker.class); - registerInvoker("http", HTTPClientInvoker.class, HTTPServerInvoker.class); - registerInvoker("https", HTTPSClientInvoker.class, HTTPSServerInvoker.class); + registerInvoker("http", HTTPClientInvoker.class, CoyoteInvoker.class); + registerInvoker("https", HTTPSClientInvoker.class, CoyoteInvoker.class); +// registerInvoker("http", HTTPClientInvoker.class, HTTPServerInvoker.class); +// registerInvoker("https", HTTPSClientInvoker.class, HTTPSServerInvoker.class); registerInvoker("servlet", HTTPSClientInvoker.class, ServletServerInvoker.class); registerInvoker("multiplex", MultiplexClientInvoker.class, MultiplexServerInvoker.class); @@ -367,7 +368,7 @@ serverLocators.remove(invoker.getLocator()); if(clientLocators.get(locator) instanceof LocalClientInvoker) { - ClientInvoker clientInvoker = (ClientInvoker)clientLocators.remove(locator); + ClientInvoker clientInvoker = (ClientInvoker) clientLocators.remove(locator); if(clientInvoker != null) { clientInvoker.disconnect(); |