[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/config ...

[Ron Sigal]

  User: rsigal  
  Date: 06/12/27 01:15:49

  Modified:    src/tests/org/jboss/test/remoting/transport/config  
                        FactoryConfigTestCaseSSLParent.java
                        FactoryConfigTestCaseParent.java
  Log:
  JBREM-650: Added ability to add transport specific configuration.
  
  Revision  Changes    Path
  1.8       +12 -4     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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- FactoryConfigTestCaseSSLParent.java	7 Aug 2006 21:17:33 -0000	1.7
  +++ FactoryConfigTestCaseSSLParent.java	27 Dec 2006 06:15:49 -0000	1.8
  @@ -190,7 +190,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -353,7 +355,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -495,7 +499,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -605,7 +611,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  
  
  
  1.6       +20 -6     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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- FactoryConfigTestCaseParent.java	1 Aug 2006 06:33:19 -0000	1.5
  +++ FactoryConfigTestCaseParent.java	27 Dec 2006 06:15:49 -0000	1.6
  @@ -65,7 +65,7 @@
   /**
    * 
    * @author <a href="mailto:ron.sigal at jboss.com">Ron Sigal</a>
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    * <p>
    * Copyright (c) Jun 13, 2006
    * </p>
  @@ -234,7 +234,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -397,7 +399,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -551,7 +555,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -702,7 +708,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -826,7 +834,9 @@
            Thread.sleep(500);
            freeport = PortUtil.findFreePort(getHostName());
            InvokerLocator callbackLocator = new InvokerLocator(getTransport() + "://" + getHostName() + ":" + freeport);
  -         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI());
  +         HashMap config = new HashMap();
  +         addExtraCallbackConfig(config);
  +         Connector callbackConnector = new Connector(callbackLocator.getLocatorURI(), config);
            ServerSocketFactory ssf3 = getDefaultCallbackServerSocketFactory();
            callbackConnector.setServerSocketFactory(ssf3);
            callbackConnector.create();
  @@ -919,6 +929,10 @@
         return UniqueSocketFactory.class;
      }
      
  +   protected void addExtraCallbackConfig(Map config)
  +   {
  +   }
  +   
      public static class UniqueServerSocketFactory
      extends ServerSocketFactory
      implements ServerSocketFactoryMBean