QPID-92 Changes to bring MINA use up to MINA-Head (1.1.0) compatibility

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@475286 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 9 insertions, 12 deletions

diff --git a/qpid/java/cluster/src/org/apache/qpid/server/cluster/Main.java b/qpid/java/cluster/src/org/apache/qpid/server/cluster/Main.java
index 3eeddd7b4e..57779a0550 100644
--- a/qpid/java/cluster/src/org/apache/qpid/server/cluster/Main.java
+++ b/qpid/java/cluster/src/org/apache/qpid/server/cluster/Main.java
@@ -31,7 +31,6 @@ import org.apache.commons.cli.PosixParser;
 import org.apache.log4j.Logger;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.transport.socket.nio.SocketAcceptor;
-import org.apache.mina.transport.socket.nio.SocketAcceptorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
 import org.apache.qpid.pool.ReadWriteThreadModel;
 import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -72,8 +71,7 @@ public class Main extends org.apache.qpid.server.Main
         try
         {
             IoAcceptor acceptor = new SocketAcceptor();
-            SocketAcceptorConfig sconfig = (SocketAcceptorConfig) acceptor.getDefaultConfig();
-            SocketSessionConfig sc = (SocketSessionConfig) sconfig.getSessionConfig();
+            SocketSessionConfig sc = (SocketSessionConfig) acceptor.getSessionConfig();
 
             sc.setReceiveBufferSize(connectorConfig.socketReceiveBufferSize);
             sc.setSendBufferSize(connectorConfig.socketWriteBuferSize);
@@ -83,14 +81,16 @@ public class Main extends org.apache.qpid.server.Main
             // implementation provided by MINA
             if (connectorConfig.enableExecutorPool)
             {
-                sconfig.setThreadModel(new ReadWriteThreadModel());
+                acceptor.setThreadModel(new ReadWriteThreadModel());
             }
 
             String host = InetAddress.getLocalHost().getHostName();
             ClusteredProtocolHandler handler = new ClusteredProtocolHandler(new InetSocketAddress(host, port));
             if (connectorConfig.enableNonSSL)
             {
-                acceptor.bind(new InetSocketAddress(port), handler, sconfig);
+                acceptor.setLocalAddress(new InetSocketAddress(port));
+                acceptor.setHandler(handler);
+                acceptor.bind();
                 _logger.info("Qpid.AMQP listening on non-SSL port " + port);
                 handler.connect(commandLine.getOptionValue("j"));
             }
@@ -99,7 +99,9 @@ public class Main extends org.apache.qpid.server.Main
             {
                 ClusteredProtocolHandler sslHandler = new ClusteredProtocolHandler(handler);
                 sslHandler.setUseSSL(true);
-                acceptor.bind(new InetSocketAddress(connectorConfig.sslPort), handler, sconfig);
+                acceptor.setLocalAddress(new InetSocketAddress(connectorConfig.sslPort));
+                acceptor.setHandler(handler);
+                acceptor.bind();
                 _logger.info("Qpid.AMQP listening on SSL port " + connectorConfig.sslPort);
             }
         }
diff --git a/qpid/java/cluster/test/org/apache/qpid/server/cluster/TestSession.java b/qpid/java/cluster/test/org/apache/qpid/server/cluster/TestSession.java
index 86ec808924..da7c17c181 100644
--- a/qpid/java/cluster/test/org/apache/qpid/server/cluster/TestSession.java
+++ b/qpid/java/cluster/test/org/apache/qpid/server/cluster/TestSession.java
@@ -32,11 +32,6 @@ class TestSession implements IoSession
         return null;  //TODO
     }
 
-    public IoServiceConfig getServiceConfig()
-    {
-        return null;  //TODO        
-    }
-
     public IoHandler getHandler()
     {
         return null;  //TODO
@@ -222,7 +217,7 @@ class TestSession implements IoSession
         return 0;  //TODO
     }
 
-    public int getScheduledWriteRequests()
+    public int getScheduledWriteMessages()
     {
         return 0;  //TODO
     }