Fixed incorrect package on AMQVMBrokerCreationException (did not match physical location).

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

10 files changed, 27 insertions, 52 deletions

diff --git a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
index 4adde3e002..ddcaa067af 100644
--- a/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
+++ b/java/client/src/org/apache/qpid/client/transport/TransportConnection.java
@@ -27,7 +27,7 @@ import org.apache.mina.transport.vmpipe.VmPipeAddress;
 import org.apache.qpid.client.AMQBrokerDetails;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.pool.ReadWriteThreadModel;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 
 
 import java.io.IOException;
@@ -107,34 +107,20 @@ public class TransportConnection
 
         {
             case TCP:
-                if (Boolean.getBoolean("amqj.useBlockingIo"))
+                _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
                 {
-                    _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
+                    public IoConnector newSocketConnector()
                     {
-                        public IoConnector newSocketConnector()
-                        {
-                            return new org.apache.qpid.bio.SocketConnector(); // blocking connector
-                        }
-                    });
-                }
-                else
-                {
-                    _instance = new SocketTransportConnection(new SocketTransportConnection.SocketConnectorFactory()
-                    {
-                        public IoConnector newSocketConnector()
-                        {
-                            SocketConnector result = new SocketConnector(); // non-blocking connector
+                        SocketConnector result = new SocketConnector(); // non-blocking connector
 
-                            // Don't have the connector's worker thread wait around for other connections (we only use
-                            // one SocketConnector per connection at the moment anyway). This allows short-running
-                            // clients (like unit tests) to complete quickly.
-                            result.setWorkerTimeout(0L);
+                        // Don't have the connector's worker thread wait around for other connections (we only use
+                        // one SocketConnector per connection at the moment anyway). This allows short-running
+                        // clients (like unit tests) to complete quickly.
+                        result.setWorkerTimeout(0);
 
-                            return result;
-                        }
-                    });
-
-                }
+                        return result;
+                    }
+                });
                 break;
             case VM:
             {
diff --git a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java b/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
index 6ff91ea6e3..d13cffd290 100644
--- a/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
+++ b/java/client/src/org/apache/qpid/client/vmbroker/AMQVMBrokerCreationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-package org.apache.qpid.vmbroker;
+package org.apache.qpid.client.vmbroker;
 
 import org.apache.qpid.client.transport.AMQTransportConnectionException;
 
diff --git a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
index c7c835c3fd..2e5f2ddbac 100644
--- a/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
+++ b/java/client/test/src/org/apache/qpid/client/AllClientUnitTests.java
@@ -30,7 +30,9 @@ import org.junit.runners.Suite;
         org.apache.qpid.basic.UnitTests.class,
         org.apache.qpid.client.channelclose.UnitTests.class,
         org.apache.qpid.client.message.UnitTests.class,
-        org.apache.qpid.forwardall.UnitTests.class
+        org.apache.qpid.forwardall.UnitTests.class,
+        org.apache.qpid.destinationurl.UnitTests.class,
+        org.apache.qpid.jndi.referenceabletest.UnitTests.class
         })
 public class AllClientUnitTests
 {
diff --git a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java b/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
index be384f42d8..e12d6c0fc5 100644
--- a/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
+++ b/java/client/test/src/org/apache/qpid/client/channelclose/ChannelCloseOkTest.java
@@ -67,7 +67,7 @@ public class ChannelCloseOkTest
         _session1.createConsumer(_destination1).setMessageListener(new MessageListener() {
             public void onMessage(Message message)
             {
-                _log.info("consumer 1 got message [" + getTextMessage(message) + "]");
+                _log.debug("consumer 1 got message [" + getTextMessage(message) + "]");
                 synchronized (_received1)
                 {
                     _received1.add(message);
@@ -79,7 +79,7 @@ public class ChannelCloseOkTest
         _session2.createConsumer(_destination2).setMessageListener(new MessageListener() {
             public void onMessage(Message message)
             {
-                _log.info("consumer 2 got message [" +  getTextMessage(message) + "]");
+                _log.debug("consumer 2 got message [" +  getTextMessage(message) + "]");
                 synchronized (_received2)
                 {
                     _received2.add(message);
@@ -170,7 +170,7 @@ public class ChannelCloseOkTest
 
     private void send(Session session, Destination destination, String message) throws JMSException
     {
-        _log.info("sending message " + message);
+        _log.debug("sending message " + message);
         MessageProducer producer1 = session.createProducer(destination);
         producer1.send(session.createTextMessage(message));
     }
diff --git a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java b/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
index 6f5c5021fa..f20b0e1409 100644
--- a/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
+++ b/java/client/test/src/org/apache/qpid/failover/FailoverBrokerTester.java
@@ -19,7 +19,7 @@ package org.apache.qpid.failover;
 
 import org.apache.log4j.Logger;
 import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 
 public class FailoverBrokerTester implements Runnable
 {
diff --git a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
index 711bd3053d..f0a80f2ead 100644
--- a/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
+++ b/java/client/test/src/org/apache/qpid/mina/AcceptorTest.java
@@ -71,16 +71,9 @@ public class AcceptorTest
     @Test
     public void startAcceptor() throws IOException
     {
-        boolean useMultithreadedIoProcessor = Boolean.getBoolean("qpid.io.multithreaded");
         IoAcceptor acceptor = null;
-        if (useMultithreadedIoProcessor)
-        {
-            acceptor = new org.apache.qpid.nio.SocketAcceptor();
-        }
-        else
-        {
-            acceptor = new SocketAcceptor();
-        }
+        acceptor = new SocketAcceptor();
+        
         SocketAcceptorConfig config = (SocketAcceptorConfig) acceptor.getDefaultConfig();
         SocketSessionConfig sc = (SocketSessionConfig) config.getSessionConfig();
         sc.setTcpNoDelay(true);
diff --git a/java/client/test/src/org/apache/qpid/mina/WriterTest.java b/java/client/test/src/org/apache/qpid/mina/WriterTest.java
index b9e3d394b5..ae0b7ea522 100644
--- a/java/client/test/src/org/apache/qpid/mina/WriterTest.java
+++ b/java/client/test/src/org/apache/qpid/mina/WriterTest.java
@@ -175,15 +175,9 @@ public class WriterTest implements Runnable
     public void startWriter() throws IOException, InterruptedException
     {
         IoConnector ioConnector = null;
-        boolean useMultithreadedIoProcessor = Boolean.getBoolean("qpid.io.multithreaded");
-        if (useMultithreadedIoProcessor)
-        {
-            ioConnector = new org.apache.qpid.nio.SocketConnector();
-        }
-        else
-        {
-            ioConnector = new SocketConnector();
-        }
+
+        ioConnector = new SocketConnector();
+        
         SocketConnectorConfig cfg = (SocketConnectorConfig) ioConnector.getDefaultConfig();
         cfg.setThreadModel(ThreadModel.MANUAL);
         SocketSessionConfig scfg = (SocketSessionConfig) cfg.getSessionConfig();
diff --git a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java b/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
index 16ec4e2d73..925e0a4958 100644
--- a/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
+++ b/java/client/test/src/org/apache/qpid/requestreply1/VmRequestReply.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.requestreply1;
 
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 import org.apache.qpid.client.transport.TransportConnection;
 import org.junit.Test;
 import org.junit.Before;
diff --git a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java b/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
index 85ecd3398c..7acf2a262f 100644
--- a/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
+++ b/java/client/test/src/org/apache/qpid/topic/DurableSubscriptionTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
 import org.junit.Before;
 import org.junit.After;
 import org.apache.qpid.AMQException;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 import org.apache.qpid.url.URLSyntaxException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQSession;
diff --git a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java b/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
index 9cf767436a..86744d162f 100644
--- a/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
+++ b/java/client/test/src/org/apache/qpid/transacted/TransactedTest.java
@@ -22,7 +22,7 @@ import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.transport.TransportConnection;
-import org.apache.qpid.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
 import org.junit.After;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;