[jboss-cvs] JBoss Messaging SVN: r4858 - in trunk/src: main/org/jboss/messaging/core/remoting/impl/invm and 1 other directory.

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

Author: timfox
Date: 2008-08-21 10:10:26 -0400 (Thu, 21 Aug 2008)
New Revision: 4858

Modified:
   trunk/src/config/jbm-configuration.xml
   trunk/src/config/jbm-connector-factories.properties
   trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java
Log:
Switched to netty for tcp transport


Modified: trunk/src/config/jbm-configuration.xml
===================================================================
--- trunk/src/config/jbm-configuration.xml	2008-08-21 13:32:30 UTC (rev 4857)
+++ trunk/src/config/jbm-configuration.xml	2008-08-21 14:10:26 UTC (rev 4858)
@@ -74,8 +74,9 @@
       -->
       
       <remoting-acceptor-factories>         
-	      <class-name>org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory</class-name>      
+	      <!-- <class-name>org.jboss.messaging.core.remoting.impl.mina.MinaAcceptorFactory</class-name> -->      
 	      <class-name>org.jboss.messaging.core.remoting.impl.invm.InVMAcceptorFactory</class-name>	              
+	      <class-name>org.jboss.messaging.core.remoting.impl.netty.NettyAcceptorFactory</class-name>
       </remoting-acceptor-factories>
 
       <!-- Storage configuration -->

Modified: trunk/src/config/jbm-connector-factories.properties
===================================================================
--- trunk/src/config/jbm-connector-factories.properties	2008-08-21 13:32:30 UTC (rev 4857)
+++ trunk/src/config/jbm-connector-factories.properties	2008-08-21 14:10:26 UTC (rev 4858)
@@ -1,2 +1,2 @@
-TCP=org.jboss.messaging.core.remoting.impl.mina.MinaConnectorFactory
+TCP=org.jboss.messaging.core.remoting.impl.netty.NettyConnectorFactory
 INVM=org.jboss.messaging.core.remoting.impl.invm.InVMConnectorFactory
\ No newline at end of file

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java	2008-08-21 13:32:30 UTC (rev 4857)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/invm/InVMAcceptor.java	2008-08-21 14:10:26 UTC (rev 4858)
@@ -123,7 +123,7 @@
       if (conn != null)
       {
          conn.close();
-      }
+      }            
    }
    
    private class Listener implements ConnectionLifeCycleListener