QPID-5048: logging and build output cleanup

Patch Supplied by Andrew MacBean <andymacbean@gmail.com>.

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

44 files changed, 216 insertions, 311 deletions

diff --git a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index ed6024feb1..c7e6e1f745 100644
--- a/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
@@ -44,6 +44,7 @@ import javax.management.remote.JMXConnector;
 import javax.management.remote.JMXConnectorFactory;
 import javax.management.remote.JMXServiceURL;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnectionFactory;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
@@ -64,6 +65,8 @@ import org.apache.qpid.url.URLSyntaxException;
  */
 public class BDBStoreUpgradeTestPreparer
 {
+    private static final Logger _logger = Logger.getLogger(BDBStoreUpgradeTestPreparer.class);
+
     public static final String TOPIC_NAME="myUpgradeTopic";
     public static final String SUB_NAME="myDurSubName";
     public static final String SELECTOR_SUB_NAME="mySelectorDurSubName";
@@ -131,7 +134,7 @@ public class BDBStoreUpgradeTestPreparer
         {
             public void onException(JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Error setting exception listener for connection", e);
             }
         });
         // Create a session on the connection, transacted to confirm delivery
@@ -225,7 +228,7 @@ public class BDBStoreUpgradeTestPreparer
         {
             public void onException(JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Error setting exception listener for connection", e);
             }
         });
         // Create a session on the connection, transacted to confirm delivery
@@ -270,7 +273,7 @@ public class BDBStoreUpgradeTestPreparer
         {
             public void onException(JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Error setting exception listener for connection", e);
             }
         });
         // Create a session on the connection, transacted to confirm delivery
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java b/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
index 674abbfeb7..0e57b60a6f 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
+++ b/java/broker-core/src/test/java/org/apache/qpid/server/configuration/plugins/AbstractConfigurationTest.java
@@ -24,6 +24,7 @@ import org.apache.commons.configuration.CompositeConfiguration;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 import java.util.List;
@@ -34,6 +35,8 @@ import java.util.List;
  */
 public class AbstractConfigurationTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(AbstractConfigurationTest.class);
+
     private static final double DOUBLE = 3.14;
     private static final long POSITIVE_LONG = 1000;
     private static final long NEGATIVE_LONG = -1000;
@@ -101,7 +104,7 @@ public class AbstractConfigurationTest extends QpidTestCase
         }
         catch (ConfigurationException e)
         {
-            e.printStackTrace();
+            _logger.error("Error setting up plugin configuration", e);
             fail(e.toString());
         }
 
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 54826b8c88..8b67db2de9 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -382,7 +382,6 @@ public class PortFactoryTest extends QpidTestCase
         }
         catch(IllegalConfigurationException e)
         {
-            e.printStackTrace();
             // pass
         }
     }
diff --git a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
index 4058eac99d..a7dcaf6d49 100644
--- a/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
+++ b/java/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
@@ -30,6 +30,8 @@ import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.when;
 
 import java.util.Map;
+
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.AMQSecurityException;
@@ -55,6 +57,7 @@ import java.util.concurrent.TimeUnit;
 
 public class SimpleAMQQueueTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(SimpleAMQQueueTest.class);
 
     private SimpleAMQQueue _queue;
     private VirtualHost _virtualHost;
@@ -1146,7 +1149,7 @@ public class SimpleAMQQueueTest extends QpidTestCase
         }
         catch (InterruptedException e)
         {
-            e.printStackTrace();
+            _logger.error("Thread interrupted", e);
         }
     }
 
diff --git a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
index f1dfc52ba4..1680a16b42 100644
--- a/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ b/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
@@ -35,6 +35,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import javax.security.auth.Subject;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.ContentHeaderBody;
@@ -55,6 +56,7 @@ import org.apache.qpid.transport.network.NetworkConnection;
 
 public class InternalTestProtocolSession extends AMQProtocolEngine implements ProtocolOutputConverter
 {
+    private static final Logger _logger = Logger.getLogger(InternalTestProtocolSession.class);
     // ChannelID(LIST)  -> LinkedList<Pair>
     private final Map<Integer, Map<AMQShortString, LinkedList<DeliveryPair>>> _channelDelivers;
     private AtomicInteger _deliveryCount = new AtomicInteger(0);
@@ -185,7 +187,7 @@ public class InternalTestProtocolSession extends AMQProtocolEngine implements Pr
             }
             catch (InterruptedException e)
             {
-                e.printStackTrace();
+                _logger.error("Thread interupted", e);
             }
         }
     }
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
index 8d48d70d9a..29a8a0c723 100755
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
@@ -22,6 +22,8 @@ package org.apache.qpid.server.protocol.v1_0;
 
 import java.nio.ByteBuffer;
 import java.util.*;
+
+import org.apache.log4j.Logger;
 import org.apache.qpid.amqp_1_0.codec.ValueHandler;
 import org.apache.qpid.amqp_1_0.messaging.SectionDecoder;
 import org.apache.qpid.amqp_1_0.messaging.SectionEncoder;
@@ -44,6 +46,7 @@ import org.apache.qpid.server.store.StorableMessageMetaData;
 
 public class MessageMetaData_1_0 implements StorableMessageMetaData
 {
+    private static final Logger _logger = Logger.getLogger(MessageMetaData_1_0.class);
     // TODO move to somewhere more useful
     public static final Symbol JMS_TYPE = Symbol.valueOf("x-opt-jms-type");
     public static final MessageMetaDataType.Factory<MessageMetaData_1_0> FACTORY = new MetaDataFactory();
@@ -275,7 +278,7 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData
         }
         catch (AmqpErrorException e)
         {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            _logger.error("Decoding read section error", e);
             throw new IllegalArgumentException(e);
         }
     }
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
index af3f0b7872..b9c10b925f 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
@@ -20,18 +20,17 @@
  */
 package org.apache.qpid.server.protocol.v1_0;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.amqp_1_0.type.Outcome;
 import org.apache.qpid.amqp_1_0.type.messaging.Accepted;
 
-import org.apache.qpid.AMQException;
 import org.apache.qpid.server.queue.AMQQueue;
 
 import org.apache.qpid.server.txn.ServerTransaction;
 
-import java.util.Arrays;
-
 public class QueueDestination implements SendingDestination, ReceivingDestination
 {
+    private static final Logger _logger = Logger.getLogger(QueueDestination.class);
     private static final Accepted ACCEPTED = new Accepted();
     private static final Outcome[] OUTCOMES = new Outcome[] { ACCEPTED };
 
@@ -80,7 +79,7 @@ public class QueueDestination implements SendingDestination, ReceivingDestinatio
         }
         catch(Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Send error", e);
             throw new RuntimeException(e);
         }
         return ACCEPTED;
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
index 0351de3e00..034927c56b 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
@@ -27,6 +27,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.AMQSecurityException;
@@ -64,7 +66,6 @@ import org.apache.qpid.server.filter.JMSSelectorFilter;
 import org.apache.qpid.server.filter.SimpleFilterManager;
 import org.apache.qpid.server.model.UUIDGenerator;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.queue.QueueEntry;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
@@ -72,6 +73,8 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 
 public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryStateHandler
 {
+    private static final Logger _logger = Logger.getLogger(SendingLink_1_0.class);
+
     private VirtualHost _vhost;
     private SendingDestination _destination;
 
@@ -319,7 +322,8 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
                                                         }
                                                         catch (AMQException e)
                                                         {
-                                                            e.printStackTrace();  //TODO.
+                                                            //TODO
+                                                            _logger.error("Error removing queue", e);
                                                         }
                                                     }
                                                 }
@@ -342,14 +346,15 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
             }
             catch (AMQSecurityException e)
             {
-                e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+                _logger.error("Security error", e);
             }
             catch (AMQInternalException e)
             {
-                e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-            } catch (AMQException e)
+                _logger.error("Internal error", e);
+            }
+            catch (AMQException e)
             {
-                e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+                _logger.error("Error", e);
             }
             _subscription = new Subscription_1_0(this, qd, true);
 
@@ -370,7 +375,8 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
             }
             catch (AMQException e)
             {
-                e.printStackTrace();  //TODO
+                //TODO
+                _logger.error("Error registering subscription", e);
             }
         }
 
@@ -398,7 +404,8 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
             }
             catch (AMQException e)
             {
-                e.printStackTrace();  //TODO
+                //TODO
+                _logger.error("Error unregistering subscription", e);
             }
 
             Modified state = new Modified();
@@ -423,7 +430,8 @@ public class SendingLink_1_0 implements SendingLinkListener, Link_1_0, DeliveryS
                 }
                 catch(AMQException e)
                 {
-                    e.printStackTrace();  // TODO - Implement
+                    //TODO
+                    _logger.error("Error removing queue", e);
                 }
             }
 
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
index d3962c779c..80d7595e01 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
@@ -21,6 +21,8 @@
 package org.apache.qpid.server.protocol.v1_0;
 
 import java.text.MessageFormat;
+
+import org.apache.log4j.Logger;
 import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
 import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint;
 import org.apache.qpid.amqp_1_0.transport.SendingLinkEndpoint;
@@ -45,7 +47,6 @@ import org.apache.qpid.server.protocol.AMQConnectionModel;
 import org.apache.qpid.server.protocol.AMQSessionModel;
 import org.apache.qpid.server.protocol.LinkRegistry;
 import org.apache.qpid.server.queue.AMQQueue;
-import org.apache.qpid.server.queue.AMQQueueFactory;
 import org.apache.qpid.server.txn.AutoCommitTransaction;
 import org.apache.qpid.server.txn.ServerTransaction;
 import org.apache.qpid.server.virtualhost.VirtualHost;
@@ -56,6 +57,7 @@ import static org.apache.qpid.server.logging.subjects.LogSubjectFormat.CHANNEL_F
 
 public class Session_1_0 implements SessionEventListener, AMQSessionModel, LogSubject
 {
+    private static final Logger _logger = Logger.getLogger(Session_1_0.class);
     private static final Symbol LIFETIME_POLICY = Symbol.valueOf("lifetime-policy");
     private VirtualHost _vhost;
     private AutoCommitTransaction _transaction;
@@ -155,7 +157,7 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel, LogSu
                     }
                     catch(AmqpErrorException e)
                     {
-                        e.printStackTrace();
+                        _logger.error("Error creating sending link", e);
                         destination = null;
                         sendingLinkEndpoint.setSource(null);
                         error = e.getError();
@@ -355,7 +357,8 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel, LogSu
                                     }
                                     catch (AMQException e)
                                     {
-                                        e.printStackTrace();  //TODO.
+                                        //TODO
+                                        _logger.error("Error removing queue from vhost", e);
                                     }
                                 }
                             }
@@ -388,10 +391,13 @@ public class Session_1_0 implements SessionEventListener, AMQSessionModel, LogSu
         }
         catch (AMQSecurityException e)
         {
-            e.printStackTrace();  //TODO.
-        } catch (AMQException e)
+            //TODO
+            _logger.error("Security error", e);
+        }
+        catch (AMQException e)
         {
-            e.printStackTrace();  //TODO
+            //TODO
+            _logger.error("Error", e);
         }
 
         return queue;
diff --git a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
index a05d14816a..10d4811916 100644
--- a/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
+++ b/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
@@ -20,13 +20,13 @@
  */
 package org.apache.qpid.server.protocol.v1_0;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.amqp_1_0.messaging.SectionDecoder;
 import org.apache.qpid.amqp_1_0.messaging.SectionDecoderImpl;
 import org.apache.qpid.amqp_1_0.transport.LinkEndpoint;
 import org.apache.qpid.amqp_1_0.transport.ReceivingLinkEndpoint;
 import org.apache.qpid.amqp_1_0.transport.ReceivingLinkListener;
 import org.apache.qpid.amqp_1_0.type.*;
-import org.apache.qpid.amqp_1_0.type.DeliveryState;
 import org.apache.qpid.amqp_1_0.type.messaging.*;
 import org.apache.qpid.amqp_1_0.type.transaction.Declare;
 import org.apache.qpid.amqp_1_0.type.transaction.Declared;
@@ -42,6 +42,7 @@ import java.util.*;
 
 public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0
 {
+    private static final Logger _logger = Logger.getLogger(TxnCoordinatorLink_1_0.class);
     private VirtualHost _vhost;
     private ReceivingLinkEndpoint _endpoint;
 
@@ -149,7 +150,8 @@ public class TxnCoordinatorLink_1_0 implements ReceivingLinkListener, Link_1_0
         }
         catch (AmqpErrorException e)
         {
-            e.printStackTrace();  //TODO.
+            //TODO
+            _logger.error("AMQP error", e);
         }
 
     }
diff --git a/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java b/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
index 4c9448cb39..70fcfcedb8 100644
--- a/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
@@ -179,7 +179,7 @@ public class AMQProtocolHandlerTest extends TestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error(e.getMessage(), e);
                     fail(e.getMessage());
                 }
             }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
index 04122a6d51..9bd7062c7b 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/message/MessageConverterTest.java
@@ -22,6 +22,7 @@ package org.apache.qpid.test.unit.message;
 
 import junit.framework.TestCase;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQSession;
@@ -42,7 +43,7 @@ import javax.jms.TextMessage;
 
 public class MessageConverterTest extends TestCase
 {
-
+    private static final Logger _logger = Logger.getLogger(MessageConverterTest.class);
     public static final String JMS_CORR_ID = "QPIDID_01";
     public static final int JMS_DELIV_MODE = 1;
     public static final String JMS_TYPE = "test.jms.type";
@@ -134,8 +135,8 @@ public class MessageConverterTest extends TestCase
         }
         catch (JMSException e)
         {
+            _logger.error("An error occured testing the property values", e);
             fail("An error occured testing the property values" + e.getCause());
-            e.printStackTrace();
         }
     }
 
diff --git a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java b/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
index ee823978b4..8e93a907d6 100644
--- a/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
+++ b/java/common/src/main/java/org/apache/qpid/url/BindingURLParser.java
@@ -443,17 +443,17 @@ public class BindingURLParser
 
             for (String url: urls)
             {
-                System.out.println("URL " + url);
+                _logger.info("URL " + url);
                 AMQBindingURL bindingURL = new AMQBindingURL(url);
                 parser.parse(url,bindingURL);
-                System.out.println("\nX " + bindingURL.toString() + " \n");
+                _logger.info("\nX " + bindingURL.toString() + " \n");
 
             }
 
         }
         catch(Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error with binding urls", e);
         }
     }
 
diff --git a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
index 12bbd20228..46d1887496 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/ConnectionTest.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.transport;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.transport.network.ConnectionBinding;
 import org.apache.qpid.transport.network.io.IoAcceptor;
@@ -41,6 +42,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ConnectionTest extends QpidTestCase implements SessionListener
 {
+    private static final Logger _logger = Logger.getLogger(ConnectionTest.class);
     private int port;
     private volatile boolean queue = false;
     private List<MessageTransfer> messages = new ArrayList<MessageTransfer>();
@@ -155,7 +157,6 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
     {
         final Connection conn = new Connection();
         conn.setConnectionDelegate(new ClientDelegate(new ConnectionSettings()));
-
         conn.addConnectionListener(new ConnectionListener()
         {
             public void opened(Connection conn) {}
@@ -240,7 +241,6 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         }
         catch (IOException e)
         {
-            e.printStackTrace();
             fail("Unable to start Server for test due to:" + e.getMessage());
         }
 
@@ -349,7 +349,10 @@ public class ConnectionTest extends QpidTestCase implements SessionListener
         Thread.sleep(6000);
         send(ssn, "SINK 3");
         ssn.sync();
-        System.out.println(messages);
+        if (_logger.isDebugEnabled())
+        {
+            _logger.debug(messages);
+        }
         assertEquals(1, messages.size());
         assertEquals("SINK 3", messages.get(0).getBodyString());
     }
diff --git a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java b/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
index 641bc5fa34..bb864cd434 100644
--- a/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
+++ b/java/common/src/test/java/org/apache/qpid/transport/network/io/IoAcceptor.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.transport.network.io;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.transport.Binding;
 import org.apache.qpid.transport.TransportException;
 
@@ -38,7 +39,9 @@ import java.nio.ByteBuffer;
 
 public class IoAcceptor<E> extends Thread
 {
+    private static final Logger _logger = Logger.getLogger(IoAcceptor.class);
 
+    private volatile boolean _closed = false;
 
     private ServerSocket socket;
     private Binding<E,ByteBuffer> binding;
@@ -59,6 +62,8 @@ public class IoAcceptor<E> extends Thread
      */
     public void close() throws IOException
     {
+        _closed = true;
+
         if (!socket.isClosed())
         {
             socket.close();
@@ -73,7 +78,7 @@ public class IoAcceptor<E> extends Thread
 
     public void run()
     {
-        while (true)
+        while (!_closed)
         {
             try
             {
@@ -82,9 +87,36 @@ public class IoAcceptor<E> extends Thread
             }
             catch (IOException e)
             {
-                throw new TransportException(e);
+                if (!_closed)
+                {
+                    _logger.error("Error in IoAcceptor thread", e);
+                    closeSocketIfNecessary(socket);
+                    try
+                    {
+                        Thread.sleep(1000);
+                    }
+                    catch (InterruptedException ie)
+                    {
+                        _logger.debug("Stopping io acceptor due to interrupt request");
+                        _closed = true;
+                    }
+                }
             }
         }
     }
 
+    private void closeSocketIfNecessary(final ServerSocket socket)
+    {
+        if(socket != null)
+        {
+            try
+            {
+                socket.close();
+            }
+            catch (IOException e)
+            {
+                _logger.debug("Exception while closing socket", e);
+            }
+        }
+    }
 }
diff --git a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java b/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
index a5a33e36ec..f21b8ea07d 100644
--- a/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
+++ b/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
@@ -120,8 +120,7 @@ public class QpidTestClient
             }
             catch(Exception e)
             {
-                e.printStackTrace();
-                _log.error(e.getMessage());
+                _log.error(e.getMessage(),e);
             }
             finally
             {
diff --git a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
index 7af3a6b35e..024af6dd57 100644
--- a/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
+++ b/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/chartbuilder/ChartProductionTest.java
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.disttest.charting.ChartType;
 import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
 import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
@@ -49,6 +50,7 @@ import org.jfree.data.general.Dataset;
  */
 public class ChartProductionTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(ChartProductionTest.class);
     private static final String TEST_CHARTTITLE = "TEST_CHARTTITLE";
     private static final String TEST_CHARTSUBTITLE = "TEST_CHARTSUBTITLE";
     private static final String TEST_XAXIS = "TEST_XAXIS";
@@ -95,7 +97,7 @@ public class ChartProductionTest extends QpidTestCase
         }
         else
         {
-            System.out.println("Charting directory for manual observation " + chartDir);
+            _logger.info("Charting directory for manual observation " + chartDir);
         }
 
         _writer.setOutputDirectory(chartDir);
diff --git a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java b/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
index 0ca90ac2ea..b274edf164 100644
--- a/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/ra/QpidRAConnectionTest.java
@@ -20,6 +20,7 @@
  */
 package org.apache.qpid.ra;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 import javax.jms.Connection;
@@ -33,6 +34,8 @@ import org.apache.qpid.ra.QpidResourceAdapter;
 
 public class QpidRAConnectionTest extends QpidBrokerTestCase
 {
+    private static final Logger _logger = Logger.getLogger(QpidRAConnectionTest.class);
+
     private static final String BROKER_PORT = "15672";
 
     private static final String URL = "amqp://guest:guest@client/test?brokerlist='tcp://localhost:" + BROKER_PORT + "?sasl_mechs='PLAIN''";
@@ -55,7 +58,7 @@ public class QpidRAConnectionTest extends QpidBrokerTestCase
         }
         catch(Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Commit threw exception", e);
             assertTrue(e instanceof javax.jms.IllegalStateException);
         }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
index 69b529cf40..9f145cd62c 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/ReturnUnroutableMandatoryMessageTest.java
@@ -60,7 +60,7 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
         if (workdir == null || workdir.equals(""))
         {
             String tempdir = System.getProperty("java.io.tmpdir");
-            System.out.println("QPID_WORK not set using tmp directory: " + tempdir);
+            _logger.info("QPID_WORK not set using tmp directory: " + tempdir);
             System.setProperty("QPID_WORK", tempdir);
         }
     }
@@ -290,14 +290,7 @@ public class ReturnUnroutableMandatoryMessageTest extends QpidBrokerTestCase imp
     {
 
         Exception linkedException = null;
-        try
-        {
-            linkedException = jmsException.getLinkedException();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
+        linkedException = jmsException.getLinkedException();
         if (linkedException instanceof AMQNoRouteException)
         {
             AMQNoRouteException noRoute = (AMQNoRouteException) linkedException;
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index a6c9885568..7b2dd3239d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -20,6 +20,7 @@
 */
 package org.apache.qpid.server.queue;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnection;
 import org.apache.qpid.client.AMQDestination;
@@ -246,6 +247,8 @@ public class PriorityQueueTest extends QpidBrokerTestCase
 
     private static class ReflectingMessageListener implements MessageListener
     {
+        private static final Logger _logger = Logger.getLogger(PriorityQueueTest.ReflectingMessageListener.class);
+
         private Session _prodSess;
         private Session _consSess;
         private CountDownLatch _latch;
@@ -270,7 +273,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
             {
                 _latch.countDown();
                 long msgNum = _origCount - _latch.getCount();
-                System.out.println("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
+                _logger.info("Received message " + msgNum + " with ID: " + message.getIntProperty("msg"));
 
                 if(_latch.getCount() > 0)
                 {
@@ -287,7 +290,7 @@ public class PriorityQueueTest extends QpidBrokerTestCase
             }
             catch(Throwable t)
             {
-                t.printStackTrace();
+                _logger.error(t.getMessage(), t);
                 _lastThrown = t;
             }
         }
diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
index 8bebcc703d..427508954d 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
@@ -37,6 +37,7 @@ import javax.jms.MessageProducer;
 import javax.jms.Queue;
 import javax.jms.Session;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQDestination;
 import org.apache.qpid.client.AMQSession;
@@ -47,6 +48,8 @@ import org.apache.qpid.test.utils.JMXTestUtils;
 
 public class ProducerFlowControlTest extends AbstractTestLogging
 {
+    private static final Logger _logger = Logger.getLogger(ProducerFlowControlTest.class);
+
     private static final int TIMEOUT = 10000;
 
     private Connection producerConnection;
@@ -94,7 +97,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging
                 }
                 catch (IOException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Error closing jmxUtils", e);
                 }
             }
             producerConnection.close();
@@ -426,7 +429,7 @@ public class ProducerFlowControlTest extends AbstractTestLogging
             }
             catch (AMQException e)
             {
-                e.printStackTrace();
+                _logger.error("Error performing sync", e);
                 throw new RuntimeException(e);
             }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java b/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
index f89e33ccc4..07f0d0c369 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/MessageStoreTest.java
@@ -26,6 +26,7 @@ import java.util.Collection;
 import java.util.Collections;
 import org.apache.commons.configuration.PropertiesConfiguration;
 
+import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.framing.AMQShortString;
@@ -76,6 +77,8 @@ import static org.mockito.Mockito.when;
  */
 public class MessageStoreTest extends QpidTestCase
 {
+    private static final Logger _logger = Logger.getLogger(MessageStoreTest.class);
+
     public static final int DEFAULT_PRIORTY_LEVEL = 5;
     public static final String SELECTOR_VALUE = "Test = 'MST'";
     public static final String LVQ_KEY = "MST-LVQ-KEY";
@@ -179,7 +182,7 @@ public class MessageStoreTest extends QpidTestCase
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("Error closing virtual host", e);
                 fail(e.getMessage());
             }
         }
@@ -190,7 +193,7 @@ public class MessageStoreTest extends QpidTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating virtual host", e);
             fail(e.getMessage());
         }
 
@@ -659,7 +662,7 @@ public class MessageStoreTest extends QpidTestCase
                     }
                     catch (AMQException e)
                     {
-                        e.printStackTrace();
+                        _logger.error("Problem enqueing message", e);
                     }
                 }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java b/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
index c4b16133f0..31e6a5613f 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/store/StoreOverfullTest.java
@@ -346,7 +346,7 @@ public class StoreOverfullTest extends QpidBrokerTestCase
             }
             catch (AMQException e)
             {
-                e.printStackTrace();
+                _logger.error(e);
                 throw new RuntimeException(e);
             }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java b/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
index b7732a8270..941c1d9499 100644
--- a/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
+++ b/java/systests/src/main/java/org/apache/qpid/server/util/AveragedRun.java
@@ -23,8 +23,12 @@ package org.apache.qpid.server.util;
 import java.util.Collection;
 import java.util.concurrent.Callable;
 
+import org.apache.log4j.Logger;
+
 public class AveragedRun implements Callable<RunStats>
 {
+    private static final Logger _logger = Logger.getLogger(AveragedRun.class);
+
     private final RunStats stats = new RunStats();
     private final TimedRun test;
     private final int iterations;
@@ -46,7 +50,7 @@ public class AveragedRun implements Callable<RunStats>
 
     public void run() throws Exception
     {
-        System.out.println(test + ": " + call());
+        _logger.info(test + ": " + call());
     }
 
     public String toString()
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
index 2ed3f356d3..54c3225cec 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/RollbackOrderTest.java
@@ -150,7 +150,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
                 }
                 catch (JMSException e)
                 {
-                    System.out.println("Error:" + e.getMessage());
+                    _logger.error("Error:" + e.getMessage(), e);
                     exceptions[(int)count.getCount()] = e;
                 }
                 catch (AssertionFailedError cf)
@@ -161,9 +161,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
                         count.countDown();
                     }
 
-                    System.out.println("Error:" + cf.getMessage());
-                    System.err.println(cf.getMessage());
-                    cf.printStackTrace();
+                    _logger.error("Error:" + cf.getMessage(), cf);
                     failed.set(true);
                 }
             }
@@ -177,8 +175,7 @@ public class RollbackOrderTest extends QpidBrokerTestCase
         {
             if (e != null)
             {
-                System.err.println(e.getMessage());
-                e.printStackTrace();
+                _logger.error("Encountered exception", e);
                 failed.set(true);
             }
         }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
index 5dcf678510..38fb1622b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/client/message/SelectorTest.java
@@ -126,7 +126,7 @@ public class SelectorTest extends QpidBrokerTestCase implements MessageListener
             }
             else
             {
-                System.out.println("SUCCESS!!");
+                _logger.debug("SUCCESS!!");
             }
         }
         catch (InterruptedException e)
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
index 1b4407f255..602eb5137a 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeOnMessageTest.java
@@ -125,7 +125,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
             Exception cause = _causeOfFailure.get();
             if (cause != null)
             {
-                cause.printStackTrace();
+                _logger.error("Cause of failure is: ", cause);
                 fail(cause.getMessage());
             }
             else
@@ -142,7 +142,7 @@ public class AcknowledgeOnMessageTest extends AcknowledgeTest implements Message
         Exception cause = _causeOfFailure.get();
         if (cause != null)
         {
-            cause.printStackTrace();
+            _logger.error("Failed due to following exception", cause);
             fail(cause.getMessage());
         }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
index a121b39a56..01f4cdbb05 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/BytesMessageTest.java
@@ -271,8 +271,8 @@ public class BytesMessageTest extends QpidBrokerTestCase implements MessageListe
             count = Integer.parseInt(argv[1]);
         }
 
-        System.out.println("connectionString = " + connectionString);
-        System.out.println("count = " + count);
+        _logger.info("connectionString = " + connectionString);
+        _logger.info("count = " + count);
 
         BytesMessageTest test = new BytesMessageTest();
         test._connectionString = connectionString;
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
index 7bd737ee53..ace8324dab 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/LargeMessageTest.java
@@ -155,8 +155,8 @@ public class LargeMessageTest extends QpidBrokerTestCase
         }
         catch (JMSException e)
         {
-            e.printStackTrace();
-            fail("Excpetion occured:" + e.getCause());
+            _logger.error("Exception occured", e);
+            fail("Exception occured:" + e.getCause());
         }
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 52213d15c4..dc963da680 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -197,7 +197,6 @@ public class PropertyValueTest extends QpidBrokerTestCase implements MessageList
         catch (Exception e)
         {
             _logger.error(e.getMessage(), e);
-            e.printStackTrace();
         }
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
index 0a568d57ad..57b689a291 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/basic/TextMessageTest.java
@@ -95,7 +95,7 @@ public class TextMessageTest extends QpidBrokerTestCase implements MessageListen
         }
         catch (Throwable  e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating consumer", e);
         }
         connection.start();
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
index 0650531d2b..6ea1582bb8 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionStartTest.java
@@ -73,7 +73,7 @@ public class ConnectionStartTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Connection to " + _broker + " should succeed.", e);
             fail("Connection to " + _broker + " should succeed. Reason: " + e);
         }
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
index 728ef85bd2..99dc5ff216 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/client/message/ObjectMessageTest.java
@@ -104,7 +104,7 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("This Test should succeed but failed", e);
             fail("This Test should succeed but failed due to: " + e);
         }
     }
@@ -254,7 +254,7 @@ public class ObjectMessageTest extends QpidBrokerTestCase implements MessageList
         }
         catch (JMSException e)
         {
-            e.printStackTrace();
+            _logger.error("Error getting object from message", e);
             items.add(e);
         }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
index a4e9a992b4..5895d670a7 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/close/MessageRequeueTest.java
@@ -312,7 +312,7 @@ public class MessageRequeueTest extends QpidBrokerTestCase
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("Consumer run error",e);
             }
         }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java b/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
deleted file mode 100644
index 3b30b7d63f..0000000000
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/close/VerifyAckingOkDuringClose.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.qpid.test.unit.close;
-
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQConnectionFactory;
-import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
-
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.naming.InitialContext;
-import java.util.ArrayList;
-
-/**
- * QPID-1791
- *
- * The threading model in the Java broker (at least till 0.5) allows for the
- * close to be handled immediately even if the broker is still processing state
- * for that Session.
- *
- * This test verifys that QPID-1791 is has been handled.
- *
- * The problem was that the whilst the Session is busy processing Acks from the
- * client the Close frame jumps in and clears the unAcknowledgeMap in an
- * attempt to start processing them for closing the connection.
- *
- * If the session had a consumer consuming from a temporary queue. The closing
- * thread dequeues and deletes the message that were on the uncknowledgedMap.
- *
- * However, the Acking thread currently does:
- * queuEntry = unackedMap.get(messageID)
- *
- * dequeueAndDelete(queueEntry)
- *
- * unackedMap.remove(messageID)
- *
- * As a result the queueEntry is sitting in the unackedMap whilst it is being
- * dequeuedAndDeleted which leaves the opportunity for the close thread to
- * remove contents of the unackedMap for processing. The close thread will then
- * dequeueAndDelete all these values one of which the acking thread is currently
- * processing.
- *
- *
- * Test Approach
- *
- * Send a lot of persistent messages (5000), the goal of which is to fill the
- * pretch and to provide the broker with a lot of acks to process
- *
- * Using client ack and prefetch buffer of 5000 use receive to get 2500
- * Use AMQMessage.acknowledgeThis() to send a single ack frame back to the
- * broker per message so 2500 ack frames.
- * This will give the broker a lot to process,
- * Immediately send the consumer close after the acks are all gone.
- * This will cause the remaining 2500 prefetched messages plus any that have
- * not yet had their acks processed
- * to be collected by the requeue() process potentially
- */
-public class VerifyAckingOkDuringClose
-{
-
-    static final int MESSAGE_SENT = 5000;
-
-    public static void main(String[] args) throws Exception
-    {
-        //Check that we have the InitialContext Configured
-
-        if (System.getProperty(InitialContext.INITIAL_CONTEXT_FACTORY) == null)
-        {
-            System.setProperty(InitialContext.INITIAL_CONTEXT_FACTORY, PropertiesFileInitialContextFactory.class.getName());
-        }
-
-        if (System.getProperty(InitialContext.PROVIDER_URL) == null)
-        {
-            System.err.println(InitialContext.PROVIDER_URL + ": Is not set and is required to contain a 'default' ConnectionFactory.");
-            System.exit(1);
-        }
-
-        //Retreive the local factory from the properties file
-        // when used with perftest.properties this will be localhost:5672
-        AMQConnectionFactory factory = (AMQConnectionFactory) new InitialContext().lookup("default");
-
-        AMQConnection connection = (AMQConnection) factory.createConnection("guest", "guest");
-
-        //Use the AMQConnection Interface to set the prefetch to the number
-        // we are sending
-        Session session = connection.createSession(false,
-                                                   Session.CLIENT_ACKNOWLEDGE,
-                                                   MESSAGE_SENT);
-
-        Queue queue = session.createTemporaryQueue();
-
-        MessageConsumer consumer = session.createConsumer(queue);
-        connection.start();
-       
-        MessageProducer producer = session.createProducer(queue);
-
-        Message message = session.createTextMessage("Close");
-
-        for (int i = 0; i < MESSAGE_SENT; i++)
-        {
-            message.setIntProperty("SequenceNumber", i);
-
-            producer.send(message);
-        }
-
-        // Put a reasonable about of data on the queue.
-
-        //Receive all the messags
-        ArrayList<Message> received = new ArrayList<Message>();
-
-        message = consumer.receive(2000);
-
-        while (message != null)
-        {
-            received.add(message);
-            message = consumer.receive(2000);
-        }
-
-        //Check we have all the messages
-        if (received.size() != MESSAGE_SENT)
-        {
-            System.err.println("Test Failed Not all the messages received:" + received.size());
-            System.exit(1);
-        }
-
-        //individually ack the first half then close
-        for (int i = 0; i < MESSAGE_SENT / 2; i++)
-        {
-            ((org.apache.qpid.jms.Message) received.get(i)).acknowledgeThis();
-        }
-
-        // Close the Session to force a requeue on the server of the unackedMsgs
-
-        System.out.println("Killing client to force requeue on broker");
-
-        System.exit(1);
-    }
-
-}
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
index 4b61b6269c..cc8bfb9433 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
@@ -284,7 +284,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
     {
         if(!isBrokerStorePersistent())
         {
-            System.out.println("The broker store is not persistent, skipping this test.");
+            _logger.warn("The broker store is not persistent, skipping this test");
             return;
         }
         
@@ -784,7 +784,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Receive error",e);
         }
 
         conn.stop();
@@ -852,7 +852,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Receive error",e);
         }
 
         conn.stop();
@@ -914,7 +914,7 @@ public class DurableSubscriptionTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("Error creating durable subscriber",e);
         }
     }
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
index 6bf20d7708..c2ea3a5695 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/topic/TopicSessionTest.java
@@ -297,7 +297,7 @@ public class TopicSessionTest extends QpidBrokerTestCase
         m = (TextMessage) noLocal.receive(1000);
         if (m != null)
         {
-            System.out.println("Message:" + m.getText());
+            _logger.info("Message:" + m.getText());
         }
         assertNull(m);
 
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
index 0be4f7ff1d..610628a02d 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
@@ -634,7 +634,7 @@ public class CommitRollbackTest extends QpidBrokerTestCase
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("OnMessage error",e);
             }
         }
     }
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
index 4f7d592958..78c76602c5 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
@@ -108,7 +108,7 @@ public class TransactedTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("setup error",e);
             stopBroker();
             throw e;
         }
@@ -127,7 +127,7 @@ public class TransactedTest extends QpidBrokerTestCase
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            _logger.error("tear down error",e);
         }
         finally
         {
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
index b5d1bff842..92df1bd331 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/AbstractXATestCase.java
@@ -112,7 +112,7 @@ public abstract  class AbstractXATestCase extends QpidBrokerTestCase
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Producer error",e);
                 fail("cannot create message producer: " + e.getMessage());
             }
             // create standard consumer
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
index 39973e12c7..c5fa217aa9 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/FaultTest.java
@@ -39,7 +39,6 @@ import javax.transaction.xa.Xid;
 
 public class FaultTest extends AbstractXATestCase
 {
-    /* this clas logger */
     private static final Logger _logger = LoggerFactory.getLogger(FaultTest.class);
 
     /**
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
index 3fbe76323a..350781e970 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/QueueTest.java
@@ -39,7 +39,6 @@ import javax.transaction.xa.Xid;
 
 public class QueueTest extends AbstractXATestCase
 {
-    /* this clas logger */
     private static final Logger _logger = LoggerFactory.getLogger(QueueTest.class);
 
     /**
@@ -167,7 +166,7 @@ public class QueueTest extends AbstractXATestCase
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("cannot create queue session",e);
                 fail("cannot create queue session: " + e.getMessage());
             }
             init(session, _queue);
@@ -197,7 +196,7 @@ public class QueueTest extends AbstractXATestCase
             }
             catch (XAException e)
             {
-                e.printStackTrace();
+                _logger.error("cannot start the transaction with xid1", e);
                 fail("cannot start the transaction with xid1: " + e.getMessage());
             }
             try
@@ -411,14 +410,14 @@ public class QueueTest extends AbstractXATestCase
                 {
                     if (anInDoubt.equals(xid1))
                     {
-                        System.out.println("commit xid1 ");
+                        _logger.info("commit xid1 ");
                         try
                         {
                             _xaResource.commit(anInDoubt, false);
                         }
                         catch (Exception e)
                         {
-                            System.out.println("PB when aborted xid1");
+                            _logger.error("PB when aborted xid1", e);
                         }
                     }
                     else
@@ -429,7 +428,7 @@ public class QueueTest extends AbstractXATestCase
             }
             catch (XAException e)
             {
-                e.printStackTrace();
+                _logger.error("exception thrown when recovering transactions", e);
                 fail("exception thrown when recovering transactions " + e.getMessage());
             }
             // the queue should contain the first message!
@@ -607,7 +606,7 @@ public class QueueTest extends AbstractXATestCase
                         }
                         catch (Exception e)
                         {
-                            System.out.println("PB when aborted xid1");
+                            _logger.error("PB when aborted xid1", e);
                         }
                     }
                     else if (anInDoubt.equals(xid2))
@@ -619,14 +618,14 @@ public class QueueTest extends AbstractXATestCase
                         }
                         catch (Exception e)
                         {
-                            System.out.println("PB when commiting xid2");
+                            _logger.error("PB when commiting xid2", e);
                         }
                     }
                 }
             }
             catch (XAException e)
             {
-                e.printStackTrace();
+                _logger.error("exception thrown when recovering transactions", e);
                 fail("exception thrown when recovering transactions " + e.getMessage());
             }
             // the queue should be empty
diff --git a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
index d955979ad6..4d9242b8b3 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/unit/xa/TopicTest.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
  */
 public class TopicTest extends AbstractXATestCase
 {
-    /* this clas logger */
+    /* this class logger */
     private static final Logger _logger = LoggerFactory.getLogger(TopicTest.class);
 
     /**
@@ -163,7 +163,7 @@ public class TopicTest extends AbstractXATestCase
             }
             catch (JMSException e)
             {
-                e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+                _logger.error("Error creating topic session", e);
             }
             init(_session, _topic);
         }
@@ -199,7 +199,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (XAException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("cannot start the transaction with xid1", e);
                     fail("cannot start the transaction with xid1: " + e.getMessage());
                 }
                 try
@@ -384,7 +384,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid1", e);
                     fail("Exception when working with xid1: " + e.getMessage());
                 }
                 try
@@ -426,7 +426,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid2", e);
                     fail("Exception when working with xid2: " + e.getMessage());
                 }
                 try
@@ -453,7 +453,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid3", e);
                     fail("Exception when working with xid3: " + e.getMessage());
                 }
                 try
@@ -472,13 +472,13 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid4", e);
                     fail("Exception when working with xid4: " + e.getMessage());
                 }
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("problem when creating dur sub", e);
                 fail("problem when creating dur sub: " + e.getMessage());
             }
             finally
@@ -489,7 +489,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("problem when unsubscribing dur sub", e);
                     fail("problem when unsubscribing dur sub: " + e.getMessage());
                 }
             }
@@ -537,7 +537,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when producing messages", e);
                     fail("Exception thrown when producing messages: " + e.getMessage());
                 }
 
@@ -595,7 +595,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when consumming 6 first messages", e);
                     fail("Exception thrown when consumming 6 first messages: " + e.getMessage());
                 }
                 try
@@ -626,7 +626,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when consumming message: 3, 4 and 7", e);
                     fail("Exception thrown when consumming message: 3, 4 and 7:  " + e.getMessage());
                 }
 
@@ -641,7 +641,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (XAException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("XAException thrown when committing tx3 or aborting tx1", e);
                     fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage());
                 }
 
@@ -676,7 +676,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown in last phase", e);
                     fail("Exception thrown in last phase: " + e.getMessage());
                 }
                 // now the topic should be empty!!
@@ -697,13 +697,13 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid6", e);
                     fail("Exception when working with xid6: " + e.getMessage());
                 }
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("problem when creating dur sub", e);
                 fail("problem when creating dur sub: " + e.getMessage());
             }
             finally
@@ -714,7 +714,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("problem when unsubscribing dur sub", e);
                     fail("problem when unsubscribing dur sub: " + e.getMessage());
                 }
             }
@@ -769,7 +769,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when producing messages", e);
                     fail("Exception thrown when producing messages: " + e.getMessage());
                 }
                 try
@@ -830,7 +830,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when consumming 6 first messages", e);
                     fail("Exception thrown when consumming 6 first messages: " + e.getMessage());
                 }
                 /////// stop the broker now !!
@@ -862,7 +862,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (XAException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("exception thrown when recovering transactions", e);
                     fail("exception thrown when recovering transactions " + e.getMessage());
                 }
                 try
@@ -929,7 +929,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when consumming message: 3, 4 and 7", e);
                     fail("Exception thrown when consumming message: 3, 4 and 7:  " + e.getMessage());
                 }
 
@@ -944,7 +944,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (XAException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("XAException thrown when committing tx3 or aborting tx1", e);
                     fail("XAException thrown when committing tx3 or aborting tx1: " + e.getMessage());
                 }
 
@@ -1024,7 +1024,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown in last phase", e);
                     fail("Exception thrown in last phase: " + e.getMessage());
                 }
                 // now the topic should be empty!!
@@ -1045,13 +1045,13 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid6", e);
                     fail("Exception when working with xid6: " + e.getMessage());
                 }
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("problem when creating dur sub", e);
                 fail("problem when creating dur sub: " + e.getMessage());
             }
             finally
@@ -1062,7 +1062,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("problem when unsubscribing dur sub", e);
                     fail("problem when unsubscribing dur sub: " + e.getMessage());
                 }
             }
@@ -1108,7 +1108,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid1", e);
                     fail("Exception when working with xid1: " + e.getMessage());
                 }
                 try
@@ -1134,7 +1134,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid2", e);
                     fail("Exception when working with xid2: " + e.getMessage());
                 }
 
@@ -1171,26 +1171,26 @@ public class TopicTest extends AbstractXATestCase
                     {
                         if (anInDoubt.equals(xid2))
                         {
-                            System.out.println("aborting xid2 ");
+                            _logger.info("aborting xid2 ");
                             try
                             {
                                 _xaResource.rollback(anInDoubt);
                             }
                             catch (Exception e)
                             {
-                                e.printStackTrace();
+                                _logger.error("exception when aborting xid2 ", e);
                                 fail("exception when aborting xid2 ");
                             }
                         }
                         else
                         {
-                            System.out.println("XID2 is not in doubt ");
+                            _logger.info("XID2 is not in doubt ");
                         }
                     }
                 }
                 catch (XAException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("exception thrown when recovering transactions", e);
                     fail("exception thrown when recovering transactions " + e.getMessage());
                 }
 
@@ -1218,7 +1218,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid3", e);
                     fail("Exception when working with xid3: " + e.getMessage());
                 }
                 try
@@ -1238,13 +1238,13 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception when working with xid4", e);
                     fail("Exception when working with xid4: " + e.getMessage());
                 }
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("problem when creating dur sub", e);
                 fail("problem when creating dur sub: " + e.getMessage());
             }
             finally
@@ -1255,7 +1255,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (JMSException e)
                 {
-                    e.printStackTrace();
+                    _logger.error("problem when unsubscribing dur sub", e);
                     fail("problem when unsubscribing dur sub: " + e.getMessage());
                 }
             }
@@ -1356,8 +1356,7 @@ public class TopicTest extends AbstractXATestCase
                                 }
                                 catch (Exception e)
                                 {
-                                    _logger.debug("PB when aborted xid1");
-                                    e.printStackTrace();
+                                    _logger.error("PB when aborted xid1");
                                     fail("exception when committing xid1 ");
                                 }
                             }
@@ -1369,7 +1368,7 @@ public class TopicTest extends AbstractXATestCase
                     }
                     catch (XAException e)
                     {
-                        e.printStackTrace();
+                        _logger.error("exception thrown when recovering transactions ", e);
                         fail("exception thrown when recovering transactions " + e.getMessage());
                     }
                     _logger.debug("the topic should not be empty");
@@ -1381,13 +1380,13 @@ public class TopicTest extends AbstractXATestCase
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    _logger.error("Exception thrown when testin that queue test is empty", e);
                     fail("Exception thrown when testin that queue test is empty: " + e.getMessage());
                 }
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("cannot create dummy durable subscriber", e);
                 fail("cannot create dummy durable subscriber: " + e.getMessage());
             }
             finally
@@ -1469,7 +1468,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 else if (message.getLongProperty(_sequenceNumberPropertyName) != 2)
                 {
-                    System.out.println("wrong sequence number, 2 expected, received: " + message
+                    _logger.info("wrong sequence number, 2 expected, received: " + message
                             .getLongProperty(_sequenceNumberPropertyName));
                 }
                 _xaResource.end(xid1, XAResource.TMSUCCESS);
@@ -1491,7 +1490,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 else if (message.getLongProperty(_sequenceNumberPropertyName) != 2)
                 {
-                    System.out.println("wrong sequence number, 2 expected, received: " + message
+                    _logger.info("wrong sequence number, 2 expected, received: " + message
                             .getLongProperty(_sequenceNumberPropertyName));
                 }
                 // consume the third message with that xa durable subscriber
@@ -1502,7 +1501,7 @@ public class TopicTest extends AbstractXATestCase
                 }
                 else if (message.getLongProperty(_sequenceNumberPropertyName) != 3)
                 {
-                     System.out.println("wrong sequence number, 3 expected, received: " + message
+                    _logger.info("wrong sequence number, 3 expected, received: " + message
                             .getLongProperty(_sequenceNumberPropertyName));
                 }
                 stSession.commit();
@@ -1565,11 +1564,11 @@ public class TopicTest extends AbstractXATestCase
                     message = (TextMessage) durSub.receive(1000);
                     if (message == null)
                     {
-                        System.out.println("no message received ");
+                        _logger.info("no message received ");
                     }
                     else if (message.getLongProperty(_sequenceNumberPropertyName) != i)
                     {
-                        System.out.println("wrong sequence number, " + i + " expected, received: " + message
+                        _logger.info("wrong sequence number, " + i + " expected, received: " + message
                                 .getLongProperty(_sequenceNumberPropertyName));
                     }
                 }
@@ -1639,7 +1638,7 @@ public class TopicTest extends AbstractXATestCase
             }
             catch (Exception e)
             {
-                e.printStackTrace();
+                _logger.error("Exception thrown", e);
                 fail("Exception thrown: " + e.getMessage());
             }
             finally
@@ -1710,7 +1709,7 @@ public class TopicTest extends AbstractXATestCase
             }
             catch (JMSException e)
             {
-                e.printStackTrace();
+                _logger.error("Error getting long property: " + TopicTest._sequenceNumberPropertyName , e);
                 TopicTest.failure();
                 _lock.set(false);
                 synchronized (_lock)
@@ -1720,7 +1719,7 @@ public class TopicTest extends AbstractXATestCase
             }
             if (seq != _counter)
             {
-                System.out.println("received message " + seq + " expected " + _counter);
+                _logger.info("received message " + seq + " expected " + _counter);
                 TopicTest.failure();
                 _lock.set(false);
                 synchronized (_lock)
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 7ff1d09cb2..91dcf48001 100755
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -255,8 +255,6 @@ public class QpidBrokerTestCase extends QpidTestCase
 
     private void initialiseLogConfigFile()
     {
-        _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH);
-
         _logConfigFile = new File(LOG4J_CONFIG_FILE_PATH);
         if(!_logConfigFile.exists())
         {