[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/config ...
Tom Elrod
tom.elrod at jboss.com
Wed Jul 12 00:49:52 EDT 2006
User: telrod
Date: 06/07/12 00:49:52
Modified: src/tests/org/jboss/test/remoting/transport/config
FactoryConfigTestCaseParent.java
FactoryConfigTestCaseSSLParent.java
Log:
JBREM-496 & JBREM-492 & JBREM-535 - changed invoker loading to use a client and server factory instead of loading classes directly. This allows users ability to plugin custom transport implementation with zero config. Also added config for forcing remote call when client and server within same jvm (which was able to do previously using BYVALUE config, but not any more). Also changed way to get hint if transport supports ssl to be provided by the transport factory instead of the transport itself.
Revision Changes Path
1.3 +25 -27 JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FactoryConfigTestCaseParent.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FactoryConfigTestCaseParent.java 21 Jun 2006 16:48:05 -0000 1.2
+++ FactoryConfigTestCaseParent.java 12 Jul 2006 04:49:52 -0000 1.3
@@ -22,25 +22,7 @@
package org.jboss.test.remoting.transport.config;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
-
import junit.framework.TestCase;
-
import org.jboss.logging.Logger;
import org.jboss.remoting.Client;
import org.jboss.remoting.InvocationRequest;
@@ -60,10 +42,26 @@
import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
/**
*
* @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
* <p>
* Copyright (c) Jun 13, 2006
* </p>
@@ -127,7 +125,7 @@
sconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf1);
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -185,7 +183,7 @@
cconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf3);
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
@@ -270,7 +268,7 @@
sconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf1);
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -329,7 +327,7 @@
cconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf3);
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
@@ -414,7 +412,7 @@
sconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf1);
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -466,7 +464,7 @@
cconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf2);
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
@@ -545,7 +543,7 @@
sconfig.put(Remoting.SOCKET_FACTORY_NAME, getUniqueCallbackSocketFactoryClass().getName());
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -588,7 +586,7 @@
cconfig.put(Remoting.SOCKET_FACTORY_NAME, getUniqueSocketFactoryClass().getName());
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
1.4 +24 -25 JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseSSLParent.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FactoryConfigTestCaseSSLParent.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseSSLParent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- FactoryConfigTestCaseSSLParent.java 22 Jun 2006 21:16:12 -0000 1.3
+++ FactoryConfigTestCaseSSLParent.java 12 Jul 2006 04:49:52 -0000 1.4
@@ -21,25 +21,6 @@
*/
package org.jboss.test.remoting.transport.config;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSocketFactory;
-
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.Remoting;
@@ -56,6 +37,24 @@
import org.jboss.remoting.transport.PortUtil;
import org.jboss.remoting.transport.http.ssl.HTTPSClientInvoker;
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import javax.management.ObjectName;
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLServerSocketFactory;
+import javax.net.ssl.SSLSocketFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
/**
*
* @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
@@ -92,7 +91,7 @@
sconfig.put(ServerInvoker.SERVER_SOCKET_FACTORY, serverSocketFactoryName);
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -143,7 +142,7 @@
cconfig.put(Remoting.CUSTOM_SOCKET_FACTORY, sf2);
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
@@ -220,7 +219,7 @@
HashMap sconfig = new HashMap();
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -268,7 +267,7 @@
HashMap cconfig = new HashMap();
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Put SSL parameters in config map.
cconfig.put(SSLSocketBuilder.REMOTING_SOCKET_USE_CLIENT_MODE, "true");
@@ -361,7 +360,7 @@
HashMap sconfig = new HashMap();
// Make callback Client use remote invoker.
- sconfig.put(InvokerLocator.BYVALUE, "true");
+ sconfig.put(InvokerLocator.FORCE_REMOTE, "true");
// Special case: tell HTTPSClientInvoker to ignore hostname in certificates.
// This is because InvokerLocator turns "localhost" into "127.0.0.1". Should
@@ -394,7 +393,7 @@
HashMap cconfig = new HashMap();
// Make Client use remote invoker.
- cconfig.put(InvokerLocator.BYVALUE, "true");
+ cconfig.put(InvokerLocator.FORCE_REMOTE, "true");
Client client = new Client(locator, cconfig);
client.connect();
More information about the jboss-cvs-commits
mailing list