complete bringing initial maven work to trunk

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

6 files changed, 25 insertions, 23 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java b/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java
index ecbf3ad230..892b349cea 100644
--- a/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/BasicDeliverTest.java
@@ -159,6 +159,11 @@ public class BasicDeliverTest
             return null;  //To change body of implemented methods use File | Settings | File Templates.
         }
 
+        public IoServiceConfig getServiceConfig()
+        {
+            return null;
+        }
+
         public IoHandler getHandler()
         {
             return null;  //To change body of implemented methods use File | Settings | File Templates.
@@ -194,7 +199,7 @@ public class BasicDeliverTest
             return null;  //To change body of implemented methods use File | Settings | File Templates.
         }
 
-        public int getScheduledWriteMessages()
+        public int getScheduledWriteRequests()
         {
             return 0;  //To change body of implemented methods use File | Settings | File Templates.
         }
diff --git a/java/client/src/test/java/org/apache/qpid/codec/Client.java b/java/client/src/test/java/org/apache/qpid/codec/Client.java
index b015c08afb..c0de5ab133 100644
--- a/java/client/src/test/java/org/apache/qpid/codec/Client.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/Client.java
@@ -53,11 +53,7 @@ public class Client extends IoHandlerAdapter
         AMQDataBlock block = BasicDeliverTest.getDataBlock(size);
 
         InetSocketAddress address = new InetSocketAddress(host, port);
-
-        SocketConnector ioConnector = new SocketConnector();
-        ioConnector.setHandler(this);
-        ConnectFuture future = ioConnector.connect(address);
-
+        ConnectFuture future = new SocketConnector().connect(address, this);
         future.join();
         _session = future.getSession();
 
diff --git a/java/client/src/test/java/org/apache/qpid/codec/Server.java b/java/client/src/test/java/org/apache/qpid/codec/Server.java
index 2639656e41..fa4295e0b2 100644
--- a/java/client/src/test/java/org/apache/qpid/codec/Server.java
+++ b/java/client/src/test/java/org/apache/qpid/codec/Server.java
@@ -34,12 +34,7 @@ public class Server extends IoHandlerAdapter
 {
     Server(int port) throws Exception
     {
-
-        SocketAcceptor acceptor = new SocketAcceptor();
-
-        acceptor.setLocalAddress(new InetSocketAddress(port));
-        acceptor.setHandler(this);
-        acceptor.bind();
+        new SocketAcceptor().bind(new InetSocketAddress(port), this);
         System.out.println("Listening on " + port);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java b/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java
index a665463736..bae3a60675 100644
--- a/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java
+++ b/java/client/src/test/java/org/apache/qpid/mina/AcceptorTest.java
@@ -27,6 +27,7 @@ import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
 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.junit.Test;
 import org.apache.qpid.pool.ReadWriteThreadModel;
@@ -75,18 +76,17 @@ public class AcceptorTest
     {
         IoAcceptor acceptor = null;
         acceptor = new SocketAcceptor();
-
-        SocketSessionConfig sc = (SocketSessionConfig) acceptor.getSessionConfig();
+        
+        SocketAcceptorConfig config = (SocketAcceptorConfig) acceptor.getDefaultConfig();
+        SocketSessionConfig sc = (SocketSessionConfig) config.getSessionConfig();
         sc.setTcpNoDelay(true);
         sc.setSendBufferSize(32768);
         sc.setReceiveBufferSize(32768);
 
-        acceptor.setThreadModel(new ReadWriteThreadModel());
-
-        acceptor.setLocalAddress(new InetSocketAddress(PORT));
-        acceptor.setHandler(new TestHandler());
-        acceptor.bind();
+        config.setThreadModel(new ReadWriteThreadModel());
 
+        acceptor.bind(new InetSocketAddress(PORT),
+                      new TestHandler());
         _logger.info("Bound on port " + PORT);
     }
 
diff --git a/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java b/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java
index 798cde9366..dc29861c87 100644
--- a/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java
+++ b/java/client/src/test/java/org/apache/qpid/mina/WriterTest.java
@@ -24,6 +24,7 @@ import junit.framework.JUnit4TestAdapter;
 import org.apache.log4j.Logger;
 import org.apache.mina.common.*;
 import org.apache.mina.transport.socket.nio.SocketConnector;
+import org.apache.mina.transport.socket.nio.SocketConnectorConfig;
 import org.apache.mina.transport.socket.nio.SocketSessionConfig;
 import org.junit.Test;
 
@@ -180,15 +181,16 @@ public class WriterTest implements Runnable
 
         ioConnector = new SocketConnector();
         
-        SocketSessionConfig scfg = (SocketSessionConfig) ioConnector.getSessionConfig();
+        SocketConnectorConfig cfg = (SocketConnectorConfig) ioConnector.getDefaultConfig();
+        cfg.setThreadModel(ThreadModel.MANUAL);
+        SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig();
         scfg.setTcpNoDelay(true);
         scfg.setSendBufferSize(32768);
         scfg.setReceiveBufferSize(32768);
 
         final InetSocketAddress address = new InetSocketAddress("localhost", AcceptorTest.PORT);
         _logger.info("Attempting connection to " + address);
-        ioConnector.setHandler(new WriterHandler());
-        ConnectFuture future = ioConnector.connect(address);
+        ConnectFuture future = ioConnector.connect(address, new WriterHandler());
         // wait for connection to complete
         future.join();
         _logger.info("Connection completed");
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
index 50940aa166..e800afc7ba 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/TestIoSession.java
@@ -45,6 +45,10 @@ public class TestIoSession extends BaseIoSession {
         return null;
     }
 
+    public IoServiceConfig getServiceConfig() {
+        return null;
+    }
+
     public IoHandler getHandler() {
         return null;
     }
@@ -69,7 +73,7 @@ public class TestIoSession extends BaseIoSession {
         return null;
     }
 
-    public int getScheduledWriteMessages() {
+    public int getScheduledWriteRequests() {
         return 0;
     }