[jboss-cvs] JBoss Messaging SVN: r5981 - in trunk/src: main/org/jboss/messaging/integration/transports/netty and 1 other directory.

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

Author: ataylor
Date: 2009-03-03 16:39:33 -0500 (Tue, 03 Mar 2009)
New Revision: 5981

Modified:
   trunk/src/config/jbm-configuration.xml
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
   trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
   trunk/src/main/org/jboss/messaging/integration/transports/netty/TransportConstants.java
Log:
added netty invm acceptor config

Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2009-03-03 20:42:19 UTC (rev 5980)
+++ trunk/src/config/jbm-configuration.xml	2009-03-03 21:39:33 UTC (rev 5981)
@@ -121,6 +121,12 @@
          <param key="jbm.remoting.netty.httpresponsetime" value="10000" type="Long"/>
          <param key="jbm.remoting.netty.httpserverscanperiod" value="5000" type="Long"/>
       </acceptor>-->
+     <!-- netty invm acceptor, needed for the servlet transport-->
+     <!-- <acceptor name="netty-invm">
+         <factory-class>org.jboss.messaging.integration.transports.netty.NettyAcceptorFactory</factory-class>
+         <param key="jbm.remoting.netty.useinvm" value="true" type="Boolean"/>
+         <param key="jbm.remoting.netty.host" value="org.jboss.jbm" type="String"/>
+      </acceptor>-->
 
       <!-- Clustering configuration -->
       

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2009-03-03 20:42:19 UTC (rev 5980)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyAcceptor.java	2009-03-03 21:39:33 UTC (rev 5981)
@@ -55,6 +55,7 @@
 
 import javax.net.ssl.SSLContext;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.Map;
 import java.util.Timer;
 import java.util.concurrent.ConcurrentHashMap;
@@ -99,6 +100,8 @@
 
    private final boolean useNio;
 
+    private final boolean useInvm;
+
    private final String host;
 
    private final int port;
@@ -160,6 +163,10 @@
       this.useNio = ConfigurationHelper.getBooleanProperty(TransportConstants.USE_NIO_PROP_NAME,
                                                            TransportConstants.DEFAULT_USE_NIO,
                                                            configuration);
+
+      this.useInvm = ConfigurationHelper.getBooleanProperty(TransportConstants.USE_INVM_PROP_NAME,
+                                                           TransportConstants.DEFAULT_USE_INVM,
+                                                           configuration);
       this.host = ConfigurationHelper.getStringProperty(TransportConstants.HOST_PROP_NAME,
                                                         TransportConstants.DEFAULT_HOST,
                                                         configuration);
@@ -209,8 +216,13 @@
       }
       bossExecutor = Executors.newCachedThreadPool(new org.jboss.messaging.utils.JBMThreadFactory("jbm-netty-acceptor-boss-threads"));
       workerExecutor = Executors.newCachedThreadPool(new JBMThreadFactory("jbm-netty-acceptor-worker-threads"));
-      if (useNio)
+
+      if(useInvm)
       {
+         channelFactory = new DefaultLocalServerChannelFactory();
+      }
+      else if (useNio)
+      {
          channelFactory = new NioServerSocketChannelFactory(bossExecutor, workerExecutor);
       }
       else
@@ -282,7 +294,17 @@
       String[] hosts = TransportConfiguration.splitHosts(host);
       for (String h : hosts)
       {
-         Channel serverChannel = bootstrap.bind(new InetSocketAddress(h, port));
+         SocketAddress address;
+         if(useInvm)
+         {
+            address = new LocalAddress(h);
+            System.out.println("address = " + address);
+         }
+         else
+         {
+            address = new InetSocketAddress(h, port);
+         }
+         Channel serverChannel = bootstrap.bind(address);
          serverChannelGroup.add(serverChannel);
       }
    }

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-03-03 20:42:19 UTC (rev 5980)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/NettyConnector.java	2009-03-03 21:39:33 UTC (rev 5981)
@@ -514,7 +514,6 @@
          ctx.sendUpstream(event);
       }
 
-      int i = 0;
 
       @Override
       public void writeRequested(final ChannelHandlerContext ctx, final MessageEvent e) throws Exception

Modified: trunk/src/main/org/jboss/messaging/integration/transports/netty/TransportConstants.java
===================================================================
--- trunk/src/main/org/jboss/messaging/integration/transports/netty/TransportConstants.java	2009-03-03 20:42:19 UTC (rev 5980)
+++ trunk/src/main/org/jboss/messaging/integration/transports/netty/TransportConstants.java	2009-03-03 21:39:33 UTC (rev 5981)
@@ -47,6 +47,8 @@
 
    public static final String USE_NIO_PROP_NAME = "jbm.remoting.netty.usenio";
 
+   public static final String USE_INVM_PROP_NAME = "jbm.remoting.netty.useinvm";
+
    public static final String HOST_PROP_NAME = "jbm.remoting.netty.host";
 
    public static final String PORT_PROP_NAME = "jbm.remoting.netty.port";
@@ -69,6 +71,8 @@
 
    public static final boolean DEFAULT_USE_NIO = true;
 
+   public static final boolean DEFAULT_USE_INVM = false;
+
    public static final boolean DEFAULT_USE_SERVLET = false;
 
    public static final String DEFAULT_HOST = "localhost";