You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/07/30 19:49:15 UTC
[4/6] qpid-broker-j git commit: NO-JIRA: [Java Broker] [Operational
Message Code Gen] Stabilise order of methods within generated code.
NO-JIRA: [Java Broker] [Operational Message Code Gen] Stabilise order of methods within generated code.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/f28d3b54
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/f28d3b54
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/f28d3b54
Branch: refs/heads/master
Commit: f28d3b547a3cd46fa27a6d45fc4b5d29abacaf40
Parents: 90e2251
Author: Keith Wall <kw...@apache.org>
Authored: Sun Jul 30 17:49:58 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Sun Jul 30 18:07:22 2017 +0100
----------------------------------------------------------------------
.../logging/messages/AccessControlMessages.java | 104 ++++-----
.../AuthenticationProviderMessages.java | 130 ++++++------
.../logging/messages/BindingMessages.java | 10 +-
.../server/logging/messages/BrokerMessages.java | 182 ++++++++--------
.../logging/messages/ChannelMessages.java | 188 ++++++++---------
.../logging/messages/ConfigStoreMessages.java | 68 +++---
.../logging/messages/ConnectionMessages.java | 188 ++++++++---------
.../logging/messages/ExchangeMessages.java | 10 +-
.../messages/HighAvailabilityMessages.java | 210 +++++++++----------
.../logging/messages/KeyStoreMessages.java | 68 +++---
.../messages/ManagementConsoleMessages.java | 88 ++++----
.../logging/messages/MessageStoreMessages.java | 114 +++++-----
.../server/logging/messages/PortMessages.java | 126 +++++------
.../server/logging/messages/QueueMessages.java | 57 ++---
.../logging/messages/SubscriptionMessages.java | 126 +++++------
.../messages/TransactionLogMessages.java | 168 +++++++--------
.../logging/messages/TrustStoreMessages.java | 86 ++++----
.../logging/messages/VirtualHostMessages.java | 74 +++----
.../server/logging/GenerateLogMessages.java | 9 +-
.../qpid/server/logging/messages/LogMessages.vm | 12 +-
20 files changed, 1010 insertions(+), 1008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
index eb8f2b3..c21ac0f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
@@ -36,7 +36,7 @@ import org.apache.qpid.server.logging.LogMessage;
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of AccessControl_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class AccessControlMessages
{
@@ -64,25 +64,25 @@ public class AccessControlMessages
public static final String ACCESSCONTROL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol";
public static final String ALLOWED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.allowed";
- public static final String DENIED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.denied";
- public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.delete";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.create";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.operation";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.close";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.create";
+ public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.delete";
+ public static final String DENIED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.denied";
public static final String LOADED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.loaded";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.open";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.operation";
static
{
LoggerFactory.getLogger(ACCESSCONTROL_LOG_HIERARCHY);
LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY);
- LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
- LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
LoggerFactory.getLogger(LOADED_LOG_HIERARCHY);
LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AccessControl_logmessages", _currentLocale);
}
@@ -149,21 +149,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1002 : Denied : {0} {1} {2}</pre>
+ * <pre>ACL-1013 : Close</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DENIED(String param1, String param2, String param3)
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("DENIED");
-
- 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);
+ String rawMessage = _messages.getString("CLOSE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -176,7 +171,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return DENIED_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -209,14 +204,14 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1014 : Delete "{0}"</pre>
+ * <pre>ACL-1011 : Create "{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 CREATE(String param1)
{
- String rawMessage = _messages.getString("DELETE");
+ String rawMessage = _messages.getString("CREATE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -236,7 +231,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return DELETE_LOG_HIERARCHY;
+ return CREATE_LOG_HIERARCHY;
}
@Override
@@ -269,14 +264,14 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1011 : Create "{0}"</pre>
+ * <pre>ACL-1014 : Delete "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1)
+ public static LogMessage DELETE(String param1)
{
- String rawMessage = _messages.getString("CREATE");
+ String rawMessage = _messages.getString("DELETE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -296,7 +291,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return CREATE_LOG_HIERARCHY;
+ return DELETE_LOG_HIERARCHY;
}
@Override
@@ -329,16 +324,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1016 : Operation : {0}</pre>
+ * <pre>ACL-1002 : Denied : {0} {1} {2}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage DENIED(String param1, String param2, String param3)
{
- String rawMessage = _messages.getString("OPERATION");
+ String rawMessage = _messages.getString("DENIED");
- 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);
@@ -356,7 +351,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return DENIED_LOG_HIERARCHY;
}
@Override
@@ -389,16 +384,21 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1013 : Close</pre>
+ * <pre>ACL-1015 : Rules loaded : Source "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage LOADED(String param1)
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("LOADED");
- 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()
{
@@ -411,7 +411,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return LOADED_LOG_HIERARCHY;
}
@Override
@@ -444,21 +444,16 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1015 : Rules loaded : Source "{0}"</pre>
+ * <pre>ACL-1012 : Open</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage LOADED(String param1)
+ public static LogMessage OPEN()
{
- String rawMessage = _messages.getString("LOADED");
-
- 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("OPEN");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -471,7 +466,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return LOADED_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
@@ -504,16 +499,21 @@ public class AccessControlMessages
/**
* Log a AccessControl message of the Format:
- * <pre>ACL-1012 : Open</pre>
+ * <pre>ACL-1016 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN()
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("OPEN");
+ 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()
{
@@ -526,7 +526,7 @@ public class AccessControlMessages
@Override
public String getLogHierarchy()
{
- return OPEN_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
index a80f242..da2f15e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
@@ -22,21 +22,21 @@ package org.apache.qpid.server.logging.messages;
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;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of AuthenticationProvider_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class AuthenticationProviderMessages
{
@@ -63,36 +63,59 @@ public class AuthenticationProviderMessages
}
public static final String AUTHENTICATIONPROVIDER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider";
- public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.delete";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.create";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.operation";
public static final String AUTHENTICATION_FAILED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.authentication_failed";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.close";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.create";
+ public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.delete";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.open";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.operation";
static
{
LoggerFactory.getLogger(AUTHENTICATIONPROVIDER_LOG_HIERARCHY);
- LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
LoggerFactory.getLogger(AUTHENTICATION_FAILED_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AuthenticationProvider_logmessages", _currentLocale);
}
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1004 : Delete "{0}"</pre>
+ * <pre>ATH-1010 : Authentication Failed[ : "{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 AUTHENTICATION_FAILED(String param1, boolean opt1)
{
- String rawMessage = _messages.getString("DELETE");
+ String rawMessage = _messages.getString("AUTHENTICATION_FAILED");
+ 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();
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -112,7 +135,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return DELETE_LOG_HIERARCHY;
+ return AUTHENTICATION_FAILED_LOG_HIERARCHY;
}
@Override
@@ -145,21 +168,16 @@ public class AuthenticationProviderMessages
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1001 : Create "{0}"</pre>
+ * <pre>ATH-1003 : Close</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CREATE(String param1)
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("CREATE");
-
- 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("CLOSE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -172,7 +190,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return CREATE_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -205,14 +223,14 @@ public class AuthenticationProviderMessages
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1005 : Operation : {0}</pre>
+ * <pre>ATH-1001 : Create "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage CREATE(String param1)
{
- String rawMessage = _messages.getString("OPERATION");
+ String rawMessage = _messages.getString("CREATE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -232,7 +250,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return CREATE_LOG_HIERARCHY;
}
@Override
@@ -265,37 +283,14 @@ public class AuthenticationProviderMessages
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1010 : Authentication Failed[ : "{0}"]</pre>
+ * <pre>ATH-1004 : Delete "{0}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage AUTHENTICATION_FAILED(String param1, boolean opt1)
+ public static LogMessage DELETE(String param1)
{
- String rawMessage = _messages.getString("AUTHENTICATION_FAILED");
- 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("DELETE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -315,7 +310,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return AUTHENTICATION_FAILED_LOG_HIERARCHY;
+ return DELETE_LOG_HIERARCHY;
}
@Override
@@ -348,14 +343,14 @@ public class AuthenticationProviderMessages
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1003 : Close</pre>
+ * <pre>ATH-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;
@@ -370,7 +365,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
@@ -403,16 +398,21 @@ public class AuthenticationProviderMessages
/**
* Log a AuthenticationProvider message of the Format:
- * <pre>ATH-1002 : Open</pre>
+ * <pre>ATH-1005 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN()
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("OPEN");
+ 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()
{
@@ -425,7 +425,7 @@ public class AuthenticationProviderMessages
@Override
public String getLogHierarchy()
{
- return OPEN_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
index 2e7128d..1612232 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
@@ -22,21 +22,21 @@ package org.apache.qpid.server.logging.messages;
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;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of Binding_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class BindingMessages
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
index aa9773e..79319be 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
@@ -36,7 +36,7 @@ import org.apache.qpid.server.logging.LogMessage;
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of Broker_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class BrokerMessages
{
@@ -63,56 +63,61 @@ public class BrokerMessages
}
public static final String BROKER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker";
- public static final String READY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.ready";
+ public static final String CONFIG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.config";
public static final String FAILED_CHILDREN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.failed_children";
+ public static final String FATAL_ERROR_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.fatal_error";
public static final String LISTENING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.listening";
- public static final String STARTUP_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.startup";
public static final String MANAGEMENT_MODE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.management_mode";
- public static final String STATS_MSGS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stats_msgs";
+ public static final String MAX_MEMORY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.max_memory";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.operation";
public static final String PLATFORM_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.platform";
- public static final String CONFIG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.config";
+ public static final String PROCESS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.process";
+ public static final String READY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.ready";
public static final String SHUTTING_DOWN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.shutting_down";
+ public static final String STARTUP_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.startup";
public static final String STATS_DATA_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stats_data";
- public static final String FATAL_ERROR_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.fatal_error";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.operation";
+ public static final String STATS_MSGS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stats_msgs";
public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stopped";
- public static final String PROCESS_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.process";
- public static final String MAX_MEMORY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.max_memory";
static
{
LoggerFactory.getLogger(BROKER_LOG_HIERARCHY);
- LoggerFactory.getLogger(READY_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CONFIG_LOG_HIERARCHY);
LoggerFactory.getLogger(FAILED_CHILDREN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(FATAL_ERROR_LOG_HIERARCHY);
LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY);
- LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY);
LoggerFactory.getLogger(MANAGEMENT_MODE_LOG_HIERARCHY);
- LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY);
+ LoggerFactory.getLogger(MAX_MEMORY_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
LoggerFactory.getLogger(PLATFORM_LOG_HIERARCHY);
- LoggerFactory.getLogger(CONFIG_LOG_HIERARCHY);
+ LoggerFactory.getLogger(PROCESS_LOG_HIERARCHY);
+ LoggerFactory.getLogger(READY_LOG_HIERARCHY);
LoggerFactory.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(STARTUP_LOG_HIERARCHY);
LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY);
- LoggerFactory.getLogger(FATAL_ERROR_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(STATS_MSGS_LOG_HIERARCHY);
LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY);
- LoggerFactory.getLogger(PROCESS_LOG_HIERARCHY);
- LoggerFactory.getLogger(MAX_MEMORY_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Broker_logmessages", _currentLocale);
}
/**
* Log a Broker message of the Format:
- * <pre>BRK-1004 : Qpid Broker Ready</pre>
+ * <pre>BRK-1006 : Using configuration : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage READY()
+ public static LogMessage CONFIG(String param1)
{
- String rawMessage = _messages.getString("READY");
+ String rawMessage = _messages.getString("CONFIG");
- 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()
{
@@ -125,7 +130,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return READY_LOG_HIERARCHY;
+ return CONFIG_LOG_HIERARCHY;
}
@Override
@@ -218,16 +223,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1002 : Starting : Listening on {0} port {1,number,#}</pre>
+ * <pre>BRK-1016 : Fatal error : {0} : See log file for more information</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage LISTENING(String param1, Number param2)
+ public static LogMessage FATAL_ERROR(String param1)
{
- String rawMessage = _messages.getString("LISTENING");
+ String rawMessage = _messages.getString("FATAL_ERROR");
- 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);
@@ -245,7 +250,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return LISTENING_LOG_HIERARCHY;
+ return FATAL_ERROR_LOG_HIERARCHY;
}
@Override
@@ -278,14 +283,14 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1001 : Startup : Version: {0} Build: {1}</pre>
+ * <pre>BRK-1002 : Starting : Listening on {0} port {1,number,#}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage STARTUP(String param1, String param2)
+ public static LogMessage LISTENING(String param1, Number param2)
{
- String rawMessage = _messages.getString("STARTUP");
+ String rawMessage = _messages.getString("LISTENING");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -305,7 +310,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return STARTUP_LOG_HIERARCHY;
+ return LISTENING_LOG_HIERARCHY;
}
@Override
@@ -398,16 +403,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###} msg/s peak : {2,number,#} msgs total</pre>
+ * <pre>BRK-1011 : Maximum Memory : Heap : {0,number} bytes Direct : {1,number} bytes</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage STATS_MSGS(Number param1, Number param2, Number param3)
+ public static LogMessage MAX_MEMORY(Number param1, Number param2)
{
- String rawMessage = _messages.getString("STATS_MSGS");
+ String rawMessage = _messages.getString("MAX_MEMORY");
- 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);
@@ -425,7 +430,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return STATS_MSGS_LOG_HIERARCHY;
+ return MAX_MEMORY_LOG_HIERARCHY;
}
@Override
@@ -458,16 +463,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1010 : Platform : JVM : {0} version: {1} OS : {2} version: {3} arch: {4} cores: {5}</pre>
+ * <pre>BRK-1018 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage PLATFORM(String param1, String param2, String param3, String param4, String param5, String param6)
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("PLATFORM");
+ String rawMessage = _messages.getString("OPERATION");
- final Object[] messageArguments = {param1, param2, param3, param4, param5, param6};
+ 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);
@@ -485,7 +490,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return PLATFORM_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
@@ -518,16 +523,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1006 : Using configuration : {0}</pre>
+ * <pre>BRK-1010 : Platform : JVM : {0} version: {1} OS : {2} version: {3} arch: {4} cores: {5}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CONFIG(String param1)
+ public static LogMessage PLATFORM(String param1, String param2, String param3, String param4, String param5, String param6)
{
- String rawMessage = _messages.getString("CONFIG");
+ String rawMessage = _messages.getString("PLATFORM");
- final Object[] messageArguments = {param1};
+ final Object[] messageArguments = {param1, param2, param3, param4, param5, param6};
// Create a new MessageFormat to ensure thread safety.
// Sharing a MessageFormat and using applyPattern is not thread safe
MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
@@ -545,7 +550,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return CONFIG_LOG_HIERARCHY;
+ return PLATFORM_LOG_HIERARCHY;
}
@Override
@@ -578,16 +583,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1003 : Shutting down : {0} port {1,number,#}</pre>
+ * <pre>BRK-1017 : Process : PID : {0}</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 PROCESS(String param1)
{
- String rawMessage = _messages.getString("SHUTTING_DOWN");
+ String rawMessage = _messages.getString("PROCESS");
- 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);
@@ -605,7 +610,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return SHUTTING_DOWN_LOG_HIERARCHY;
+ return PROCESS_LOG_HIERARCHY;
}
@Override
@@ -638,21 +643,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1008 : {0,choice,0#delivered|1#received} : {1,number,#.###} kB/s peak : {2,number,#} bytes total</pre>
+ * <pre>BRK-1004 : Qpid Broker Ready</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage STATS_DATA(Number param1, Number param2, Number param3)
+ public static LogMessage READY()
{
- String rawMessage = _messages.getString("STATS_DATA");
-
- 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);
+ String rawMessage = _messages.getString("READY");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -665,7 +665,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return STATS_DATA_LOG_HIERARCHY;
+ return READY_LOG_HIERARCHY;
}
@Override
@@ -698,16 +698,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1016 : Fatal error : {0} : See log file for more information</pre>
+ * <pre>BRK-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 FATAL_ERROR(String param1)
+ public static LogMessage SHUTTING_DOWN(String param1, Number param2)
{
- String rawMessage = _messages.getString("FATAL_ERROR");
+ String rawMessage = _messages.getString("SHUTTING_DOWN");
- 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);
@@ -725,7 +725,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return FATAL_ERROR_LOG_HIERARCHY;
+ return SHUTTING_DOWN_LOG_HIERARCHY;
}
@Override
@@ -758,16 +758,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1018 : Operation : {0}</pre>
+ * <pre>BRK-1001 : Startup : Version: {0} Build: {1}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage STARTUP(String param1, String param2)
{
- String rawMessage = _messages.getString("OPERATION");
+ String rawMessage = _messages.getString("STARTUP");
- 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);
@@ -785,7 +785,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return STARTUP_LOG_HIERARCHY;
}
@Override
@@ -818,16 +818,21 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1005 : Stopped</pre>
+ * <pre>BRK-1008 : {0,choice,0#delivered|1#received} : {1,number,#.###} kB/s peak : {2,number,#} bytes total</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage STOPPED()
+ public static LogMessage STATS_DATA(Number param1, Number param2, Number param3)
{
- String rawMessage = _messages.getString("STOPPED");
+ String rawMessage = _messages.getString("STATS_DATA");
- final String message = rawMessage;
+ 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);
+
+ final String message = formatter.format(messageArguments);
return new LogMessage()
{
@@ -840,7 +845,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return STOPPED_LOG_HIERARCHY;
+ return STATS_DATA_LOG_HIERARCHY;
}
@Override
@@ -873,16 +878,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1017 : Process : PID : {0}</pre>
+ * <pre>BRK-1009 : {0,choice,0#delivered|1#received} : {1,number,#.###} msg/s peak : {2,number,#} msgs total</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage PROCESS(String param1)
+ public static LogMessage STATS_MSGS(Number param1, Number param2, Number param3)
{
- String rawMessage = _messages.getString("PROCESS");
+ String rawMessage = _messages.getString("STATS_MSGS");
- 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);
@@ -900,7 +905,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return PROCESS_LOG_HIERARCHY;
+ return STATS_MSGS_LOG_HIERARCHY;
}
@Override
@@ -933,21 +938,16 @@ public class BrokerMessages
/**
* Log a Broker message of the Format:
- * <pre>BRK-1011 : Maximum Memory : Heap : {0,number} bytes Direct : {1,number} bytes</pre>
+ * <pre>BRK-1005 : Stopped</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage MAX_MEMORY(Number param1, Number param2)
+ public static LogMessage STOPPED()
{
- String rawMessage = _messages.getString("MAX_MEMORY");
-
- 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("STOPPED");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -960,7 +960,7 @@ public class BrokerMessages
@Override
public String getLogHierarchy()
{
- return MAX_MEMORY_LOG_HIERARCHY;
+ return STOPPED_LOG_HIERARCHY;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
index 4815015..2acac26 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
@@ -22,21 +22,21 @@ package org.apache.qpid.server.logging.messages;
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;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of Channel_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class ChannelMessages
{
@@ -63,52 +63,52 @@ public class ChannelMessages
}
public static final String CHANNEL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.create";
- public static final String FLOW_CONTROL_IGNORED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow_control_ignored";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.close";
- public static final String DISCARDMSG_NOROUTE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.discardmsg_noroute";
+ public static final String CLOSE_FORCED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.close_forced";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.create";
public static final String DEADLETTERMSG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.deadlettermsg";
+ public static final String DISCARDMSG_NOALTEXCH_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.discardmsg_noaltexch";
+ public static final String DISCARDMSG_NOROUTE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.discardmsg_noroute";
public static final String FLOW_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow";
- public static final String PREFETCH_SIZE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.prefetch_size";
- public static final String OPEN_TXN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.open_txn";
- public static final String CLOSE_FORCED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.close_forced";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.operation";
- public static final String IDLE_TXN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.idle_txn";
+ public static final String FLOW_CONTROL_IGNORED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow_control_ignored";
public static final String FLOW_ENFORCED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow_enforced";
public static final String FLOW_REMOVED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow_removed";
- public static final String DISCARDMSG_NOALTEXCH_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.discardmsg_noaltexch";
+ public static final String IDLE_TXN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.idle_txn";
+ public static final String OPEN_TXN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.open_txn";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.operation";
+ public static final String PREFETCH_SIZE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.prefetch_size";
static
{
LoggerFactory.getLogger(CHANNEL_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
- LoggerFactory.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
- LoggerFactory.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CLOSE_FORCED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
LoggerFactory.getLogger(DEADLETTERMSG_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DISCARDMSG_NOROUTE_LOG_HIERARCHY);
LoggerFactory.getLogger(FLOW_LOG_HIERARCHY);
- LoggerFactory.getLogger(PREFETCH_SIZE_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPEN_TXN_LOG_HIERARCHY);
- LoggerFactory.getLogger(CLOSE_FORCED_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
- LoggerFactory.getLogger(IDLE_TXN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(FLOW_CONTROL_IGNORED_LOG_HIERARCHY);
LoggerFactory.getLogger(FLOW_ENFORCED_LOG_HIERARCHY);
LoggerFactory.getLogger(FLOW_REMOVED_LOG_HIERARCHY);
- LoggerFactory.getLogger(DISCARDMSG_NOALTEXCH_LOG_HIERARCHY);
+ LoggerFactory.getLogger(IDLE_TXN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPEN_TXN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(PREFETCH_SIZE_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Channel_logmessages", _currentLocale);
}
/**
* Log a Channel message of the Format:
- * <pre>CHN-1001 : Create</pre>
+ * <pre>CHN-1003 : Close</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CREATE()
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("CREATE");
+ String rawMessage = _messages.getString("CLOSE");
final String message = rawMessage;
@@ -123,7 +123,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return CREATE_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -156,16 +156,21 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1012 : Flow Control Ignored. Channel will be closed.</pre>
+ * <pre>CHN-1003 : Close : {0,number} - {1}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage FLOW_CONTROL_IGNORED()
+ public static LogMessage CLOSE_FORCED(Number param1, String param2)
{
- String rawMessage = _messages.getString("FLOW_CONTROL_IGNORED");
+ String rawMessage = _messages.getString("CLOSE_FORCED");
- final String message = rawMessage;
+ 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);
+
+ final String message = formatter.format(messageArguments);
return new LogMessage()
{
@@ -178,7 +183,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return FLOW_CONTROL_IGNORED_LOG_HIERARCHY;
+ return CLOSE_FORCED_LOG_HIERARCHY;
}
@Override
@@ -211,14 +216,14 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1003 : Close</pre>
+ * <pre>CHN-1001 : Create</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage CREATE()
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("CREATE");
final String message = rawMessage;
@@ -233,7 +238,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return CREATE_LOG_HIERARCHY;
}
@Override
@@ -266,14 +271,14 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1010 : Discarded message : {0,number} as no binding on alternate exchange : {1}</pre>
+ * <pre>CHN-1011 : Message : {0,number} moved to dead letter queue : {1}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DISCARDMSG_NOROUTE(Number param1, String param2)
+ public static LogMessage DEADLETTERMSG(Number param1, String param2)
{
- String rawMessage = _messages.getString("DISCARDMSG_NOROUTE");
+ String rawMessage = _messages.getString("DEADLETTERMSG");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -293,7 +298,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return DISCARDMSG_NOROUTE_LOG_HIERARCHY;
+ return DEADLETTERMSG_LOG_HIERARCHY;
}
@Override
@@ -326,16 +331,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1011 : Message : {0,number} moved to dead letter queue : {1}</pre>
+ * <pre>CHN-1009 : Discarded message : {0,number} as no alternate binding configured for queue : {1} routing key : {2}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DEADLETTERMSG(Number param1, String param2)
+ public static LogMessage DISCARDMSG_NOALTEXCH(Number param1, String param2, String param3)
{
- String rawMessage = _messages.getString("DEADLETTERMSG");
+ String rawMessage = _messages.getString("DISCARDMSG_NOALTEXCH");
- final Object[] messageArguments = {param1, param2};
+ 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);
@@ -353,7 +358,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return DEADLETTERMSG_LOG_HIERARCHY;
+ return DISCARDMSG_NOALTEXCH_LOG_HIERARCHY;
}
@Override
@@ -386,16 +391,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1002 : Flow {0}</pre>
+ * <pre>CHN-1010 : Discarded message : {0,number} as alternate binding yields no routes : {1}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage FLOW(String param1)
+ public static LogMessage DISCARDMSG_NOROUTE(Number param1, String param2)
{
- String rawMessage = _messages.getString("FLOW");
+ String rawMessage = _messages.getString("DISCARDMSG_NOROUTE");
- 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);
@@ -413,7 +418,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return FLOW_LOG_HIERARCHY;
+ return DISCARDMSG_NOROUTE_LOG_HIERARCHY;
}
@Override
@@ -446,16 +451,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}</pre>
+ * <pre>CHN-1002 : Flow {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage PREFETCH_SIZE(Number param1, Number param2)
+ public static LogMessage FLOW(String param1)
{
- String rawMessage = _messages.getString("PREFETCH_SIZE");
+ String rawMessage = _messages.getString("FLOW");
- 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);
@@ -473,7 +478,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return PREFETCH_SIZE_LOG_HIERARCHY;
+ return FLOW_LOG_HIERARCHY;
}
@Override
@@ -506,21 +511,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1007 : Open Transaction : {0,number} ms</pre>
+ * <pre>CHN-1012 : Flow Control Ignored. Channel will be closed.</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN_TXN(Number param1)
+ public static LogMessage FLOW_CONTROL_IGNORED()
{
- String rawMessage = _messages.getString("OPEN_TXN");
-
- 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("FLOW_CONTROL_IGNORED");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -533,7 +533,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return OPEN_TXN_LOG_HIERARCHY;
+ return FLOW_CONTROL_IGNORED_LOG_HIERARCHY;
}
@Override
@@ -566,16 +566,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1003 : Close : {0,number} - {1}</pre>
+ * <pre>CHN-1005 : Flow Control Enforced (Queue {0})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE_FORCED(Number param1, String param2)
+ public static LogMessage FLOW_ENFORCED(String param1)
{
- String rawMessage = _messages.getString("CLOSE_FORCED");
+ String rawMessage = _messages.getString("FLOW_ENFORCED");
- 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);
@@ -593,7 +593,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_FORCED_LOG_HIERARCHY;
+ return FLOW_ENFORCED_LOG_HIERARCHY;
}
@Override
@@ -626,21 +626,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1014 : Operation : {0}</pre>
+ * <pre>CHN-1006 : Flow Control Removed</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPERATION(String param1)
+ public static LogMessage FLOW_REMOVED()
{
- 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);
+ String rawMessage = _messages.getString("FLOW_REMOVED");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -653,7 +648,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return FLOW_REMOVED_LOG_HIERARCHY;
}
@Override
@@ -746,14 +741,14 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1005 : Flow Control Enforced (Queue {0})</pre>
+ * <pre>CHN-1007 : Open Transaction : {0,number} ms</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage FLOW_ENFORCED(String param1)
+ public static LogMessage OPEN_TXN(Number param1)
{
- String rawMessage = _messages.getString("FLOW_ENFORCED");
+ String rawMessage = _messages.getString("OPEN_TXN");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -773,7 +768,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return FLOW_ENFORCED_LOG_HIERARCHY;
+ return OPEN_TXN_LOG_HIERARCHY;
}
@Override
@@ -806,16 +801,21 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1006 : Flow Control Removed</pre>
+ * <pre>CHN-1014 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage FLOW_REMOVED()
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("FLOW_REMOVED");
+ 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()
{
@@ -828,7 +828,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return FLOW_REMOVED_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
@@ -861,16 +861,16 @@ public class ChannelMessages
/**
* Log a Channel message of the Format:
- * <pre>CHN-1009 : Discarded message : {0,number} as no alternate exchange configured for queue : {1} routing key : {2}</pre>
+ * <pre>CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DISCARDMSG_NOALTEXCH(Number param1, String param2, String param3)
+ public static LogMessage PREFETCH_SIZE(Number param1, Number param2)
{
- String rawMessage = _messages.getString("DISCARDMSG_NOALTEXCH");
+ String rawMessage = _messages.getString("PREFETCH_SIZE");
- 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);
@@ -888,7 +888,7 @@ public class ChannelMessages
@Override
public String getLogHierarchy()
{
- return DISCARDMSG_NOALTEXCH_LOG_HIERARCHY;
+ return PREFETCH_SIZE_LOG_HIERARCHY;
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
index ece4439..05de6ac 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
@@ -22,21 +22,21 @@ package org.apache.qpid.server.logging.messages;
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;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
* Generated using GenerateLogMessages and LogMessages.vm
* This file is based on the content of ConfigStore_logmessages.properties
*
- * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
+ * To regenerate, use Maven lifecycle generates-sources with -Dgenerate=true
*/
public class ConfigStoreMessages
{
@@ -63,34 +63,34 @@ public class ConfigStoreMessages
}
public static final String CONFIGSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore";
- public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.recovery_start";
- public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.created";
- public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.store_location";
public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.close";
+ public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.created";
public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.recovery_complete";
+ public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.recovery_start";
+ public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.store_location";
static
{
LoggerFactory.getLogger(CONFIGSTORE_LOG_HIERARCHY);
- LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
- LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
+ LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ConfigStore_logmessages", _currentLocale);
}
/**
* Log a ConfigStore message of the Format:
- * <pre>CFG-1004 : Recovery Start</pre>
+ * <pre>CFG-1003 : Closed</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage RECOVERY_START()
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("RECOVERY_START");
+ String rawMessage = _messages.getString("CLOSE");
final String message = rawMessage;
@@ -105,7 +105,7 @@ public class ConfigStoreMessages
@Override
public String getLogHierarchy()
{
- return RECOVERY_START_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -193,21 +193,16 @@ public class ConfigStoreMessages
/**
* Log a ConfigStore message of the Format:
- * <pre>CFG-1002 : Store location : {0}</pre>
+ * <pre>CFG-1005 : Recovery Complete</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 RECOVERY_COMPLETE()
{
- 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("RECOVERY_COMPLETE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -220,7 +215,7 @@ public class ConfigStoreMessages
@Override
public String getLogHierarchy()
{
- return STORE_LOCATION_LOG_HIERARCHY;
+ return RECOVERY_COMPLETE_LOG_HIERARCHY;
}
@Override
@@ -253,14 +248,14 @@ public class ConfigStoreMessages
/**
* Log a ConfigStore message of the Format:
- * <pre>CFG-1003 : Closed</pre>
+ * <pre>CFG-1004 : Recovery Start</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage RECOVERY_START()
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("RECOVERY_START");
final String message = rawMessage;
@@ -275,7 +270,7 @@ public class ConfigStoreMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return RECOVERY_START_LOG_HIERARCHY;
}
@Override
@@ -308,16 +303,21 @@ public class ConfigStoreMessages
/**
* Log a ConfigStore message of the Format:
- * <pre>CFG-1005 : Recovery Complete</pre>
+ * <pre>CFG-1002 : Store location : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage RECOVERY_COMPLETE()
+ public static LogMessage STORE_LOCATION(String param1)
{
- String rawMessage = _messages.getString("RECOVERY_COMPLETE");
+ 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()
{
@@ -330,7 +330,7 @@ public class ConfigStoreMessages
@Override
public String getLogHierarchy()
{
- return RECOVERY_COMPLETE_LOG_HIERARCHY;
+ return STORE_LOCATION_LOG_HIERARCHY;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org