[jboss-cvs] JBoss Messaging SVN: r3812 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/mina and 1 other directories.

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

Author: jmesnil
Date: 2008-02-27 07:46:18 -0500 (Wed, 27 Feb 2008)
New Revision: 3812

Modified:
   trunk/.classpath
   trunk/build-thirdparty.xml
   trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
   trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/FilterChainSupportTest.java
Log:
* updated MINA to 2.0.0-M1 official snapshot

Modified: trunk/.classpath
===================================================================
--- trunk/.classpath	2008-02-27 12:00:49 UTC (rev 3811)
+++ trunk/.classpath	2008-02-27 12:46:18 UTC (rev 3812)
@@ -17,6 +17,7 @@
 	<classpathentry kind="src" path="docs/examples/topic/src"/>
 	<classpathentry excluding="**/.svn/**/*" kind="src" path="src/main"/>
 	<classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src"/>
+	<classpathentry kind="src" path="tests/etc/ide"/>
 	<classpathentry excluding="ide/" kind="src" path="tests/etc"/>
 	<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
@@ -71,7 +72,7 @@
 	<classpathentry kind="lib" path="thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar"/>
 	<classpathentry kind="lib" path="thirdparty/jboss/jbosssx-client/lib/jbosssx-client.jar"/>
 	<classpathentry kind="lib" path="tests/lib/easymock.jar"/>
-	<classpathentry kind="lib" path="thirdparty/apache-mina/lib/mina-core.jar" sourcepath="thirdparty/apache-mina/lib/mina-core-sources.jar"/>
+	<classpathentry kind="lib" path="thirdparty/apache-mina/lib/mina-core-2.0.0-M1.jar" sourcepath="thirdparty/apache-mina/lib/mina-core-2.0.0-M1-sources.jar"/>
 	<classpathentry kind="lib" path="thirdparty/slf4j/log4j/lib/slf4j-log4j12.jar"/>
 	<classpathentry kind="lib" path="src/etc/server/default/config"/>
 	<classpathentry kind="lib" path="src/etc/server/default/deploy"/>

Modified: trunk/build-thirdparty.xml
===================================================================
--- trunk/build-thirdparty.xml	2008-02-27 12:00:49 UTC (rev 3811)
+++ trunk/build-thirdparty.xml	2008-02-27 12:46:18 UTC (rev 3812)
@@ -100,7 +100,7 @@
       <componentref name="jboss/jbosssx-client" version="2.0.1.GA"/>
       <componentref name="jboss/jboss-javaee" version="5.0.0.Beta3"/>
       <componentref name="jboss/jboss-common-logging-spi" version="2.0.4.GA"/>
-      <componentref name="apache-mina" version="snapshot"/>
+      <componentref name="apache-mina" version="2.0.0-M1"/>
       <componentref name="slf4j/log4j" version="1.4.3"/>
 
 

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java	2008-02-27 12:00:49 UTC (rev 3811)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/mina/MinaService.java	2008-02-27 12:46:18 UTC (rev 3812)
@@ -138,11 +138,11 @@
          addExecutorFilter(filterChain);
 
          // Bind
-         acceptor.setLocalAddress(new InetSocketAddress(remotingConfig.getHost(), remotingConfig.getPort()));
+         acceptor.setDefaultLocalAddress(new InetSocketAddress(remotingConfig.getHost(), remotingConfig.getPort()));
          acceptor.setReuseAddress(true);
          acceptor.getSessionConfig().setReuseAddress(true);
          acceptor.getSessionConfig().setKeepAlive(true);
-         acceptor.setDisconnectOnUnbind(false);
+         acceptor.setCloseOnDeactivation(false);
 
          acceptor.setHandler(new MinaHandler(dispatcher, this, true));
          acceptor.bind();

Modified: trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/FilterChainSupportTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/FilterChainSupportTest.java	2008-02-27 12:00:49 UTC (rev 3811)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/impl/mina/integration/test/FilterChainSupportTest.java	2008-02-27 12:46:18 UTC (rev 3812)
@@ -97,7 +97,7 @@
       addSSLFilter(acceptor.getFilterChain(), false, keystorePath,
             keystorePassword, trustStorePath, trustStorePassword);
       addCodecFilter(acceptor.getFilterChain());
-      acceptor.setLocalAddress(address);
+      acceptor.setDefaultLocalAddress(address);
 
       final CountDownLatch latch = new CountDownLatch(1);