Author: ritchiem
Date: Thu Dec 3 09:31:59 2009
New Revision: 886719
URL: http://svn.apache.org/viewvc?rev=886719&view=rev
Log:
QPID-1992 : Updated comments as per review feedback.
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/Log4jMessageLogger.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/SystemOutMessageLogger.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPChannelActor.java
Thu Dec 3 09:31:59 2009
@@ -58,13 +58,14 @@
* ChannelLogSubject.CHANNEL_FORMAT :
* con:{0}({...@{2}/{3})/ch:{4}
*
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
* 1 - User ID
* 2 - IP
* 3 - Virtualhost
+ * 4 - Channel ID
*/
_logString = "[" +
MessageFormat.format(ChannelLogSubject.CHANNEL_FORMAT,
session.getSessionID(),
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AMQPConnectionActor.java
Thu Dec 3 09:31:59 2009
@@ -45,8 +45,8 @@
/**
* LOG FORMAT for the ConnectionLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
* 1 - User ID
@@ -95,8 +95,8 @@
* ConnectionLogSubject.CONNECTION_FORMAT :
* con:{0}({...@{2}/{3})
*
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
* 1 - User ID
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/AbstractActor.java
Thu Dec 3 09:31:59 2009
@@ -25,6 +25,22 @@
import org.apache.qpid.server.logging.LogSubject;
import org.apache.qpid.server.logging.RootMessageLogger;
+/**
+ * This AbstractActor is the basis for all the actors instances.
+ *
+ * It provides the common initialisation and message methods.
+ *
+ * It is abstract as it leaves the setting of _logString to the instances.
+ *
+ * The setting of the _logString is done so that the LogActor that the log
+ * messages was sent to can be identified in the log output.
+ *
+ * When a log message is created it is written to the RootMessageLogger in the
+ * format:
+ *
+ * _logString [+ subject] + message
+ *
+ */
public abstract class AbstractActor implements LogActor
{
protected String _logString;
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
Thu Dec 3 09:31:59 2009
@@ -27,6 +27,14 @@
import java.text.MessageFormat;
/**
+ *
+ * The ManagementActor is a logging actor to provide details about the
+ * management connection that is performing actions.
+ *
+ * This allows actions such as CON-1002, connection close, to be distiguished
+ * between a user logged in via the management console closing the connection
+ * and the connected client closing the connection.
+ *
* NOTE: This actor is not thread safe.
*
* Sharing of a ManagementActor instance between threads may result in an
@@ -44,12 +52,11 @@
/**
* LOG FORMAT for the ManagementActor,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
- * 1 - User ID
- * 2 - IP
+ * 1 - IP
*/
public static final String MANAGEMENT_FORMAT = "mng:{0}({1})";
@@ -60,6 +67,9 @@
}
+ /**
+ * Called to ensure we have the correct _logString for the given thread.
+ */
private void updateLogString()
{
String currentName = Thread.currentThread().getName();
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/QueueActor.java
Thu Dec 3 09:31:59 2009
@@ -43,7 +43,7 @@
{
super(rootLogger);
- _logString = "[" + MessageFormat.format(QueueLogSubject.LOG_FORMAT,
+ _logString = "[" + MessageFormat.format(QueueLogSubject.QUEUE_FORMAT,
queue.getVirtualHost().getName(),
queue.getName()) + "] ";
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/SubscriptionActor.java
Thu Dec 3 09:31:59 2009
@@ -25,6 +25,10 @@
import java.text.MessageFormat;
+/**
+ * The subscription actor provides formatted logging for actions that are
+ * performed by the subsciption. Such as SUB-1003 state changes.
+ */
public class SubscriptionActor extends AbstractActor
{
public static String SUBSCRIBER_FORMAT = "sub:{0}(vh({1})/qu({2}))";
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
Thu Dec 3 09:31:59 2009
@@ -37,7 +37,7 @@
#
# The cavet here is that only default String and number FormatTypes can be
used.
# This is due to the processing described in 3 below. If support for date,
time
-# or choice is requried then the GenerateLogMessages class should be updated
to
+# or choice is required then the GenerateLogMessages class should be updated
to
# provide support.
#
# Format Note:
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/Log4jMessageLogger.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/Log4jMessageLogger.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/Log4jMessageLogger.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/Log4jMessageLogger.java
Thu Dec 3 09:31:59 2009
@@ -24,6 +24,13 @@
import org.apache.log4j.Logger;
import org.apache.qpid.server.logging.RawMessageLogger;
+/**
+ * Log4j Binding for Logging Framework.
+ *
+ * This RawMessageLogger takes a messages and logs them to log4j on the given
+ * Logger. DEFAULT 'qpid.message' , level : INFO
+ *
+ */
public class Log4jMessageLogger implements RawMessageLogger
{
public static final String DEFAULT_LEVEL = "INFO";
@@ -31,11 +38,19 @@
private Level _level;
private Logger _rawMessageLogger;
+ /**
+ * Create a Logger that uses the default logger and level.
+ */
public Log4jMessageLogger()
{
this(DEFAULT_LEVEL, DEFAULT_LOGGER);
}
+ /**
+ * Create a new logger with the given level and logger values
+ * @param level String value of the Level to use {...@see Level}.
+ * @param logger The logger name to use.
+ */
public Log4jMessageLogger(String level, String logger)
{
_level = Level.toLevel(level);
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/SystemOutMessageLogger.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/SystemOutMessageLogger.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/SystemOutMessageLogger.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/rawloggers/SystemOutMessageLogger.java
Thu Dec 3 09:31:59 2009
@@ -22,6 +22,11 @@
import org.apache.qpid.server.logging.RawMessageLogger;
+/**
+ * System Out Binding for Logging Framework.
+ *
+ * Logs all messages to System.out
+ */
public class SystemOutMessageLogger implements RawMessageLogger
{
public void rawMessage(String message)
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/AbstractLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -25,7 +25,7 @@
import java.text.MessageFormat;
/**
- * The LogSubjects all have a similar requriement to format their output and
+ * The LogSubjects all have a similar requirement to format their output and
* provide the String value.
*
* This Abstract LogSubject provides this basic functionality, allowing the
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/BindingLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -29,8 +29,8 @@
/**
* LOG FORMAT for the ChannelLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Virtualhost Name
* 1 - Exchange Type
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ChannelLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -27,8 +27,8 @@
{
/**
* LOG FORMAT for the ChannelLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
* 1 - User ID
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -28,8 +28,8 @@
/**
* LOG FORMAT for the ConnectionLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Connection ID
* 1 - User ID
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/ExchangeLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -28,19 +28,19 @@
/**
* LOG FORMAT for the ExchangeLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Virtualhost Name
* 1 - Exchange Type
* 2 - Exchange Name
*/
- protected static String BINDING_FORMAT = "vh(/{0})/ex({1}/{2})";
+ protected static String EXCHANGE_FORMAT = "vh(/{0})/ex({1}/{2})";
/** Create an ExchangeLogSubject that Logs in the following format. */
public ExchangeLogSubject(Exchange exchange, VirtualHost vhost)
{
- setLogStringWithFormat(BINDING_FORMAT, vhost.getName(),
+ setLogStringWithFormat(EXCHANGE_FORMAT, vhost.getName(),
exchange.getType(), exchange.getName());
}
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/MessageStoreLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -28,18 +28,18 @@
/**
* LOG FORMAT for the MessagesStoreLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Virtualhost Name
* 1 - Message Store Type
*/
- protected static String BINDING_FORMAT = "vh(/{0})/ms({1})";
+ protected static String MESSAGE_STORE_FORMAT = "vh(/{0})/ms({1})";
/** Create an ExchangeLogSubject that Logs in the following format. */
public MessageStoreLogSubject(VirtualHost vhost, MessageStore store)
{
- setLogStringWithFormat(BINDING_FORMAT, vhost.getName(),
+ setLogStringWithFormat(MESSAGE_STORE_FORMAT, vhost.getName(),
store.getClass().getSimpleName());
}
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/QueueLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -22,23 +22,24 @@
import org.apache.qpid.server.queue.AMQQueue;
-public class QueueLogSubject extends AbstractLogSubject
+public class
+ QueueLogSubject extends AbstractLogSubject
{
/**
* LOG FORMAT for the ExchangeLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Virtualhost name
* 1 - queue name
*/
- public static String LOG_FORMAT = "vh(/{0})/qu({1})";
+ public static String QUEUE_FORMAT = "vh(/{0})/qu({1})";
/** Create an QueueLogSubject that Logs in the following format. */
public QueueLogSubject(AMQQueue queue)
{
- setLogStringWithFormat(LOG_FORMAT,
+ setLogStringWithFormat(QUEUE_FORMAT,
queue.getVirtualHost().getName(),
queue.getName());
}
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java?rev=886719&r1=886718&r2=886719&view=diff
==============================================================================
---
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
(original)
+++
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/subjects/SubscriptionLogSubject.java
Thu Dec 3 09:31:59 2009
@@ -27,13 +27,13 @@
/**
* LOG FORMAT for the SubscriptionLogSubject,
- * Uses a MessageFormat call to insert the requried values according to
- * these indicies:
+ * Uses a MessageFormat call to insert the required values according to
+ * these indices:
*
* 0 - Subscription ID
* 1 - queue name
*/
- protected static String BINDING_FORMAT = "sub:{0}(qu({1}))";
+ protected static String SUBSCRIPTION_FORMAT = "sub:{0}(qu({1}))";
/**
* Create an QueueLogSubject that Logs in the following format.
@@ -43,7 +43,7 @@
public SubscriptionLogSubject(Subscription subscription)
{
- setLogStringWithFormat(BINDING_FORMAT,
subscription.getSubscriptionID(),
+ setLogStringWithFormat(SUBSCRIPTION_FORMAT,
subscription.getSubscriptionID(),
subscription.getQueue().getName());
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
