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@1560398 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 43 insertions, 23 deletions

diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
index f1dfc52ba4..1680a16b42 100644
--- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/test/java/org/apache/qpid/server/protocol/v0_8/InternalTestProtocolSession.java
+++ b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
+++ b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
index af3f0b7872..b9c10b925f 100644
--- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/QueueDestination.java
+++ b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
+++ b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
+++ b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java b/qpid/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/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/TxnCoordinatorLink_1_0.java
+++ b/qpid/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);
         }
 
     }