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:14 UTC
[3/6] qpid-broker-j git commit: NO-JIRA: [Java Broker] [Operational
Message Code Gen] Stabilise order of methods within generated code.
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
index 337a388..7708ce7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.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 Connection_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 ConnectionMessages
{
@@ -63,94 +63,34 @@ public class ConnectionMessages
}
public static final String CONNECTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.operation";
public static final String CLIENT_VERSION_LOG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.client_version_log";
public static final String CLIENT_VERSION_REJECT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.client_version_reject";
+ public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.close";
public static final String DROPPED_CONNECTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.dropped_connection";
- public static final String MODEL_DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.model_delete";
public static final String IDLE_CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.idle_close";
- public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.close";
public static final String LARGE_TRANSACTION_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.large_transaction_warn";
+ public static final String MODEL_DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.model_delete";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.open";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.operation";
static
{
LoggerFactory.getLogger(CONNECTION_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
LoggerFactory.getLogger(CLIENT_VERSION_LOG_LOG_HIERARCHY);
LoggerFactory.getLogger(CLIENT_VERSION_REJECT_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
LoggerFactory.getLogger(DROPPED_CONNECTION_LOG_HIERARCHY);
- LoggerFactory.getLogger(MODEL_DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(IDLE_CLOSE_LOG_HIERARCHY);
- LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
LoggerFactory.getLogger(LARGE_TRANSACTION_WARN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(MODEL_DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Connection_logmessages", _currentLocale);
}
/**
* Log a Connection message of the Format:
- * <pre>CON-1008 : 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()
- {
- @Override
- public String toString()
- {
- return message;
- }
-
- @Override
- public String getLogHierarchy()
- {
- return OPERATION_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 Connection message of the Format:
* <pre>CON-1005 : Client version "{0}" logged by validation</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
@@ -271,14 +211,14 @@ public class ConnectionMessages
/**
* Log a Connection message of the Format:
- * <pre>CON-1004 : Connection dropped</pre>
+ * <pre>CON-1002 : Close</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DROPPED_CONNECTION()
+ public static LogMessage CLOSE()
{
- String rawMessage = _messages.getString("DROPPED_CONNECTION");
+ String rawMessage = _messages.getString("CLOSE");
final String message = rawMessage;
@@ -293,7 +233,7 @@ public class ConnectionMessages
@Override
public String getLogHierarchy()
{
- return DROPPED_CONNECTION_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -326,14 +266,14 @@ public class ConnectionMessages
/**
* Log a Connection message of the Format:
- * <pre>CON-1007 : Connection close initiated by operator</pre>
+ * <pre>CON-1004 : Connection dropped</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage MODEL_DELETE()
+ public static LogMessage DROPPED_CONNECTION()
{
- String rawMessage = _messages.getString("MODEL_DELETE");
+ String rawMessage = _messages.getString("DROPPED_CONNECTION");
final String message = rawMessage;
@@ -348,7 +288,7 @@ public class ConnectionMessages
@Override
public String getLogHierarchy()
{
- return MODEL_DELETE_LOG_HIERARCHY;
+ return DROPPED_CONNECTION_LOG_HIERARCHY;
}
@Override
@@ -464,16 +404,21 @@ public class ConnectionMessages
/**
* Log a Connection message of the Format:
- * <pre>CON-1002 : Close</pre>
+ * <pre>CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flowed to disk.</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CLOSE()
+ public static LogMessage LARGE_TRANSACTION_WARN(Number param1, Number param2)
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("LARGE_TRANSACTION_WARN");
- 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()
{
@@ -486,7 +431,7 @@ public class ConnectionMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return LARGE_TRANSACTION_WARN_LOG_HIERARCHY;
}
@Override
@@ -519,21 +464,16 @@ public class ConnectionMessages
/**
* Log a Connection message of the Format:
- * <pre>CON-1009 : Uncommitted transaction(s) contains {0,number} bytes of incoming message data exceeding {1,number} bytes limit. Messages will be flowed to disk.</pre>
+ * <pre>CON-1007 : Connection close initiated by operator</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage LARGE_TRANSACTION_WARN(Number param1, Number param2)
+ public static LogMessage MODEL_DELETE()
{
- String rawMessage = _messages.getString("LARGE_TRANSACTION_WARN");
-
- 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("MODEL_DELETE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -546,7 +486,7 @@ public class ConnectionMessages
@Override
public String getLogHierarchy()
{
- return LARGE_TRANSACTION_WARN_LOG_HIERARCHY;
+ return MODEL_DELETE_LOG_HIERARCHY;
}
@Override
@@ -690,6 +630,66 @@ public class ConnectionMessages
};
}
+ /**
+ * Log a Connection message of the Format:
+ * <pre>CON-1008 : 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()
+ {
+ @Override
+ public String toString()
+ {
+ return message;
+ }
+
+ @Override
+ public String getLogHierarchy()
+ {
+ return OPERATION_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;
+ }
+ };
+ }
+
private ConnectionMessages()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
index 4cd7627..aa1cb38 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.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 Exchange_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 ExchangeMessages
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/f28d3b54/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
index 4674797..7c4c2e5 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.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 HighAvailability_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 HighAvailabilityMessages
{
@@ -63,52 +63,52 @@ public class HighAvailabilityMessages
}
public static final String HIGHAVAILABILITY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability";
- public static final String LEFT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.left";
- public static final String PRIORITY_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.priority_changed";
- public static final String ROLE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.role_changed";
- public static final String JOINED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.joined";
- public static final String NODE_ROLLEDBACK_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.node_rolledback";
+ public static final String ADDED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.added";
+ public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.created";
public static final String DELETED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.deleted";
- public static final String INTRUDER_DETECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.intruder_detected";
public static final String DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.designated_primary_changed";
- public static final String QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.quorum_override_changed";
- public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.created";
- public static final String ADDED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.added";
+ public static final String INTRUDER_DETECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.intruder_detected";
+ public static final String JOINED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.joined";
+ public static final String LEFT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.left";
+ public static final String NODE_ROLLEDBACK_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.node_rolledback";
+ public static final String PRIORITY_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.priority_changed";
public static final String QUORUM_LOST_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.quorum_lost";
- public static final String TRANSFER_MASTER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.transfer_master";
+ public static final String QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.quorum_override_changed";
public static final String REMOVED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.removed";
+ public static final String ROLE_CHANGED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.role_changed";
+ public static final String TRANSFER_MASTER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.transfer_master";
static
{
LoggerFactory.getLogger(HIGHAVAILABILITY_LOG_HIERARCHY);
- LoggerFactory.getLogger(LEFT_LOG_HIERARCHY);
- LoggerFactory.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
- LoggerFactory.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
- LoggerFactory.getLogger(JOINED_LOG_HIERARCHY);
- LoggerFactory.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY);
+ LoggerFactory.getLogger(ADDED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
LoggerFactory.getLogger(DELETED_LOG_HIERARCHY);
- LoggerFactory.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
LoggerFactory.getLogger(DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY);
- LoggerFactory.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
- LoggerFactory.getLogger(ADDED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(INTRUDER_DETECTED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(JOINED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(LEFT_LOG_HIERARCHY);
+ LoggerFactory.getLogger(NODE_ROLLEDBACK_LOG_HIERARCHY);
+ LoggerFactory.getLogger(PRIORITY_CHANGED_LOG_HIERARCHY);
LoggerFactory.getLogger(QUORUM_LOST_LOG_HIERARCHY);
- LoggerFactory.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
+ LoggerFactory.getLogger(QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY);
LoggerFactory.getLogger(REMOVED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(ROLE_CHANGED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(TRANSFER_MASTER_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.HighAvailability_logmessages", _currentLocale);
}
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1006 : Left : Node : ''{0}'' ({1})</pre>
+ * <pre>HA-1003 : Added : Node : ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage LEFT(String param1, String param2)
+ public static LogMessage ADDED(String param1, String param2)
{
- String rawMessage = _messages.getString("LEFT");
+ String rawMessage = _messages.getString("ADDED");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -128,7 +128,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return LEFT_LOG_HIERARCHY;
+ return ADDED_LOG_HIERARCHY;
}
@Override
@@ -161,21 +161,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1012 : Priority : {0}</pre>
+ * <pre>HA-1001 : Created</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage PRIORITY_CHANGED(String param1)
+ public static LogMessage CREATED()
{
- String rawMessage = _messages.getString("PRIORITY_CHANGED");
-
- 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("CREATED");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -188,7 +183,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return PRIORITY_CHANGED_LOG_HIERARCHY;
+ return CREATED_LOG_HIERARCHY;
}
@Override
@@ -221,21 +216,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1010 : Role change reported: Node : ''{0}'' ({1}) : from ''{2}'' to ''{3}''</pre>
+ * <pre>HA-1002 : Deleted</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage ROLE_CHANGED(String param1, String param2, String param3, String param4)
+ public static LogMessage DELETED()
{
- String rawMessage = _messages.getString("ROLE_CHANGED");
-
- 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);
+ String rawMessage = _messages.getString("DELETED");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -248,7 +238,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return ROLE_CHANGED_LOG_HIERARCHY;
+ return DELETED_LOG_HIERARCHY;
}
@Override
@@ -281,16 +271,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1005 : Joined : Node : ''{0}'' ({1})</pre>
+ * <pre>HA-1013 : Designated primary : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage JOINED(String param1, String param2)
+ public static LogMessage DESIGNATED_PRIMARY_CHANGED(String param1)
{
- String rawMessage = _messages.getString("JOINED");
+ String rawMessage = _messages.getString("DESIGNATED_PRIMARY_CHANGED");
- 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);
@@ -308,7 +298,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return JOINED_LOG_HIERARCHY;
+ return DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY;
}
@Override
@@ -341,16 +331,21 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1014 : Diverged transactions discarded</pre>
+ * <pre>HA-1008 : Intruder detected : Node ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage NODE_ROLLEDBACK()
+ public static LogMessage INTRUDER_DETECTED(String param1, String param2)
{
- String rawMessage = _messages.getString("NODE_ROLLEDBACK");
+ String rawMessage = _messages.getString("INTRUDER_DETECTED");
- 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()
{
@@ -363,7 +358,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return NODE_ROLLEDBACK_LOG_HIERARCHY;
+ return INTRUDER_DETECTED_LOG_HIERARCHY;
}
@Override
@@ -396,16 +391,21 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1002 : Deleted</pre>
+ * <pre>HA-1005 : Joined : Node : ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DELETED()
+ public static LogMessage JOINED(String param1, String param2)
{
- String rawMessage = _messages.getString("DELETED");
+ String rawMessage = _messages.getString("JOINED");
- 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()
{
@@ -418,7 +418,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return DELETED_LOG_HIERARCHY;
+ return JOINED_LOG_HIERARCHY;
}
@Override
@@ -451,14 +451,14 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1008 : Intruder detected : Node ''{0}'' ({1})</pre>
+ * <pre>HA-1006 : Left : Node : ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage INTRUDER_DETECTED(String param1, String param2)
+ public static LogMessage LEFT(String param1, String param2)
{
- String rawMessage = _messages.getString("INTRUDER_DETECTED");
+ String rawMessage = _messages.getString("LEFT");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -478,7 +478,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return INTRUDER_DETECTED_LOG_HIERARCHY;
+ return LEFT_LOG_HIERARCHY;
}
@Override
@@ -511,21 +511,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1013 : Designated primary : {0}</pre>
+ * <pre>HA-1014 : Diverged transactions discarded</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DESIGNATED_PRIMARY_CHANGED(String param1)
+ public static LogMessage NODE_ROLLEDBACK()
{
- String rawMessage = _messages.getString("DESIGNATED_PRIMARY_CHANGED");
-
- 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("NODE_ROLLEDBACK");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -538,7 +533,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return DESIGNATED_PRIMARY_CHANGED_LOG_HIERARCHY;
+ return NODE_ROLLEDBACK_LOG_HIERARCHY;
}
@Override
@@ -571,14 +566,14 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1011 : Minimum group size : {0}</pre>
+ * <pre>HA-1012 : Priority : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage QUORUM_OVERRIDE_CHANGED(String param1)
+ public static LogMessage PRIORITY_CHANGED(String param1)
{
- String rawMessage = _messages.getString("QUORUM_OVERRIDE_CHANGED");
+ String rawMessage = _messages.getString("PRIORITY_CHANGED");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -598,7 +593,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY;
+ return PRIORITY_CHANGED_LOG_HIERARCHY;
}
@Override
@@ -631,14 +626,14 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1001 : Created</pre>
+ * <pre>HA-1009 : Insufficient replicas contactable</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CREATED()
+ public static LogMessage QUORUM_LOST()
{
- String rawMessage = _messages.getString("CREATED");
+ String rawMessage = _messages.getString("QUORUM_LOST");
final String message = rawMessage;
@@ -653,7 +648,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return CREATED_LOG_HIERARCHY;
+ return QUORUM_LOST_LOG_HIERARCHY;
}
@Override
@@ -686,16 +681,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1003 : Added : Node : ''{0}'' ({1})</pre>
+ * <pre>HA-1011 : Minimum group size : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage ADDED(String param1, String param2)
+ public static LogMessage QUORUM_OVERRIDE_CHANGED(String param1)
{
- String rawMessage = _messages.getString("ADDED");
+ String rawMessage = _messages.getString("QUORUM_OVERRIDE_CHANGED");
- 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);
@@ -713,7 +708,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return ADDED_LOG_HIERARCHY;
+ return QUORUM_OVERRIDE_CHANGED_LOG_HIERARCHY;
}
@Override
@@ -746,16 +741,21 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1009 : Insufficient replicas contactable</pre>
+ * <pre>HA-1004 : Removed : Node : ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage QUORUM_LOST()
+ public static LogMessage REMOVED(String param1, String param2)
{
- String rawMessage = _messages.getString("QUORUM_LOST");
+ String rawMessage = _messages.getString("REMOVED");
- 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()
{
@@ -768,7 +768,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return QUORUM_LOST_LOG_HIERARCHY;
+ return REMOVED_LOG_HIERARCHY;
}
@Override
@@ -801,16 +801,16 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1007 : Master transfer requested : to ''{0}'' ({1})</pre>
+ * <pre>HA-1010 : Role change reported: Node : ''{0}'' ({1}) : from ''{2}'' to ''{3}''</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage TRANSFER_MASTER(String param1, String param2)
+ public static LogMessage ROLE_CHANGED(String param1, String param2, String param3, String param4)
{
- String rawMessage = _messages.getString("TRANSFER_MASTER");
+ String rawMessage = _messages.getString("ROLE_CHANGED");
- final Object[] messageArguments = {param1, param2};
+ 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);
@@ -828,7 +828,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return TRANSFER_MASTER_LOG_HIERARCHY;
+ return ROLE_CHANGED_LOG_HIERARCHY;
}
@Override
@@ -861,14 +861,14 @@ public class HighAvailabilityMessages
/**
* Log a HighAvailability message of the Format:
- * <pre>HA-1004 : Removed : Node : ''{0}'' ({1})</pre>
+ * <pre>HA-1007 : Master transfer requested : to ''{0}'' ({1})</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage REMOVED(String param1, String param2)
+ public static LogMessage TRANSFER_MASTER(String param1, String param2)
{
- String rawMessage = _messages.getString("REMOVED");
+ String rawMessage = _messages.getString("TRANSFER_MASTER");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -888,7 +888,7 @@ public class HighAvailabilityMessages
@Override
public String getLogHierarchy()
{
- return REMOVED_LOG_HIERARCHY;
+ return TRANSFER_MASTER_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/KeyStoreMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
index b73c53f..84f9de4 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.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 KeyStore_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 KeyStoreMessages
{
@@ -63,43 +63,38 @@ public class KeyStoreMessages
}
public static final String KEYSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore";
- public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.delete";
+ public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.close";
public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.create";
- public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.operation";
+ public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.delete";
public static final String EXPIRING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.expiring";
- public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.close";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.open";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.operation";
static
{
LoggerFactory.getLogger(KEYSTORE_LOG_HIERARCHY);
- LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(EXPIRING_LOG_HIERARCHY);
- LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.KeyStore_logmessages", _currentLocale);
}
/**
* Log a KeyStore message of the Format:
- * <pre>KST-1004 : Delete "{0}"</pre>
+ * <pre>KST-1003 : Close</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 CLOSE()
{
- 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);
+ String rawMessage = _messages.getString("CLOSE");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -112,7 +107,7 @@ public class KeyStoreMessages
@Override
public String getLogHierarchy()
{
- return DELETE_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -205,14 +200,14 @@ public class KeyStoreMessages
/**
* Log a KeyStore message of the Format:
- * <pre>KST-1006 : Operation : {0}</pre>
+ * <pre>KST-1004 : Delete "{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 DELETE(String param1)
{
- String rawMessage = _messages.getString("OPERATION");
+ String rawMessage = _messages.getString("DELETE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -232,7 +227,7 @@ public class KeyStoreMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return DELETE_LOG_HIERARCHY;
}
@Override
@@ -325,14 +320,14 @@ public class KeyStoreMessages
/**
* Log a KeyStore message of the Format:
- * <pre>KST-1003 : Close</pre>
+ * <pre>KST-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;
@@ -347,7 +342,7 @@ public class KeyStoreMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
@@ -380,16 +375,21 @@ public class KeyStoreMessages
/**
* Log a KeyStore message of the Format:
- * <pre>KST-1002 : Open</pre>
+ * <pre>KST-1006 : 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()
{
@@ -402,7 +402,7 @@ public class KeyStoreMessages
@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/ManagementConsoleMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index e02c74d..c3573c3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.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 ManagementConsole_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 ManagementConsoleMessages
{
@@ -63,38 +63,38 @@ public class ManagementConsoleMessages
}
public static final String MANAGEMENTCONSOLE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole";
+ public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.close";
+ public static final String LISTENING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.listening";
+ public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open";
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 CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.close";
- public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open";
+ public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.stopped";
static
{
LoggerFactory.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(LISTENING_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPEN_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(CLOSE_LOG_HIERARCHY);
- LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.ManagementConsole_logmessages", _currentLocale);
}
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1004 : {0} Management Ready</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 READY(String param1)
+ public static LogMessage CLOSE(String param1)
{
- String rawMessage = _messages.getString("READY");
+ String rawMessage = _messages.getString("CLOSE");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -114,7 +114,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return READY_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -147,16 +147,16 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1003 : Shutting down : {0} : port {1,number,#}</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 SHUTTING_DOWN(String param1, Number param2)
+ public static LogMessage LISTENING(String param1, String param2, Number param3)
{
- String rawMessage = _messages.getString("SHUTTING_DOWN");
+ String rawMessage = _messages.getString("LISTENING");
- 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);
@@ -174,7 +174,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return SHUTTING_DOWN_LOG_HIERARCHY;
+ return LISTENING_LOG_HIERARCHY;
}
@Override
@@ -207,14 +207,14 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1005 : {0} Management Stopped</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 STOPPED(String param1)
+ public static LogMessage OPEN(String param1)
{
- String rawMessage = _messages.getString("STOPPED");
+ String rawMessage = _messages.getString("OPEN");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -234,7 +234,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return STOPPED_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
@@ -267,16 +267,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-1004 : {0} Management Ready</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 READY(String param1)
{
- String rawMessage = _messages.getString("LISTENING");
+ String rawMessage = _messages.getString("READY");
- final Object[] messageArguments = {param1, param2, param3};
+ 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);
@@ -294,7 +294,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return LISTENING_LOG_HIERARCHY;
+ return READY_LOG_HIERARCHY;
}
@Override
@@ -327,16 +327,16 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1001 : {0} Management Startup</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 STARTUP(String param1)
+ public static LogMessage SHUTTING_DOWN(String param1, Number param2)
{
- String rawMessage = _messages.getString("STARTUP");
+ 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);
@@ -354,7 +354,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return STARTUP_LOG_HIERARCHY;
+ return SHUTTING_DOWN_LOG_HIERARCHY;
}
@Override
@@ -387,14 +387,14 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1008 : Close : User {0}</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 CLOSE(String param1)
+ public static LogMessage STARTUP(String param1)
{
- String rawMessage = _messages.getString("CLOSE");
+ String rawMessage = _messages.getString("STARTUP");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -414,7 +414,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return STARTUP_LOG_HIERARCHY;
}
@Override
@@ -447,14 +447,14 @@ public class ManagementConsoleMessages
/**
* Log a ManagementConsole message of the Format:
- * <pre>MNG-1007 : Open : User {0}</pre>
+ * <pre>MNG-1005 : {0} Management Stopped</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 STOPPED(String param1)
{
- String rawMessage = _messages.getString("OPEN");
+ String rawMessage = _messages.getString("STOPPED");
final Object[] messageArguments = {param1};
// Create a new MessageFormat to ensure thread safety.
@@ -474,7 +474,7 @@ public class ManagementConsoleMessages
@Override
public String getLogHierarchy()
{
- return OPEN_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/MessageStoreMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
index e6a9483..c9f284e 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.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 MessageStore_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 MessageStoreMessages
{
@@ -63,40 +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 CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.closed";
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 OVERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.overfull";
- 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 RECOVERED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovered";
+ public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_complete";
+ public static final String RECOVERY_START_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_start";
+ public static final String STORE_LOCATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.store_location";
+ public static final String UNDERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.underfull";
static
{
LoggerFactory.getLogger(MESSAGESTORE_LOG_HIERARCHY);
- LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY);
LoggerFactory.getLogger(CREATED_LOG_HIERARCHY);
- LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
- LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
LoggerFactory.getLogger(OVERFULL_LOG_HIERARCHY);
- LoggerFactory.getLogger(CLOSED_LOG_HIERARCHY);
- LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY);
LoggerFactory.getLogger(RECOVERED_LOG_HIERARCHY);
+ LoggerFactory.getLogger(RECOVERY_COMPLETE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(RECOVERY_START_LOG_HIERARCHY);
+ LoggerFactory.getLogger(STORE_LOCATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(UNDERFULL_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.MessageStore_logmessages", _currentLocale);
}
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1004 : Recovery Start</pre>
+ * <pre>MST-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 CLOSED()
{
- String rawMessage = _messages.getString("RECOVERY_START");
+ String rawMessage = _messages.getString("CLOSED");
final String message = rawMessage;
@@ -111,7 +111,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return RECOVERY_START_LOG_HIERARCHY;
+ return CLOSED_LOG_HIERARCHY;
}
@Override
@@ -199,21 +199,16 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1002 : Store location : {0}</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 STORE_LOCATION(String param1)
+ public static LogMessage OVERFULL()
{
- 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("OVERFULL");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -226,7 +221,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return STORE_LOCATION_LOG_HIERARCHY;
+ return OVERFULL_LOG_HIERARCHY;
}
@Override
@@ -259,16 +254,21 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1006 : Recovery Complete</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_COMPLETE()
+ public static LogMessage RECOVERED(Number param1)
{
- String rawMessage = _messages.getString("RECOVERY_COMPLETE");
+ 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()
{
@@ -281,7 +281,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return RECOVERY_COMPLETE_LOG_HIERARCHY;
+ return RECOVERED_LOG_HIERARCHY;
}
@Override
@@ -314,14 +314,14 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1008 : Store overfull, flow control will be enforced</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 OVERFULL()
+ public static LogMessage RECOVERY_COMPLETE()
{
- String rawMessage = _messages.getString("OVERFULL");
+ String rawMessage = _messages.getString("RECOVERY_COMPLETE");
final String message = rawMessage;
@@ -336,7 +336,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return OVERFULL_LOG_HIERARCHY;
+ return RECOVERY_COMPLETE_LOG_HIERARCHY;
}
@Override
@@ -369,14 +369,14 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1003 : Closed</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 CLOSED()
+ public static LogMessage RECOVERY_START()
{
- String rawMessage = _messages.getString("CLOSED");
+ String rawMessage = _messages.getString("RECOVERY_START");
final String message = rawMessage;
@@ -391,7 +391,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return CLOSED_LOG_HIERARCHY;
+ return RECOVERY_START_LOG_HIERARCHY;
}
@Override
@@ -424,16 +424,21 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1009 : Store overfull condition cleared</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 UNDERFULL()
+ public static LogMessage STORE_LOCATION(String param1)
{
- String rawMessage = _messages.getString("UNDERFULL");
+ 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()
{
@@ -446,7 +451,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return UNDERFULL_LOG_HIERARCHY;
+ return STORE_LOCATION_LOG_HIERARCHY;
}
@Override
@@ -479,21 +484,16 @@ public class MessageStoreMessages
/**
* Log a MessageStore message of the Format:
- * <pre>MST-1005 : Recovered {0,number} messages</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 RECOVERED(Number param1)
+ public static LogMessage UNDERFULL()
{
- 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("UNDERFULL");
- final String message = formatter.format(messageArguments);
+ final String message = rawMessage;
return new LogMessage()
{
@@ -506,7 +506,7 @@ public class MessageStoreMessages
@Override
public String getLogHierarchy()
{
- return RECOVERED_LOG_HIERARCHY;
+ return UNDERFULL_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/PortMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
index e31f251..c331c8f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.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 Port_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 PortMessages
{
@@ -63,44 +63,44 @@ public class PortMessages
}
public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
- public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.delete";
- public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.create";
- 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_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
+ public static final String CONNECTION_REJECTED_CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected_closed";
public static final String CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected_too_many";
+ public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.create";
+ public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.delete";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.open";
+ public static final String OPERATION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.operation";
+ public static final String UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.unsupported_protocol_header";
static
{
LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
- LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
- LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
- 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_COUNT_WARN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CONNECTION_REJECTED_CLOSED_LOG_HIERARCHY);
LoggerFactory.getLogger(CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY);
+ LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+ LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+ LoggerFactory.getLogger(OPERATION_LOG_HIERARCHY);
+ LoggerFactory.getLogger(UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY);
_messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
}
/**
* Log a Port message of the Format:
- * <pre>PRT-1006 : Delete {0} Port "{1}"</pre>
+ * <pre>PRT-1009 : FAILED to bind {0} service to {1,number,#} - port in use</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage DELETE(String param1, String param2)
+ public static LogMessage BIND_FAILED(String param1, Number param2)
{
- String rawMessage = _messages.getString("DELETE");
+ String rawMessage = _messages.getString("BIND_FAILED");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -120,7 +120,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return DELETE_LOG_HIERARCHY;
+ return BIND_FAILED_LOG_HIERARCHY;
}
@Override
@@ -153,21 +153,16 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1001 : Create "{0}"</pre>
+ * <pre>PRT-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()
{
@@ -180,7 +175,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return CREATE_LOG_HIERARCHY;
+ return CLOSE_LOG_HIERARCHY;
}
@Override
@@ -213,16 +208,16 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1007 : Unsupported protocol header received, replying with {0}</pre>
+ * <pre>PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1)
+ public static LogMessage CONNECTION_COUNT_WARN(Number param1, Number param2, Number param3)
{
- String rawMessage = _messages.getString("UNSUPPORTED_PROTOCOL_HEADER");
+ String rawMessage = _messages.getString("CONNECTION_COUNT_WARN");
- 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);
@@ -240,7 +235,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY;
+ return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
}
@Override
@@ -333,16 +328,16 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}</pre>
+ * <pre>PRT-1005 : Connection from {0} rejected. Maximum connection count ({1, number}) for this port already reached.</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CONNECTION_COUNT_WARN(Number param1, Number param2, Number param3)
+ public static LogMessage CONNECTION_REJECTED_TOO_MANY(String param1, Number param2)
{
- String rawMessage = _messages.getString("CONNECTION_COUNT_WARN");
+ String rawMessage = _messages.getString("CONNECTION_REJECTED_TOO_MANY");
- 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);
@@ -360,7 +355,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
+ return CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY;
}
@Override
@@ -393,14 +388,14 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1010 : Operation : {0}</pre>
+ * <pre>PRT-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.
@@ -420,7 +415,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return OPERATION_LOG_HIERARCHY;
+ return CREATE_LOG_HIERARCHY;
}
@Override
@@ -453,14 +448,14 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1009 : FAILED to bind {0} service to {1,number,#} - port in use</pre>
+ * <pre>PRT-1006 : Delete {0} Port "{1}"</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage BIND_FAILED(String param1, Number param2)
+ public static LogMessage DELETE(String param1, String param2)
{
- String rawMessage = _messages.getString("BIND_FAILED");
+ String rawMessage = _messages.getString("DELETE");
final Object[] messageArguments = {param1, param2};
// Create a new MessageFormat to ensure thread safety.
@@ -480,7 +475,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return BIND_FAILED_LOG_HIERARCHY;
+ return DELETE_LOG_HIERARCHY;
}
@Override
@@ -513,14 +508,14 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1003 : Close</pre>
+ * <pre>PRT-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;
@@ -535,7 +530,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return CLOSE_LOG_HIERARCHY;
+ return OPEN_LOG_HIERARCHY;
}
@Override
@@ -568,16 +563,16 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1005 : Connection from {0} rejected. Maximum connection count ({1, number}) for this port already reached.</pre>
+ * <pre>PRT-1010 : Operation : {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage CONNECTION_REJECTED_TOO_MANY(String param1, Number param2)
+ public static LogMessage OPERATION(String param1)
{
- String rawMessage = _messages.getString("CONNECTION_REJECTED_TOO_MANY");
+ String rawMessage = _messages.getString("OPERATION");
- 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);
@@ -595,7 +590,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return CONNECTION_REJECTED_TOO_MANY_LOG_HIERARCHY;
+ return OPERATION_LOG_HIERARCHY;
}
@Override
@@ -628,16 +623,21 @@ public class PortMessages
/**
* Log a Port message of the Format:
- * <pre>PRT-1002 : Open</pre>
+ * <pre>PRT-1007 : Unsupported protocol header received, replying with {0}</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
*/
- public static LogMessage OPEN()
+ public static LogMessage UNSUPPORTED_PROTOCOL_HEADER(String param1)
{
- String rawMessage = _messages.getString("OPEN");
+ String rawMessage = _messages.getString("UNSUPPORTED_PROTOCOL_HEADER");
- 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()
{
@@ -650,7 +650,7 @@ public class PortMessages
@Override
public String getLogHierarchy()
{
- return OPEN_LOG_HIERARCHY;
+ return UNSUPPORTED_PROTOCOL_HEADER_LOG_HIERARCHY;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org