Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -23,4 +23,6 @@ OPEN = KST-1002 : Open CLOSE = KST-1003 : Close DELETE = KST-1004 : Delete "{0}" EXPIRING = KST-1005 : KeyStore {0} Certificate expires in {1} days : {2} +# 0 - operation name +OPERATION = KST-1006 : Operation : {0}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,38 +63,38 @@ public class ManagementConsoleMessages } public static final String MANAGEMENTCONSOLE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole"; - public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open"; - public static final String LISTENING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.listening"; - public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.stopped"; - public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.close"; + public static final String READY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.ready"; public static final String SHUTTING_DOWN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.shutting_down"; + public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.stopped"; + public static final String LISTENING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.listening"; public static final String STARTUP_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.startup"; - public static final String READY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.ready"; + public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.close"; + public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open"; static { LoggerFactory.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY); - LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); - LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY); - LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY); - LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(READY_LOG_HIERARCHY); LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY); + LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY); + LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY); LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY); - LoggerFactory.getLogger(READY_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ManagementConsole_logmessages", _currentLocale); } /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1007 : Open : User {0}</pre> + * <pre>MNG-1004 : {0} Management Ready</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage OPEN(String param1) + public static LogMessage READY(String param1) { - String rawMessage = _messages.getString("OPEN"); + String rawMessage = _messages.getString("READY"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -112,7 +112,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return OPEN_LOG_HIERARCHY; + return READY_LOG_HIERARCHY; } @Override @@ -145,16 +145,16 @@ public class ManagementConsoleMessages /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1002 : Starting : {0} : Listening on {1} port {2,number,#}</pre> + * <pre>MNG-1003 : Shutting down : {0} : port {1,number,#}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage LISTENING(String param1, String param2, Number param3) + public static LogMessage SHUTTING_DOWN(String param1, Number param2) { - String rawMessage = _messages.getString("LISTENING"); + String rawMessage = _messages.getString("SHUTTING_DOWN"); - final Object[] messageArguments = {param1, param2, param3}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -170,7 +170,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return LISTENING_LOG_HIERARCHY; + return SHUTTING_DOWN_LOG_HIERARCHY; } @Override @@ -261,16 +261,16 @@ public class ManagementConsoleMessages /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1008 : Close : User {0}</pre> + * <pre>MNG-1002 : Starting : {0} : Listening on {1} port {2,number,#}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSE(String param1) + public static LogMessage LISTENING(String param1, String param2, Number param3) { - String rawMessage = _messages.getString("CLOSE"); + String rawMessage = _messages.getString("LISTENING"); - final Object[] messageArguments = {param1}; + final Object[] messageArguments = {param1, param2, param3}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -286,7 +286,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return CLOSE_LOG_HIERARCHY; + return LISTENING_LOG_HIERARCHY; } @Override @@ -319,16 +319,16 @@ public class ManagementConsoleMessages /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1003 : Shutting down : {0} : port {1,number,#}</pre> + * <pre>MNG-1001 : {0} Management Startup</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage SHUTTING_DOWN(String param1, Number param2) + public static LogMessage STARTUP(String param1) { - String rawMessage = _messages.getString("SHUTTING_DOWN"); + String rawMessage = _messages.getString("STARTUP"); - final Object[] messageArguments = {param1, param2}; + final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -344,7 +344,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return SHUTTING_DOWN_LOG_HIERARCHY; + return STARTUP_LOG_HIERARCHY; } @Override @@ -377,14 +377,14 @@ public class ManagementConsoleMessages /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1001 : {0} Management Startup</pre> + * <pre>MNG-1008 : Close : User {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage STARTUP(String param1) + public static LogMessage CLOSE(String param1) { - String rawMessage = _messages.getString("STARTUP"); + String rawMessage = _messages.getString("CLOSE"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -402,7 +402,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return STARTUP_LOG_HIERARCHY; + return CLOSE_LOG_HIERARCHY; } @Override @@ -435,14 +435,14 @@ public class ManagementConsoleMessages /** * Log a ManagementConsole message of the Format: - * <pre>MNG-1004 : {0} Management Ready</pre> + * <pre>MNG-1007 : Open : User {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage READY(String param1) + public static LogMessage OPEN(String param1) { - String rawMessage = _messages.getString("READY"); + String rawMessage = _messages.getString("OPEN"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -460,7 +460,7 @@ public class ManagementConsoleMessages public String getLogHierarchy() { - return READY_LOG_HIERARCHY; + return OPEN_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,42 +63,40 @@ public class MessageStoreMessages } public static final String MESSAGESTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore"; + public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_start"; + public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.created"; + public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.store_location"; public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_complete"; - public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.closed"; public static final String OVERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.overfull"; - public static final String RECOVERED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovered"; + public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.closed"; public static final String UNDERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.underfull"; - public static final String PASSIVATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.passivate"; - public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.created"; - public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.store_location"; - public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_start"; + public static final String RECOVERED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovered"; static { LoggerFactory.getLogger(MESSAGESTORE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); + LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); - LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY); - LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY); - LoggerFactory.getLogger(PASSIVATE_LOG_HIERARCHY); - LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); - LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); - LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.MessageStore_logmessages", _currentLocale); } /** * Log a MessageStore message of the Format: - * <pre>MST-1006 : Recovery Complete</pre> + * <pre>MST-1004 : Recovery Start</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERY_COMPLETE() + public static LogMessage RECOVERY_START() { - String rawMessage = _messages.getString("RECOVERY_COMPLETE"); + String rawMessage = _messages.getString("RECOVERY_START"); final String message = rawMessage; @@ -111,7 +109,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return RECOVERY_COMPLETE_LOG_HIERARCHY; + return RECOVERY_START_LOG_HIERARCHY; } @Override @@ -144,14 +142,14 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1003 : Closed</pre> + * <pre>MST-1001 : Created</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSED() + public static LogMessage CREATED() { - String rawMessage = _messages.getString("CLOSED"); + String rawMessage = _messages.getString("CREATED"); final String message = rawMessage; @@ -164,7 +162,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return CLOSED_LOG_HIERARCHY; + return CREATED_LOG_HIERARCHY; } @Override @@ -197,16 +195,21 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1008 : Store overfull, flow control will be enforced</pre> + * <pre>MST-1002 : Store location : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage OVERFULL() + public static LogMessage STORE_LOCATION(String param1) { - String rawMessage = _messages.getString("OVERFULL"); + String rawMessage = _messages.getString("STORE_LOCATION"); - final String message = rawMessage; + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); return new LogMessage() { @@ -217,7 +220,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return OVERFULL_LOG_HIERARCHY; + return STORE_LOCATION_LOG_HIERARCHY; } @Override @@ -250,21 +253,16 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1005 : Recovered {0,number} messages</pre> + * <pre>MST-1006 : Recovery Complete</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERED(Number param1) + public static LogMessage RECOVERY_COMPLETE() { - String rawMessage = _messages.getString("RECOVERED"); - - final Object[] messageArguments = {param1}; - // Create a new MessageFormat to ensure thread safety. - // Sharing a MessageFormat and using applyPattern is not thread safe - MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + String rawMessage = _messages.getString("RECOVERY_COMPLETE"); - final String message = formatter.format(messageArguments); + final String message = rawMessage; return new LogMessage() { @@ -275,7 +273,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return RECOVERED_LOG_HIERARCHY; + return RECOVERY_COMPLETE_LOG_HIERARCHY; } @Override @@ -308,14 +306,14 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1009 : Store overfull condition cleared</pre> + * <pre>MST-1008 : Store overfull, flow control will be enforced</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage UNDERFULL() + public static LogMessage OVERFULL() { - String rawMessage = _messages.getString("UNDERFULL"); + String rawMessage = _messages.getString("OVERFULL"); final String message = rawMessage; @@ -328,7 +326,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return UNDERFULL_LOG_HIERARCHY; + return OVERFULL_LOG_HIERARCHY; } @Override @@ -361,14 +359,14 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1001 : Created</pre> + * <pre>MST-1003 : Closed</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CREATED() + public static LogMessage CLOSED() { - String rawMessage = _messages.getString("CREATED"); + String rawMessage = _messages.getString("CLOSED"); final String message = rawMessage; @@ -381,7 +379,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return CREATED_LOG_HIERARCHY; + return CLOSED_LOG_HIERARCHY; } @Override @@ -414,21 +412,16 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1002 : Store location : {0}</pre> + * <pre>MST-1009 : Store overfull condition cleared</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage STORE_LOCATION(String param1) + public static LogMessage UNDERFULL() { - String rawMessage = _messages.getString("STORE_LOCATION"); - - final Object[] messageArguments = {param1}; - // Create a new MessageFormat to ensure thread safety. - // Sharing a MessageFormat and using applyPattern is not thread safe - MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + String rawMessage = _messages.getString("UNDERFULL"); - final String message = formatter.format(messageArguments); + final String message = rawMessage; return new LogMessage() { @@ -439,7 +432,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return STORE_LOCATION_LOG_HIERARCHY; + return UNDERFULL_LOG_HIERARCHY; } @Override @@ -472,16 +465,21 @@ public class MessageStoreMessages /** * Log a MessageStore message of the Format: - * <pre>MST-1004 : Recovery Start</pre> + * <pre>MST-1005 : Recovered {0,number} messages</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERY_START() + public static LogMessage RECOVERED(Number param1) { - String rawMessage = _messages.getString("RECOVERY_START"); + String rawMessage = _messages.getString("RECOVERED"); - final String message = rawMessage; + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); return new LogMessage() { @@ -492,7 +490,7 @@ public class MessageStoreMessages public String getLogHierarchy() { - return RECOVERY_START_LOG_HIERARCHY; + return RECOVERED_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -68,6 +68,7 @@ public class PortMessages public static final String UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.unsupported_protocol_header"; public static final String CONNECTION_REJECTED_CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected_closed"; public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn"; + public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.operation"; public static final String BIND_FAILED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.bind_failed"; public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close"; public static final String CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected_too_many"; @@ -81,6 +82,7 @@ public class PortMessages LoggerFactory.getLogger(UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY); LoggerFactory.getLogger(CONNECTION_REJECTED_CLOSED_LOG_HIERARCHY); LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY); + LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY); LoggerFactory.getLogger(BIND_FAILED_LOG_HIERARCHY); LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); LoggerFactory.getLogger(CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY); @@ -352,6 +354,64 @@ public class PortMessages } @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + final LogMessage that = (LogMessage) o; + + return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString()); + + } + + @Override + public int hashCode() + { + int result = toString().hashCode(); + result = 31 * result + getLogHierarchy().hashCode(); + return result; + } + }; + } + + /** + * Log a Port message of the Format: + * <pre>PRT-1010 : Operation : {0}</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage OPERATION(String param1) + { + String rawMessage = _messages.getString("OPERATION"); + + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return OPERATION_LOG_HIERARCHY; + } + + @Override public boolean equals(final Object o) { if (this == o) Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -30,3 +30,6 @@ UNSUPPORTED_PROTOCOL_HEADER = PRT-1007 : CONNECTION_REJECTED_CLOSED = PRT-1008 : Connection from {0} rejected. Port closed. BIND_FAILED = PRT-1009 : FAILED to bind {0} service to {1,number,#} - port in use +# 0 - operation name +OPERATION = PRT-1010 : Operation : {0} + Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,21 +63,23 @@ public class QueueMessages } public static final String QUEUE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue"; + public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.created"; public static final String OVERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.overfull"; + public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.operation"; + public static final String FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.flow_to_disk_active"; public static final String UNDERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.underfull"; - public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.created"; public static final String DELETED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.deleted"; - public static final String FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.flow_to_disk_active"; public static final String FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.flow_to_disk_inactive"; static { LoggerFactory.getLogger(QUEUE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY); + LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY); + LoggerFactory.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY); LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY); - LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); LoggerFactory.getLogger(DELETED_LOG_HIERARCHY); - LoggerFactory.getLogger(FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY); LoggerFactory.getLogger(FLOW_TO_DISK_INACTIVE_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Queue_logmessages", _currentLocale); @@ -85,16 +87,79 @@ public class QueueMessages /** * Log a Queue message of the Format: - * <pre>QUE-1003 : Overfull : Size : {0,number} bytes, Capacity : {1,number}</pre> + * <pre>QUE-1001 : Create : ID: {0}[ Owner: {1}][ AutoDelete][ Durable][ Transient][ Priority: {2,number,#}]</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage OVERFULL(Number param1, Number param2) + public static LogMessage CREATED(String param1, String param2, Number param3, boolean opt1, boolean opt2, boolean opt3, boolean opt4, boolean opt5) { - String rawMessage = _messages.getString("OVERFULL"); + String rawMessage = _messages.getString("CREATED"); + StringBuffer msg = new StringBuffer(); - final Object[] messageArguments = {param1, param2}; + // Split the formatted message up on the option values so we can + // rebuild the message based on the configured options. + String[] parts = rawMessage.split("\\["); + msg.append(parts[0]); + + int end; + if (parts.length > 1) + { + + // Add Option : Owner: {1}. + end = parts[1].indexOf(']'); + if (opt1) + { + msg.append(parts[1].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[1].substring(end + 1)); + + // Add Option : AutoDelete. + end = parts[2].indexOf(']'); + if (opt2) + { + msg.append(parts[2].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[2].substring(end + 1)); + + // Add Option : Durable. + end = parts[3].indexOf(']'); + if (opt3) + { + msg.append(parts[3].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[3].substring(end + 1)); + + // Add Option : Transient. + end = parts[4].indexOf(']'); + if (opt4) + { + msg.append(parts[4].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[4].substring(end + 1)); + + // Add Option : Priority: {2,number,#}. + end = parts[5].indexOf(']'); + if (opt5) + { + msg.append(parts[5].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[5].substring(end + 1)); + } + + rawMessage = msg.toString(); + + final Object[] messageArguments = {param1, param2, param3}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -110,7 +175,7 @@ public class QueueMessages public String getLogHierarchy() { - return OVERFULL_LOG_HIERARCHY; + return CREATED_LOG_HIERARCHY; } @Override @@ -143,14 +208,14 @@ public class QueueMessages /** * Log a Queue message of the Format: - * <pre>QUE-1004 : Underfull : Size : {0,number} bytes, Resume Capacity : {1,number}</pre> + * <pre>QUE-1003 : Overfull : Size : {0,number} bytes, Capacity : {1,number}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage UNDERFULL(Number param1, Number param2) + public static LogMessage OVERFULL(Number param1, Number param2) { - String rawMessage = _messages.getString("UNDERFULL"); + String rawMessage = _messages.getString("OVERFULL"); final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. @@ -168,7 +233,7 @@ public class QueueMessages public String getLogHierarchy() { - return UNDERFULL_LOG_HIERARCHY; + return OVERFULL_LOG_HIERARCHY; } @Override @@ -201,79 +266,74 @@ public class QueueMessages /** * Log a Queue message of the Format: - * <pre>QUE-1001 : Create : ID: {0}[ Owner: {1}][ AutoDelete][ Durable][ Transient][ Priority: {2,number,#}]</pre> + * <pre>QUE-1016 : Operation : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CREATED(String param1, String param2, Number param3, boolean opt1, boolean opt2, boolean opt3, boolean opt4, boolean opt5) + public static LogMessage OPERATION(String param1) { - String rawMessage = _messages.getString("CREATED"); - StringBuffer msg = new StringBuffer(); + String rawMessage = _messages.getString("OPERATION"); - // Split the formatted message up on the option values so we can - // rebuild the message based on the configured options. - String[] parts = rawMessage.split("\\["); - msg.append(parts[0]); + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); - int end; - if (parts.length > 1) - { + final String message = formatter.format(messageArguments); - // Add Option : Owner: {1}. - end = parts[1].indexOf(']'); - if (opt1) + return new LogMessage() + { + public String toString() { - msg.append(parts[1].substring(0, end)); + return message; } - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[1].substring(end + 1)); - - // Add Option : AutoDelete. - end = parts[2].indexOf(']'); - if (opt2) + public String getLogHierarchy() { - msg.append(parts[2].substring(0, end)); + return OPERATION_LOG_HIERARCHY; } - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[2].substring(end + 1)); - - // Add Option : Durable. - end = parts[3].indexOf(']'); - if (opt3) + @Override + public boolean equals(final Object o) { - msg.append(parts[3].substring(0, end)); - } + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[3].substring(end + 1)); + final LogMessage that = (LogMessage) o; - // Add Option : Transient. - end = parts[4].indexOf(']'); - if (opt4) - { - msg.append(parts[4].substring(0, end)); - } + return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString()); - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[4].substring(end + 1)); + } - // Add Option : Priority: {2,number,#}. - end = parts[5].indexOf(']'); - if (opt5) + @Override + public int hashCode() { - msg.append(parts[5].substring(0, end)); + int result = toString().hashCode(); + result = 31 * result + getLogHierarchy().hashCode(); + return result; } + }; + } - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[5].substring(end + 1)); - } - - rawMessage = msg.toString(); + /** + * Log a Queue message of the Format: + * <pre>QUE-1014 : Message flow to disk active : Message memory use {0,number,#} kB exceeds threshold {1,number,#.##} kB</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage FLOW_TO_DISK_ACTIVE(Number param1, Number param2) + { + String rawMessage = _messages.getString("FLOW_TO_DISK_ACTIVE"); - final Object[] messageArguments = {param1, param2, param3}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -289,7 +349,7 @@ public class QueueMessages public String getLogHierarchy() { - return CREATED_LOG_HIERARCHY; + return FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY; } @Override @@ -322,16 +382,16 @@ public class QueueMessages /** * Log a Queue message of the Format: - * <pre>QUE-1002 : Deleted : ID: {0}</pre> + * <pre>QUE-1004 : Underfull : Size : {0,number} bytes, Resume Capacity : {1,number}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage DELETED(String param1) + public static LogMessage UNDERFULL(Number param1, Number param2) { - String rawMessage = _messages.getString("DELETED"); + String rawMessage = _messages.getString("UNDERFULL"); - final Object[] messageArguments = {param1}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -347,7 +407,7 @@ public class QueueMessages public String getLogHierarchy() { - return DELETED_LOG_HIERARCHY; + return UNDERFULL_LOG_HIERARCHY; } @Override @@ -380,16 +440,16 @@ public class QueueMessages /** * Log a Queue message of the Format: - * <pre>QUE-1014 : Message flow to disk active : Message memory use {0,number,#} kB exceeds threshold {1,number,#.##} kB</pre> + * <pre>QUE-1002 : Deleted : ID: {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage FLOW_TO_DISK_ACTIVE(Number param1, Number param2) + public static LogMessage DELETED(String param1) { - String rawMessage = _messages.getString("FLOW_TO_DISK_ACTIVE"); + String rawMessage = _messages.getString("DELETED"); - final Object[] messageArguments = {param1, param2}; + final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -405,7 +465,7 @@ public class QueueMessages public String getLogHierarchy() { - return FLOW_TO_DISK_ACTIVE_LOG_HIERARCHY; + return DELETED_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -29,3 +29,6 @@ UNDERFULL = QUE-1004 : Underfull : Size # use similar number to the broker for similar topic FLOW_TO_DISK_ACTIVE = QUE-1014 : Message flow to disk active : Message memory use {0,number,#} kB exceeds threshold {1,number,#.##} kB FLOW_TO_DISK_INACTIVE = QUE-1015 : Message flow to disk inactive : Message memory use {0,number,#} kB within threshold {1,number,#.##} kB + +# 0 - operation name +OPERATION = QUE-1016 : Operation : {0} Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -64,15 +64,17 @@ public class SubscriptionMessages public static final String SUBSCRIPTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription"; public static final String STATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.state"; - public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.create"; public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.close"; + public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.create"; + public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.operation"; static { LoggerFactory.getLogger(SUBSCRIPTION_LOG_HIERARCHY); LoggerFactory.getLogger(STATE_LOG_HIERARCHY); - LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); + LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Subscription_logmessages", _currentLocale); } @@ -137,6 +139,59 @@ public class SubscriptionMessages /** * Log a Subscription message of the Format: + * <pre>SUB-1002 : Close</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage CLOSE() + { + String rawMessage = _messages.getString("CLOSE"); + + final String message = rawMessage; + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return CLOSE_LOG_HIERARCHY; + } + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + final LogMessage that = (LogMessage) o; + + return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString()); + + } + + @Override + public int hashCode() + { + int result = toString().hashCode(); + result = 31 * result + getLogHierarchy().hashCode(); + return result; + } + }; + } + + /** + * Log a Subscription message of the Format: * <pre>SUB-1001 : Create[ : Durable][ : Arguments : {0}]</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. @@ -228,16 +283,21 @@ public class SubscriptionMessages /** * Log a Subscription message of the Format: - * <pre>SUB-1002 : Close</pre> + * <pre>SUB-1004 : Operation : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSE() + public static LogMessage OPERATION(String param1) { - String rawMessage = _messages.getString("CLOSE"); + String rawMessage = _messages.getString("OPERATION"); - final String message = rawMessage; + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); return new LogMessage() { @@ -248,7 +308,7 @@ public class SubscriptionMessages public String getLogHierarchy() { - return CLOSE_LOG_HIERARCHY; + return OPERATION_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Subscription_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -22,3 +22,6 @@ CREATE = SUB-1001 : Create[ : Durable][ CLOSE = SUB-1002 : Close # 0 - The current subscription state STATE = SUB-1003 : Suspended for {0,number} ms + +# 0 - operation name +OPERATION = SUB-1004 : Operation : {0} Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,42 +63,70 @@ public class TransactionLogMessages } public static final String TRANSACTIONLOG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog"; - public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.closed"; - public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovery_complete"; + public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovery_start"; public static final String XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.xa_incomplete_message"; - public static final String XA_INCOMPLETE_QUEUE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.xa_incomplete_queue"; - public static final String RECOVERED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovered"; public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.created"; public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.store_location"; - public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovery_start"; + public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovery_complete"; + public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.closed"; + public static final String XA_INCOMPLETE_QUEUE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.xa_incomplete_queue"; + public static final String RECOVERED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.recovered"; static { LoggerFactory.getLogger(TRANSACTIONLOG_LOG_HIERARCHY); - LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); - LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); LoggerFactory.getLogger(XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY); - LoggerFactory.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY); - LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY); - LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(XA_INCOMPLETE_QUEUE_LOG_HIERARCHY); + LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.TransactionLog_logmessages", _currentLocale); } /** * Log a TransactionLog message of the Format: - * <pre>TXN-1003 : Closed</pre> + * <pre>TXN-1004 : Recovery Start[ : {0}]</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSED() + public static LogMessage RECOVERY_START(String param1, boolean opt1) { - String rawMessage = _messages.getString("CLOSED"); + String rawMessage = _messages.getString("RECOVERY_START"); + StringBuffer msg = new StringBuffer(); - final String message = rawMessage; + // Split the formatted message up on the option values so we can + // rebuild the message based on the configured options. + String[] parts = rawMessage.split("\\["); + msg.append(parts[0]); + + int end; + if (parts.length > 1) + { + + // Add Option : : {0}. + end = parts[1].indexOf(']'); + if (opt1) + { + msg.append(parts[1].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[1].substring(end + 1)); + } + + rawMessage = msg.toString(); + + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); return new LogMessage() { @@ -109,7 +137,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return CLOSED_LOG_HIERARCHY; + return RECOVERY_START_LOG_HIERARCHY; } @Override @@ -142,39 +170,16 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1006 : Recovery Complete[ : {0}]</pre> + * <pre>TXN-1008 : XA transaction recover for xid {0} incomplete as it references a message {1} which was not durably retained</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERY_COMPLETE(String param1, boolean opt1) + public static LogMessage XA_INCOMPLETE_MESSAGE(String param1, String param2) { - String rawMessage = _messages.getString("RECOVERY_COMPLETE"); - StringBuffer msg = new StringBuffer(); - - // Split the formatted message up on the option values so we can - // rebuild the message based on the configured options. - String[] parts = rawMessage.split("\\["); - msg.append(parts[0]); - - int end; - if (parts.length > 1) - { - - // Add Option : : {0}. - end = parts[1].indexOf(']'); - if (opt1) - { - msg.append(parts[1].substring(0, end)); - } - - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[1].substring(end + 1)); - } - - rawMessage = msg.toString(); + String rawMessage = _messages.getString("XA_INCOMPLETE_MESSAGE"); - final Object[] messageArguments = {param1}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -190,7 +195,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return RECOVERY_COMPLETE_LOG_HIERARCHY; + return XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY; } @Override @@ -223,21 +228,16 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1008 : XA transaction recover for xid {0} incomplete as it references a message {1} which was not durably retained</pre> + * <pre>TXN-1001 : Created</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage XA_INCOMPLETE_MESSAGE(String param1, String param2) + public static LogMessage CREATED() { - String rawMessage = _messages.getString("XA_INCOMPLETE_MESSAGE"); - - final Object[] messageArguments = {param1, param2}; - // Create a new MessageFormat to ensure thread safety. - // Sharing a MessageFormat and using applyPattern is not thread safe - MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + String rawMessage = _messages.getString("CREATED"); - final String message = formatter.format(messageArguments); + final String message = rawMessage; return new LogMessage() { @@ -248,7 +248,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return XA_INCOMPLETE_MESSAGE_LOG_HIERARCHY; + return CREATED_LOG_HIERARCHY; } @Override @@ -281,16 +281,16 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1007 : XA transaction recover for xid {0} incomplete as it references a queue {1} which was not durably retained</pre> + * <pre>TXN-1002 : Store location : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage XA_INCOMPLETE_QUEUE(String param1, String param2) + public static LogMessage STORE_LOCATION(String param1) { - String rawMessage = _messages.getString("XA_INCOMPLETE_QUEUE"); + String rawMessage = _messages.getString("STORE_LOCATION"); - final Object[] messageArguments = {param1, param2}; + final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -306,7 +306,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return XA_INCOMPLETE_QUEUE_LOG_HIERARCHY; + return STORE_LOCATION_LOG_HIERARCHY; } @Override @@ -339,16 +339,39 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1005 : Recovered {0,number} messages for queue {1}</pre> + * <pre>TXN-1006 : Recovery Complete[ : {0}]</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERED(Number param1, String param2) + public static LogMessage RECOVERY_COMPLETE(String param1, boolean opt1) { - String rawMessage = _messages.getString("RECOVERED"); + String rawMessage = _messages.getString("RECOVERY_COMPLETE"); + StringBuffer msg = new StringBuffer(); - final Object[] messageArguments = {param1, param2}; + // Split the formatted message up on the option values so we can + // rebuild the message based on the configured options. + String[] parts = rawMessage.split("\\["); + msg.append(parts[0]); + + int end; + if (parts.length > 1) + { + + // Add Option : : {0}. + end = parts[1].indexOf(']'); + if (opt1) + { + msg.append(parts[1].substring(0, end)); + } + + // Use 'end + 1' to remove the ']' from the output + msg.append(parts[1].substring(end + 1)); + } + + rawMessage = msg.toString(); + + final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -364,7 +387,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return RECOVERED_LOG_HIERARCHY; + return RECOVERY_COMPLETE_LOG_HIERARCHY; } @Override @@ -397,14 +420,14 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1001 : Created</pre> + * <pre>TXN-1003 : Closed</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CREATED() + public static LogMessage CLOSED() { - String rawMessage = _messages.getString("CREATED"); + String rawMessage = _messages.getString("CLOSED"); final String message = rawMessage; @@ -417,7 +440,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return CREATED_LOG_HIERARCHY; + return CLOSED_LOG_HIERARCHY; } @Override @@ -450,16 +473,16 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1002 : Store location : {0}</pre> + * <pre>TXN-1007 : XA transaction recover for xid {0} incomplete as it references a queue {1} which was not durably retained</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage STORE_LOCATION(String param1) + public static LogMessage XA_INCOMPLETE_QUEUE(String param1, String param2) { - String rawMessage = _messages.getString("STORE_LOCATION"); + String rawMessage = _messages.getString("XA_INCOMPLETE_QUEUE"); - final Object[] messageArguments = {param1}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -475,7 +498,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return STORE_LOCATION_LOG_HIERARCHY; + return XA_INCOMPLETE_QUEUE_LOG_HIERARCHY; } @Override @@ -508,39 +531,16 @@ public class TransactionLogMessages /** * Log a TransactionLog message of the Format: - * <pre>TXN-1004 : Recovery Start[ : {0}]</pre> + * <pre>TXN-1005 : Recovered {0,number} messages for queue {1}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage RECOVERY_START(String param1, boolean opt1) + public static LogMessage RECOVERED(Number param1, String param2) { - String rawMessage = _messages.getString("RECOVERY_START"); - StringBuffer msg = new StringBuffer(); - - // Split the formatted message up on the option values so we can - // rebuild the message based on the configured options. - String[] parts = rawMessage.split("\\["); - msg.append(parts[0]); - - int end; - if (parts.length > 1) - { - - // Add Option : : {0}. - end = parts[1].indexOf(']'); - if (opt1) - { - msg.append(parts[1].substring(0, end)); - } - - // Use 'end + 1' to remove the ']' from the output - msg.append(parts[1].substring(end + 1)); - } - - rawMessage = msg.toString(); + String rawMessage = _messages.getString("RECOVERED"); - final Object[] messageArguments = {param1}; + final Object[] messageArguments = {param1, param2}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -556,7 +556,7 @@ public class TransactionLogMessages public String getLogHierarchy() { - return RECOVERY_START_LOG_HIERARCHY; + return RECOVERED_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,32 +63,92 @@ public class TrustStoreMessages } public static final String TRUSTSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore"; - public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.open"; - public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.create"; public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.delete"; public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.close"; + public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.create"; + public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.operation"; + public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.open"; static { LoggerFactory.getLogger(TRUSTSTORE_LOG_HIERARCHY); - LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); - LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); LoggerFactory.getLogger(DELETE_LOG_HIERARCHY); LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATE_LOG_HIERARCHY); + LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY); + LoggerFactory.getLogger(OPEN_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.TrustStore_logmessages", _currentLocale); } /** * Log a TrustStore message of the Format: - * <pre>TST-1002 : Open</pre> + * <pre>TST-1004 : Delete "{0}"</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage OPEN() + public static LogMessage DELETE(String param1) { - String rawMessage = _messages.getString("OPEN"); + String rawMessage = _messages.getString("DELETE"); + + final Object[] messageArguments = {param1}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return DELETE_LOG_HIERARCHY; + } + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + final LogMessage that = (LogMessage) o; + + return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString()); + + } + + @Override + public int hashCode() + { + int result = toString().hashCode(); + result = 31 * result + getLogHierarchy().hashCode(); + return result; + } + }; + } + + /** + * Log a TrustStore message of the Format: + * <pre>TST-1003 : Close</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage CLOSE() + { + String rawMessage = _messages.getString("CLOSE"); final String message = rawMessage; @@ -101,7 +161,7 @@ public class TrustStoreMessages public String getLogHierarchy() { - return OPEN_LOG_HIERARCHY; + return CLOSE_LOG_HIERARCHY; } @Override @@ -192,14 +252,14 @@ public class TrustStoreMessages /** * Log a TrustStore message of the Format: - * <pre>TST-1004 : Delete "{0}"</pre> + * <pre>TST-1005 : Operation : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage DELETE(String param1) + public static LogMessage OPERATION(String param1) { - String rawMessage = _messages.getString("DELETE"); + String rawMessage = _messages.getString("OPERATION"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -217,7 +277,7 @@ public class TrustStoreMessages public String getLogHierarchy() { - return DELETE_LOG_HIERARCHY; + return OPERATION_LOG_HIERARCHY; } @Override @@ -250,14 +310,14 @@ public class TrustStoreMessages /** * Log a TrustStore message of the Format: - * <pre>TST-1003 : Close</pre> + * <pre>TST-1002 : Open</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSE() + public static LogMessage OPEN() { - String rawMessage = _messages.getString("CLOSE"); + String rawMessage = _messages.getString("OPEN"); final String message = rawMessage; @@ -270,7 +330,7 @@ public class TrustStoreMessages public String getLogHierarchy() { - return CLOSE_LOG_HIERARCHY; + return OPEN_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -22,4 +22,6 @@ CREATE = TST-1001 : Create "{0}" OPEN = TST-1002 : Open CLOSE = TST-1003 : Close DELETE = TST-1004 : Delete "{0}" +# 0 - operation name +OPERATION = TST-1005 : Operation : {0} Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java Sun Nov 20 16:42:57 2016 @@ -22,8 +22,8 @@ package org.apache.qpid.server.logging.m import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.apache.qpid.server.logging.LogMessage; import java.text.MessageFormat; @@ -63,38 +63,40 @@ public class VirtualHostMessages } public static final String VIRTUALHOST_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost"; - public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.closed"; + public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.created"; public static final String STATS_DATA_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.stats_data"; - public static final String STATS_MSGS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.stats_msgs"; + public static final String ERRORED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.errored"; + public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.closed"; + public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.operation"; public static final String FILESYSTEM_FULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.filesystem_full"; public static final String FILESYSTEM_NOTFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.filesystem_notfull"; - public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.created"; - public static final String ERRORED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.errored"; + public static final String STATS_MSGS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.stats_msgs"; static { LoggerFactory.getLogger(VIRTUALHOST_LOG_HIERARCHY); - LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY); - LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY); + LoggerFactory.getLogger(ERRORED_LOG_HIERARCHY); + LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY); + LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY); LoggerFactory.getLogger(FILESYSTEM_FULL_LOG_HIERARCHY); LoggerFactory.getLogger(FILESYSTEM_NOTFULL_LOG_HIERARCHY); - LoggerFactory.getLogger(CREATED_LOG_HIERARCHY); - LoggerFactory.getLogger(ERRORED_LOG_HIERARCHY); + LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY); _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.VirtualHost_logmessages", _currentLocale); } /** * Log a VirtualHost message of the Format: - * <pre>VHT-1002 : Closed : {0}</pre> + * <pre>VHT-1001 : Created : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CLOSED(String param1) + public static LogMessage CREATED(String param1) { - String rawMessage = _messages.getString("CLOSED"); + String rawMessage = _messages.getString("CREATED"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -112,7 +114,7 @@ public class VirtualHostMessages public String getLogHierarchy() { - return CLOSED_LOG_HIERARCHY; + return CREATED_LOG_HIERARCHY; } @Override @@ -203,16 +205,16 @@ public class VirtualHostMessages /** * Log a VirtualHost message of the Format: - * <pre>VHT-1004 : {0} : {1,choice,0#delivered|1#received} : {2,number,#.###} msg/s peak : {3,number,#} msgs total</pre> + * <pre>VHT-1005 : {0} Unexpected fatal error</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage STATS_MSGS(String param1, Number param2, Number param3, Number param4) + public static LogMessage ERRORED(String param1) { - String rawMessage = _messages.getString("STATS_MSGS"); + String rawMessage = _messages.getString("ERRORED"); - final Object[] messageArguments = {param1, param2, param3, param4}; + final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. // Sharing a MessageFormat and using applyPattern is not thread safe MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); @@ -228,7 +230,7 @@ public class VirtualHostMessages public String getLogHierarchy() { - return STATS_MSGS_LOG_HIERARCHY; + return ERRORED_LOG_HIERARCHY; } @Override @@ -261,14 +263,14 @@ public class VirtualHostMessages /** * Log a VirtualHost message of the Format: - * <pre>VHT-1006 : Filesystem is over {0,number} per cent full, enforcing flow control.</pre> + * <pre>VHT-1002 : Closed : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage FILESYSTEM_FULL(Number param1) + public static LogMessage CLOSED(String param1) { - String rawMessage = _messages.getString("FILESYSTEM_FULL"); + String rawMessage = _messages.getString("CLOSED"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -286,7 +288,7 @@ public class VirtualHostMessages public String getLogHierarchy() { - return FILESYSTEM_FULL_LOG_HIERARCHY; + return CLOSED_LOG_HIERARCHY; } @Override @@ -319,14 +321,14 @@ public class VirtualHostMessages /** * Log a VirtualHost message of the Format: - * <pre>VHT-1007 : Filesystem is no longer over {0,number} per cent full.</pre> + * <pre>VHT-1008 : Operation : {0}</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage FILESYSTEM_NOTFULL(Number param1) + public static LogMessage OPERATION(String param1) { - String rawMessage = _messages.getString("FILESYSTEM_NOTFULL"); + String rawMessage = _messages.getString("OPERATION"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -344,7 +346,7 @@ public class VirtualHostMessages public String getLogHierarchy() { - return FILESYSTEM_NOTFULL_LOG_HIERARCHY; + return OPERATION_LOG_HIERARCHY; } @Override @@ -377,14 +379,14 @@ public class VirtualHostMessages /** * Log a VirtualHost message of the Format: - * <pre>VHT-1001 : Created : {0}</pre> + * <pre>VHT-1006 : Filesystem is over {0,number} per cent full, enforcing flow control.</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage CREATED(String param1) + public static LogMessage FILESYSTEM_FULL(Number param1) { - String rawMessage = _messages.getString("CREATED"); + String rawMessage = _messages.getString("FILESYSTEM_FULL"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -402,7 +404,7 @@ public class VirtualHostMessages public String getLogHierarchy() { - return CREATED_LOG_HIERARCHY; + return FILESYSTEM_FULL_LOG_HIERARCHY; } @Override @@ -435,14 +437,14 @@ public class VirtualHostMessages /** * Log a VirtualHost message of the Format: - * <pre>VHT-1005 : {0} Unexpected fatal error</pre> + * <pre>VHT-1007 : Filesystem is no longer over {0,number} per cent full.</pre> * Optional values are contained in [square brackets] and are numbered * sequentially in the method call. * */ - public static LogMessage ERRORED(String param1) + public static LogMessage FILESYSTEM_NOTFULL(Number param1) { - String rawMessage = _messages.getString("ERRORED"); + String rawMessage = _messages.getString("FILESYSTEM_NOTFULL"); final Object[] messageArguments = {param1}; // Create a new MessageFormat to ensure thread safety. @@ -460,7 +462,65 @@ public class VirtualHostMessages public String getLogHierarchy() { - return ERRORED_LOG_HIERARCHY; + return FILESYSTEM_NOTFULL_LOG_HIERARCHY; + } + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + if (o == null || getClass() != o.getClass()) + { + return false; + } + + final LogMessage that = (LogMessage) o; + + return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString()); + + } + + @Override + public int hashCode() + { + int result = toString().hashCode(); + result = 31 * result + getLogHierarchy().hashCode(); + return result; + } + }; + } + + /** + * Log a VirtualHost message of the Format: + * <pre>VHT-1004 : {0} : {1,choice,0#delivered|1#received} : {2,number,#.###} msg/s peak : {3,number,#} msgs total</pre> + * Optional values are contained in [square brackets] and are numbered + * sequentially in the method call. + * + */ + public static LogMessage STATS_MSGS(String param1, Number param2, Number param3, Number param4) + { + String rawMessage = _messages.getString("STATS_MSGS"); + + final Object[] messageArguments = {param1, param2, param3, param4}; + // Create a new MessageFormat to ensure thread safety. + // Sharing a MessageFormat and using applyPattern is not thread safe + MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale); + + final String message = formatter.format(messageArguments); + + return new LogMessage() + { + public String toString() + { + return message; + } + + public String getLogHierarchy() + { + return STATS_MSGS_LOG_HIERARCHY; } @Override Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHost_logmessages.properties Sun Nov 20 16:42:57 2016 @@ -29,3 +29,6 @@ ERRORED = VHT-1005 : {0} Unexpected fata FILESYSTEM_FULL = VHT-1006 : Filesystem is over {0,number} per cent full, enforcing flow control. FILESYSTEM_NOTFULL = VHT-1007 : Filesystem is no longer over {0,number} per cent full. + +# 0 - operation name +OPERATION = VHT-1008 : Operation : {0} Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1770576&r1=1770575&r2=1770576&view=diff ============================================================================== --- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original) +++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Sun Nov 20 16:42:57 2016 @@ -3320,6 +3320,8 @@ public abstract class AbstractConfigured _userPreferences = userPreferences; } + protected abstract void logOperation(String operation); + //========================================================================================= static String interpolate(ConfiguredObject<?> object, String value) @@ -3625,12 +3627,18 @@ public abstract class AbstractConfigured } } - public final static class DuplicateNameException extends IllegalArgumentException + public static class DuplicateNameException extends IllegalArgumentException { private final ConfiguredObject<?> _existing; - private DuplicateNameException(final ConfiguredObject<?> existing) + + protected DuplicateNameException(final ConfiguredObject<?> existing) + { + this("Child of type " + existing.getClass().getSimpleName() + " already exists with name of " + existing.getName(), existing); + } + + protected DuplicateNameException(String message, final ConfiguredObject<?> existing) { - super("Child of type " + existing.getClass().getSimpleName() + " already exists with name of " + existing.getName()); + super(message); _existing = existing; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
