You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/12/19 17:09:40 UTC
svn commit: r488713 - in /incubator/qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/server/util/
client/src/test/java/org/apache/qpid/test/unit/basic/
client/src/test/java/org/apache/qpid/test/unit/client/channelclose/
common/src/main/java/o...
Author: ritchiem
Date: Tue Dec 19 08:09:39 2006
New Revision: 488713
URL: http://svn.apache.org/viewvc?view=rev&rev=488713
Log:
Maven output clean up.
Mainly removed exception stack traces from expected exceptions.
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
Modified: incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java?view=diff&rev=488713&r1=488712&r2=488713
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/util/CircularBuffer.java Tue Dec 19 08:09:39 2006
@@ -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 @@
{
for(Object o : this)
{
- System.out.println(o);
+ _logger.info(o);
}
}
@@ -120,7 +125,7 @@
for(String s : items)
{
buffer.add(s);
- System.out.println(buffer);
+ _logger.info(buffer);
}
}
}
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?view=diff&rev=488713&r1=488712&r2=488713
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Tue Dec 19 08:09:39 2006
@@ -116,7 +116,9 @@
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 @@
(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",
Modified: incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java?view=diff&rev=488713&r1=488712&r2=488713
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/channelclose/ChannelCloseOkTest.java Tue Dec 19 08:09:39 2006
@@ -121,7 +121,7 @@
{
if (_connection != null)
{
- System.out.println(">>>>>>>>>>>>>>.. closing");
+ _log.info(">>>>>>>>>>>>>>.. closing");
_connection.close();
}
}
@@ -137,7 +137,7 @@
{
public void onException(JMSException jmsException)
{
- _log.error("onException - ", jmsException);
+ _log.warn("onException - "+jmsException.getMessage());
}
});
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java?view=diff&rev=488713&r1=488712&r2=488713
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/PropertyFieldTable.java Tue Dec 19 08:09:39 2006
@@ -129,7 +129,7 @@
}
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 @@
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");
}