From daf5e34ea42702c102df5363284b2e3e5ef4e192 Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Tue, 19 Dec 2006 16:09:39 +0000
Subject: Maven output clean up. Mainly removed exception stack traces from
 expected exceptions.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488713 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/java/org/apache/qpid/server/util/CircularBuffer.java  |  9 +++++++--
 .../org/apache/qpid/test/unit/basic/PropertyValueTest.java     | 10 +++++-----
 .../qpid/test/unit/client/channelclose/ChannelCloseOkTest.java |  4 ++--
 .../main/java/org/apache/qpid/framing/PropertyFieldTable.java  |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java b/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
index 4767844abe..b58d551226 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
@@ -20,10 +20,15 @@
  */
 package org.apache.qpid.server.util;
 
+import org.apache.log4j.Logger;
+
 import java.util.Iterator;
 
 public class CircularBuffer implements Iterable
 {
+
+    private static final Logger _logger = Logger.getLogger(CircularBuffer.class);
+
     private final Object[] _log;
     private int _size;
     private int _index;
@@ -102,7 +107,7 @@ public class CircularBuffer implements Iterable
     {
         for(Object o : this)
         {
-         System.out.println(o);   
+         _logger.info(o);
         }
     }
 
@@ -120,7 +125,7 @@ public class CircularBuffer implements Iterable
         for(String s : items)
         {
             buffer.add(s);
-            System.out.println(buffer);
+            _logger.info(buffer);
         }
     }
 }
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
index 7f76baa157..17679788bd 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
@@ -116,7 +116,9 @@ public class PropertyValueTest extends TestCase implements MessageListener
             m.setIntProperty("Int", (int) Integer.MAX_VALUE);
 
             m.setJMSCorrelationID("Correlation");
-            m.setJMSPriority(100);
+            //fixme the m.setJMSMessage has no effect
+            producer.setPriority(8);
+            m.setJMSPriority(3);
 
             //  Queue
             Queue q;
@@ -182,10 +184,8 @@ public class PropertyValueTest extends TestCase implements MessageListener
                                 (int) Integer.MAX_VALUE, m.getIntProperty("Int"));
             Assert.assertEquals("Check CorrelationID properties are correctly transported",
                                 "Correlation", m.getJMSCorrelationID());
-
-            _logger.warn("getJMSPriority not being verified.");
-//            Assert.assertEquals("Check Priority properties are correctly transported",
-//                                100, m.getJMSPriority());
+            Assert.assertEquals("Check Priority properties are correctly transported",
+                                8, m.getJMSPriority());
 
             // Queue
             Assert.assertEquals("Check ReplyTo properties are correctly transported",
diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
index 7d4c2d06d3..ac789eb915 100644
--- a/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
+++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
@@ -121,7 +121,7 @@ public class ChannelCloseOkTest extends TestCase
     {
         if (_connection != null)
         {
-            System.out.println(">>>>>>>>>>>>>>.. closing");
+            _log.info(">>>>>>>>>>>>>>.. closing");
             _connection.close();
         }
     }
@@ -137,7 +137,7 @@ public class ChannelCloseOkTest extends TestCase
         {
             public void onException(JMSException jmsException)
             {
-                _log.error("onException - ", jmsException);
+                _log.warn("onException - "+jmsException.getMessage());
             }
         });
 
diff --git a/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java b/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
index 83cd204ca9..4b8f56e4e8 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
@@ -129,7 +129,7 @@ public class PropertyFieldTable implements FieldTable
         }
         catch (Exception e)
         {
-            _logger.warn("Unable to decode PropertyFieldTable format:" + textFormat, e);
+            _logger.warn("Unable to decode PropertyFieldTable format:" + textFormat);
             throw new IllegalArgumentException("Unable to decode PropertyFieldTable format:" + textFormat);
         }
     }
@@ -607,7 +607,7 @@ public class PropertyFieldTable implements FieldTable
         if (!(Character.isLetter(propertyName.charAt(0))
               || propertyName.charAt(0) == '$'
               || propertyName.charAt(0) == '#'
-              || propertyName.charAt(0) == '_')) // Not official AMQP added for JMS.                
+              || propertyName.charAt(0) == '_')) // Not official AMQP added for JMS.
         {
             throw new IllegalArgumentException("Identifier '" + propertyName + "' does not start with a valid AMQP start character");
         }
-- 
cgit v1.2.1