qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1691250 [1/2] - in /qpid/java/trunk: broker-core/src/main/java/org/apache/qpid/server/logging/messages/ broker-core/src/main/java/org/apache/qpid/server/model/port/ broker-core/src/main/java/org/apache/qpid/server/security/ broker-core/src...
Date Wed, 15 Jul 2015 17:25:31 GMT
Author: kwall
Date: Wed Jul 15 17:25:30 2015
New Revision: 1691250

URL: http://svn.apache.org/r1691250
Log:
QPID-6644: [Java Broker] Add operational logging for creation/deletion of several objects.

Work by Lorenz Quack <quack.lorenz@gmail.com> and Keith Wall

Added:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties
      - copied, changed from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
Modified:
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustsStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
    qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaKeyStoreTest.java
    qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java
    qpid/java/trunk/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java
    qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
    qpid/java/trunk/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java
    qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/test/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0Test.java
    qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -44,12 +45,20 @@ public class AccessControlMessages
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
     public static final String ACCESSCONTROL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol";
+    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.open";
+    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 CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.close";
     public static final String DENIED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.denied";
     public static final String ALLOWED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.allowed";
 
     static
     {
         LoggerFactory.getLogger(ACCESSCONTROL_LOG_HIERARCHY);
+        LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
         LoggerFactory.getLogger(DENIED_LOG_HIERARCHY);
         LoggerFactory.getLogger(ALLOWED_LOG_HIERARCHY);
 
@@ -57,6 +66,228 @@ public class AccessControlMessages
     }
 
     /**
+     * Log a AccessControl message of the Format:
+     * <pre>ACL-1012 : Open</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage OPEN()
+    {
+        String rawMessage = _messages.getString("OPEN");
+
+        final String message = rawMessage;
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return OPEN_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 AccessControl message of the Format:
+     * <pre>ACL-1011 : Create "{0}"</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage CREATE(String param1)
+    {
+        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);
+
+        final String message = formatter.format(messageArguments);
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return CREATE_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 AccessControl message of the Format:
+     * <pre>ACL-1014 : Delete "{0}"</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage DELETE(String param1)
+    {
+        String rawMessage = _messages.getString("DELETE");
+
+        final Object[] messageArguments = {param1};
+        // Create a new MessageFormat to ensure thread safety.
+        // Sharing a MessageFormat and using applyPattern is not thread safe
+        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
+
+        final String message = formatter.format(messageArguments);
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return DELETE_LOG_HIERARCHY;
+            }
+
+            @Override
+            public boolean equals(final Object o)
+            {
+                if (this == o)
+                {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass())
+                {
+                    return false;
+                }
+
+                final LogMessage that = (LogMessage) o;
+
+                return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+            }
+
+            @Override
+            public int hashCode()
+            {
+                int result = toString().hashCode();
+                result = 31 * result + getLogHierarchy().hashCode();
+                return result;
+            }
+        };
+    }
+
+    /**
+     * Log a AccessControl message of the Format:
+     * <pre>ACL-1013 : Close</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage CLOSE()
+    {
+        String rawMessage = _messages.getString("CLOSE");
+
+        final String message = rawMessage;
+
+        return new LogMessage()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return CLOSE_LOG_HIERARCHY;
+            }
+
+            @Override
+            public boolean equals(final Object o)
+            {
+                if (this == o)
+                {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass())
+                {
+                    return false;
+                }
+
+                final LogMessage that = (LogMessage) o;
+
+                return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+            }
+
+            @Override
+            public int hashCode()
+            {
+                int result = toString().hashCode();
+                result = 31 * result + getLogHierarchy().hashCode();
+                return result;
+            }
+        };
+    }
+
+    /**
      * Log a AccessControl message of the Format:
      * <pre>ACL-1002 : Denied : {0} {1} {2}</pre>
      * Optional values are contained in [square brackets] and are numbered

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControl_logmessages.properties Wed Jul 15 17:25:30 2015
@@ -24,3 +24,9 @@ ALLOWED = ACL-1001 : Allowed : {0} {1} {
 
 # 'deny-log' rule message
 DENIED = ACL-1002 : Denied : {0} {1} {2}
+
+CREATE = ACL-1011 : Create "{0}"
+OPEN = ACL-1012 : Open
+CLOSE = ACL-1013 : Close
+DELETE = ACL-1014 : Delete "{0}"
+

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -34,37 +35,35 @@ import java.util.ResourceBundle;
  * 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
+ * This file is based on the content of AuthenticationProvider_logmessages.properties
  *
  * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
  */
-public class PortMessages
+public class AuthenticationProviderMessages
 {
     private static ResourceBundle _messages;
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
-    public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
-    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.open";
-    public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.create";
-    public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close";
-    public static final String CONNECTION_REJECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected";
-    public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
+    public static final String AUTHENTICATIONPROVIDER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider";
+    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.open";
+    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 CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.close";
 
     static
     {
-        LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
+        LoggerFactory.getLogger(AUTHENTICATIONPROVIDER_LOG_HIERARCHY);
         LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
         LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
 
-        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
+        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.AuthenticationProvider_logmessages", _currentLocale);
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1002 : Open</pre>
+     * Log a AuthenticationProvider message of the Format:
+     * <pre>ATH-1002 : Open</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
@@ -116,70 +115,22 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1001 : Create</pre>
+     * Log a AuthenticationProvider message of the Format:
+     * <pre>ATH-1001 : Create "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CREATE()
+    public static LogMessage CREATE(String param1)
     {
         String rawMessage = _messages.getString("CREATE");
 
-        final String message = rawMessage;
-
-        return new LogMessage()
-        {
-            public String toString()
-            {
-                return message;
-            }
-
-            public String getLogHierarchy()
-            {
-                return CREATE_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 Port message of the Format:
-     * <pre>PRT-1003 : Close</pre>
-     * Optional values are contained in [square brackets] and are numbered
-     * sequentially in the method call.
-     *
-     */
-    public static LogMessage CLOSE()
-    {
-        String rawMessage = _messages.getString("CLOSE");
+        final 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 = rawMessage;
+        final String message = formatter.format(messageArguments);
 
         return new LogMessage()
         {
@@ -190,7 +141,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CLOSE_LOG_HIERARCHY;
+                return CREATE_LOG_HIERARCHY;
             }
 
             @Override
@@ -222,15 +173,15 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1005 : Connection from {0} rejected</pre>
+     * Log a AuthenticationProvider message of the Format:
+     * <pre>ATH-1004 : Delete "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CONNECTION_REJECTED(String param1)
+    public static LogMessage DELETE(String param1)
     {
-        String rawMessage = _messages.getString("CONNECTION_REJECTED");
+        String rawMessage = _messages.getString("DELETE");
 
         final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
@@ -248,7 +199,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_REJECTED_LOG_HIERARCHY;
+                return DELETE_LOG_HIERARCHY;
             }
 
             @Override
@@ -280,22 +231,17 @@ 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>
+     * Log a AuthenticationProvider message of the Format:
+     * <pre>ATH-1003 : Close</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 CLOSE()
     {
-        String rawMessage = _messages.getString("CONNECTION_COUNT_WARN");
-
-        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()
         {
@@ -306,7 +252,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
+                return CLOSE_LOG_HIERARCHY;
             }
 
             @Override
@@ -338,7 +284,7 @@ public class PortMessages
     }
 
 
-    private PortMessages()
+    private AuthenticationProviderMessages()
     {
     }
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProvider_logmessages.properties Wed Jul 15 17:25:30 2015
@@ -18,9 +18,8 @@
 #
 # Default File used for all non-defined locales.
 
-CREATE = PRT-1001 : Create
-OPEN = PRT-1002 : Open
-CLOSE = PRT-1003 : Close
-# 0 - flow
-CONNECTION_COUNT_WARN = PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}
-CONNECTION_REJECTED = PRT-1005 : Connection from {0} rejected
+CREATE = ATH-1001 : Create "{0}"
+OPEN = ATH-1002 : Open
+CLOSE = ATH-1003 : Close
+DELETE = ATH-1004 : Delete "{0}"
+

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -44,7 +45,6 @@ public class BrokerMessages
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
     public static final String BROKER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker";
-    public static final String LOG_CONFIG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.log_config";
     public static final String CONFIG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.config";
     public static final String STATS_DATA_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stats_data";
     public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.stopped";
@@ -64,7 +64,6 @@ public class BrokerMessages
     static
     {
         LoggerFactory.getLogger(BROKER_LOG_HIERARCHY);
-        LoggerFactory.getLogger(LOG_CONFIG_LOG_HIERARCHY);
         LoggerFactory.getLogger(CONFIG_LOG_HIERARCHY);
         LoggerFactory.getLogger(STATS_DATA_LOG_HIERARCHY);
         LoggerFactory.getLogger(STOPPED_LOG_HIERARCHY);
@@ -85,64 +84,6 @@ public class BrokerMessages
     }
 
     /**
-     * Log a Broker message of the Format:
-     * <pre>BRK-1007 : Using logging configuration : {0}</pre>
-     * Optional values are contained in [square brackets] and are numbered
-     * sequentially in the method call.
-     *
-     */
-    public static LogMessage LOG_CONFIG(String param1)
-    {
-        String rawMessage = _messages.getString("LOG_CONFIG");
-
-        final Object[] messageArguments = {param1};
-        // Create a new MessageFormat to ensure thread safety.
-        // Sharing a MessageFormat and using applyPattern is not thread safe
-        MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
-
-        final String message = formatter.format(messageArguments);
-
-        return new LogMessage()
-        {
-            public String toString()
-            {
-                return message;
-            }
-
-            public String getLogHierarchy()
-            {
-                return LOG_CONFIG_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 Broker message of the Format:
      * <pre>BRK-1006 : Using configuration : {0}</pre>
      * Optional values are contained in [square brackets] and are numbered

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -34,37 +35,35 @@ import java.util.ResourceBundle;
  * 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
+ * This file is based on the content of KeyStore_logmessages.properties
  *
  * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
  */
-public class PortMessages
+public class KeyStoreMessages
 {
     private static ResourceBundle _messages;
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
-    public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
-    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.open";
-    public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.create";
-    public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close";
-    public static final String CONNECTION_REJECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected";
-    public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
+    public static final String KEYSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore";
+    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.open";
+    public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.create";
+    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";
 
     static
     {
-        LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
+        LoggerFactory.getLogger(KEYSTORE_LOG_HIERARCHY);
         LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
         LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
 
-        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
+        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.KeyStore_logmessages", _currentLocale);
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1002 : Open</pre>
+     * Log a KeyStore message of the Format:
+     * <pre>KST-1002 : Open</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
@@ -116,70 +115,22 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1001 : Create</pre>
+     * Log a KeyStore message of the Format:
+     * <pre>KST-1001 : Create "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CREATE()
+    public static LogMessage CREATE(String param1)
     {
         String rawMessage = _messages.getString("CREATE");
 
-        final String message = rawMessage;
-
-        return new LogMessage()
-        {
-            public String toString()
-            {
-                return message;
-            }
-
-            public String getLogHierarchy()
-            {
-                return CREATE_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 Port message of the Format:
-     * <pre>PRT-1003 : Close</pre>
-     * Optional values are contained in [square brackets] and are numbered
-     * sequentially in the method call.
-     *
-     */
-    public static LogMessage CLOSE()
-    {
-        String rawMessage = _messages.getString("CLOSE");
+        final 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 = rawMessage;
+        final String message = formatter.format(messageArguments);
 
         return new LogMessage()
         {
@@ -190,7 +141,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CLOSE_LOG_HIERARCHY;
+                return CREATE_LOG_HIERARCHY;
             }
 
             @Override
@@ -222,15 +173,15 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1005 : Connection from {0} rejected</pre>
+     * Log a KeyStore message of the Format:
+     * <pre>KST-1004 : Delete "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CONNECTION_REJECTED(String param1)
+    public static LogMessage DELETE(String param1)
     {
-        String rawMessage = _messages.getString("CONNECTION_REJECTED");
+        String rawMessage = _messages.getString("DELETE");
 
         final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
@@ -248,7 +199,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_REJECTED_LOG_HIERARCHY;
+                return DELETE_LOG_HIERARCHY;
             }
 
             @Override
@@ -280,22 +231,17 @@ 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>
+     * Log a KeyStore message of the Format:
+     * <pre>KST-1003 : Close</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 CLOSE()
     {
-        String rawMessage = _messages.getString("CONNECTION_COUNT_WARN");
-
-        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()
         {
@@ -306,7 +252,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
+                return CLOSE_LOG_HIERARCHY;
             }
 
             @Override
@@ -338,7 +284,7 @@ public class PortMessages
     }
 
 
-    private PortMessages()
+    private KeyStoreMessages()
     {
     }
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStore_logmessages.properties Wed Jul 15 17:25:30 2015
@@ -18,9 +18,8 @@
 #
 # Default File used for all non-defined locales.
 
-CREATE = PRT-1001 : Create
-OPEN = PRT-1002 : Open
-CLOSE = PRT-1003 : Close
-# 0 - flow
-CONNECTION_COUNT_WARN = PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}
-CONNECTION_REJECTED = PRT-1005 : Connection from {0} rejected
+CREATE = KST-1001 : Create "{0}"
+OPEN = KST-1002 : Open
+CLOSE = KST-1003 : Close
+DELETE = KST-1004 : Delete "{0}"
+

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -46,6 +47,7 @@ public class PortMessages
     public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
     public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.open";
     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 CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close";
     public static final String CONNECTION_REJECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected";
     public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
@@ -55,6 +57,7 @@ public class PortMessages
         LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
         LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
         LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
         LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
@@ -117,16 +120,21 @@ public class PortMessages
 
     /**
      * Log a Port message of the Format:
-     * <pre>PRT-1001 : Create</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 CREATE()
+    public static LogMessage CREATE(String param1)
     {
         String rawMessage = _messages.getString("CREATE");
 
-        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()
         {
@@ -141,6 +149,64 @@ public class PortMessages
             }
 
             @Override
+            public boolean equals(final Object o)
+            {
+                if (this == o)
+                {
+                    return true;
+                }
+                if (o == null || getClass() != o.getClass())
+                {
+                    return false;
+                }
+
+                final LogMessage that = (LogMessage) o;
+
+                return getLogHierarchy().equals(that.getLogHierarchy()) && toString().equals(that.toString());
+
+            }
+
+            @Override
+            public int hashCode()
+            {
+                int result = toString().hashCode();
+                result = 31 * result + getLogHierarchy().hashCode();
+                return result;
+            }
+        };
+    }
+
+    /**
+     * Log a Port message of the Format:
+     * <pre>PRT-1006 : Delete {0} Port "{1}"</pre>
+     * Optional values are contained in [square brackets] and are numbered
+     * sequentially in the method call.
+     *
+     */
+    public static LogMessage DELETE(String param1, String param2)
+    {
+        String rawMessage = _messages.getString("DELETE");
+
+        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()
+        {
+            public String toString()
+            {
+                return message;
+            }
+
+            public String getLogHierarchy()
+            {
+                return DELETE_LOG_HIERARCHY;
+            }
+
+            @Override
             public boolean equals(final Object o)
             {
                 if (this == o)

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties Wed Jul 15 17:25:30 2015
@@ -18,9 +18,12 @@
 #
 # Default File used for all non-defined locales.
 
-CREATE = PRT-1001 : Create
+CREATE = PRT-1001 : Create "{0}"
 OPEN = PRT-1002 : Open
 CLOSE = PRT-1003 : Close
 # 0 - flow
 CONNECTION_COUNT_WARN = PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}
 CONNECTION_REJECTED = PRT-1005 : Connection from {0} rejected
+
+DELETE = PRT-1006 : Delete {0} Port "{1}"
+

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;
@@ -34,37 +35,35 @@ import java.util.ResourceBundle;
  * 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
+ * This file is based on the content of TrustStore_logmessages.properties
  *
  * To regenerate, edit the templates/properties and run the build with -Dgenerate=true
  */
-public class PortMessages
+public class TrustStoreMessages
 {
     private static ResourceBundle _messages;
     private static Locale _currentLocale = BrokerProperties.getLocale();
 
-    public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
-    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.open";
-    public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.create";
-    public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.close";
-    public static final String CONNECTION_REJECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_rejected";
-    public static final String CONNECTION_COUNT_WARN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.connection_count_warn";
+    public static final String TRUSTSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore";
+    public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.open";
+    public static final String CREATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.create";
+    public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.delete";
+    public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.close";
 
     static
     {
-        LoggerFactory.getLogger(PORT_LOG_HIERARCHY);
+        LoggerFactory.getLogger(TRUSTSTORE_LOG_HIERARCHY);
         LoggerFactory.getLogger(OPEN_LOG_HIERARCHY);
         LoggerFactory.getLogger(CREATE_LOG_HIERARCHY);
+        LoggerFactory.getLogger(DELETE_LOG_HIERARCHY);
         LoggerFactory.getLogger(CLOSE_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_REJECTED_LOG_HIERARCHY);
-        LoggerFactory.getLogger(CONNECTION_COUNT_WARN_LOG_HIERARCHY);
 
-        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.Port_logmessages", _currentLocale);
+        _messages = ResourceBundle.getBundle("org.apache.qpid.server.logging.messages.TrustStore_logmessages", _currentLocale);
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1002 : Open</pre>
+     * Log a TrustStore message of the Format:
+     * <pre>TST-1002 : Open</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
@@ -116,70 +115,22 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1001 : Create</pre>
+     * Log a TrustStore message of the Format:
+     * <pre>TST-1001 : Create "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CREATE()
+    public static LogMessage CREATE(String param1)
     {
         String rawMessage = _messages.getString("CREATE");
 
-        final String message = rawMessage;
-
-        return new LogMessage()
-        {
-            public String toString()
-            {
-                return message;
-            }
-
-            public String getLogHierarchy()
-            {
-                return CREATE_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 Port message of the Format:
-     * <pre>PRT-1003 : Close</pre>
-     * Optional values are contained in [square brackets] and are numbered
-     * sequentially in the method call.
-     *
-     */
-    public static LogMessage CLOSE()
-    {
-        String rawMessage = _messages.getString("CLOSE");
+        final 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 = rawMessage;
+        final String message = formatter.format(messageArguments);
 
         return new LogMessage()
         {
@@ -190,7 +141,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CLOSE_LOG_HIERARCHY;
+                return CREATE_LOG_HIERARCHY;
             }
 
             @Override
@@ -222,15 +173,15 @@ public class PortMessages
     }
 
     /**
-     * Log a Port message of the Format:
-     * <pre>PRT-1005 : Connection from {0} rejected</pre>
+     * Log a TrustStore message of the Format:
+     * <pre>TST-1004 : Delete "{0}"</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CONNECTION_REJECTED(String param1)
+    public static LogMessage DELETE(String param1)
     {
-        String rawMessage = _messages.getString("CONNECTION_REJECTED");
+        String rawMessage = _messages.getString("DELETE");
 
         final Object[] messageArguments = {param1};
         // Create a new MessageFormat to ensure thread safety.
@@ -248,7 +199,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_REJECTED_LOG_HIERARCHY;
+                return DELETE_LOG_HIERARCHY;
             }
 
             @Override
@@ -280,22 +231,17 @@ 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>
+     * Log a TrustStore message of the Format:
+     * <pre>TST-1003 : Close</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage CONNECTION_COUNT_WARN(Number param1, Number param2, Number param3)
+    public static LogMessage CLOSE()
     {
-        String rawMessage = _messages.getString("CONNECTION_COUNT_WARN");
-
-        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()
         {
@@ -306,7 +252,7 @@ public class PortMessages
 
             public String getLogHierarchy()
             {
-                return CONNECTION_COUNT_WARN_LOG_HIERARCHY;
+                return CLOSE_LOG_HIERARCHY;
             }
 
             @Override
@@ -338,7 +284,7 @@ public class PortMessages
     }
 
 
-    private PortMessages()
+    private TrustStoreMessages()
     {
     }
 

Copied: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties (from r1691202, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties)
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties&r1=1691202&r2=1691250&rev=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Port_logmessages.properties (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStore_logmessages.properties Wed Jul 15 17:25:30 2015
@@ -18,9 +18,8 @@
 #
 # Default File used for all non-defined locales.
 
-CREATE = PRT-1001 : Create
-OPEN = PRT-1002 : Open
-CLOSE = PRT-1003 : Close
-# 0 - flow
-CONNECTION_COUNT_WARN = PRT-1004 : Connection count {0,number} within {1, number} % of maximum {2,number}
-CONNECTION_REJECTED = PRT-1005 : Connection from {0} rejected
+CREATE = TST-1001 : Create "{0}"
+OPEN = TST-1002 : Open
+CLOSE = TST-1003 : Close
+DELETE = TST-1004 : Delete "{0}"
+

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java Wed Jul 15 17:25:30 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging.m
 
 import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
 
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.logging.LogMessage;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Wed Jul 15 17:25:30 2015
@@ -30,6 +30,8 @@ import java.util.Set;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.PortMessages;
 import org.apache.qpid.server.model.IntegrityViolationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +55,7 @@ abstract public class AbstractPort<X ext
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPort.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private int _port;
@@ -71,7 +74,6 @@ abstract public class AbstractPort<X ext
 
     @ManagedAttributeField
     private Collection<String> _enabledCipherSuites;
-
     @ManagedAttributeField
     private Collection<String> _disabledCipherSuites;
 
@@ -81,7 +83,8 @@ abstract public class AbstractPort<X ext
         super(parentsMap(broker), attributes);
 
         _broker = broker;
-
+        _eventLogger = broker.getEventLogger();
+        _eventLogger.message(PortMessages.CREATE(getName()));
     }
 
     @Override
@@ -243,7 +246,7 @@ abstract public class AbstractPort<X ext
             {
                 setState(State.DELETED);
                 returnVal.set(null);
-
+                _eventLogger.message(PortMessages.DELETE(getType(), getName()));
             }
         }, getTaskExecutor().getExecutor());
         return returnVal;

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/AutoGeneratedSelfSignedKeyStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -56,6 +56,8 @@ import com.google.common.util.concurrent
 import com.google.common.util.concurrent.ListenableFuture;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.KeyStoreMessages;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.IntegrityViolationException;
@@ -90,6 +92,7 @@ public class AutoGeneratedSelfSignedKeyS
     private static Method EXTENSION_GET_NAME_METHOD;
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private String _keyAlgorithm;
@@ -114,6 +117,8 @@ public class AutoGeneratedSelfSignedKeyS
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(KeyStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -261,6 +266,7 @@ public class AutoGeneratedSelfSignedKeyS
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(KeyStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -41,6 +41,8 @@ import com.google.common.util.concurrent
 import com.google.common.util.concurrent.ListenableFuture;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.KeyStoreMessages;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.ConfiguredObject;
@@ -60,6 +62,8 @@ import org.apache.qpid.transport.network
 @ManagedObject( category = false )
 public class FileKeyStoreImpl extends AbstractConfiguredObject<FileKeyStoreImpl> implements FileKeyStore<FileKeyStoreImpl>
 {
+    private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private String _type;
@@ -72,12 +76,10 @@ public class FileKeyStoreImpl extends Ab
     @ManagedAttributeField(afterSet = "postSetStoreUrl")
     private String _storeUrl;
     private String _path;
+
     @ManagedAttributeField
     private String _password;
 
-
-    private final Broker<?> _broker;
-
     static
     {
         Handler.register();
@@ -89,6 +91,8 @@ public class FileKeyStoreImpl extends Ab
         super(parentsMap(broker), attributes);
 
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(KeyStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -114,6 +118,7 @@ public class FileKeyStoreImpl extends Ab
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(KeyStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileTrustStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -44,6 +44,8 @@ import com.google.common.util.concurrent
 import com.google.common.util.concurrent.ListenableFuture;
 
 import org.apache.qpid.server.configuration.IllegalConfigurationException;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.TrustStoreMessages;
 import org.apache.qpid.server.model.AbstractConfiguredObject;
 import org.apache.qpid.server.model.AuthenticationProvider;
 import org.apache.qpid.server.model.Broker;
@@ -64,6 +66,8 @@ import org.apache.qpid.transport.network
 
 public class FileTrustStoreImpl extends AbstractConfiguredObject<FileTrustStoreImpl> implements FileTrustStore<FileTrustStoreImpl>
 {
+    private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private String _trustStoreType;
@@ -84,8 +88,6 @@ public class FileTrustStoreImpl extends
     @ManagedAttributeField
     private List<VirtualHost> _excludedVirtualHostMessageSources;
 
-    private final Broker<?> _broker;
-
     static
     {
         Handler.register();
@@ -96,6 +98,8 @@ public class FileTrustStoreImpl extends
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(TrustStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -151,6 +155,7 @@ public class FileTrustStoreImpl extends
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(TrustStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustsStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustsStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustsStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustsStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -38,6 +38,8 @@ import javax.net.ssl.X509TrustManager;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.TrustStoreMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -66,6 +68,7 @@ public class ManagedPeerCertificateTrust
     private static final Logger LOGGER = LoggerFactory.getLogger(ManagedPeerCertificateTrustsStoreImpl.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private boolean _exposedAsMessageSource;
@@ -84,6 +87,8 @@ public class ManagedPeerCertificateTrust
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(TrustStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -142,6 +147,7 @@ public class ManagedPeerCertificateTrust
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(TrustStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -45,6 +45,8 @@ import javax.net.ssl.KeyManagerFactory;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.KeyStoreMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,6 +70,7 @@ public class NonJavaKeyStoreImpl extends
     private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaKeyStoreImpl.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField( afterSet = "updateKeyManagers" )
     private String _privateKeyUrl;
@@ -92,6 +95,8 @@ public class NonJavaKeyStoreImpl extends
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(KeyStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -190,6 +195,7 @@ public class NonJavaKeyStoreImpl extends
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(KeyStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaTrustStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -43,6 +43,8 @@ import javax.security.auth.x500.X500Prin
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.TrustStoreMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,6 +73,7 @@ public class NonJavaTrustStoreImpl
     private static final Logger LOGGER = LoggerFactory.getLogger(NonJavaTrustStoreImpl.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField( afterSet = "updateTrustManagers" )
     private String _certificatesUrl;
@@ -97,6 +100,8 @@ public class NonJavaTrustStoreImpl
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(TrustStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -233,6 +238,7 @@ public class NonJavaTrustStoreImpl
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(TrustStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/SiteSpecificTrustStoreImpl.java Wed Jul 15 17:25:30 2015
@@ -46,6 +46,8 @@ import javax.xml.bind.DatatypeConverter;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.TrustStoreMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -72,6 +74,7 @@ public class SiteSpecificTrustStoreImpl
     private static final Logger LOGGER = LoggerFactory.getLogger(SiteSpecificTrustStoreImpl.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
 
     @ManagedAttributeField
     private String _siteUrl;
@@ -92,6 +95,8 @@ public class SiteSpecificTrustStoreImpl
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(TrustStoreMessages.CREATE(getName()));
     }
 
     @Override
@@ -179,6 +184,7 @@ public class SiteSpecificTrustStoreImpl
         }
         deleted();
         setState(State.DELETED);
+        _eventLogger.message(TrustStoreMessages.DELETE(getName()));
         return Futures.immediateFuture(null);
     }
 

Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1691250&r1=1691249&r2=1691250&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java Wed Jul 15 17:25:30 2015
@@ -30,6 +30,8 @@ import java.util.Set;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
+import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.logging.messages.AuthenticationProviderMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,6 +58,7 @@ public abstract class AbstractAuthentica
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractAuthenticationManager.class);
 
     private final Broker<?> _broker;
+    private final EventLogger _eventLogger;
     private PreferencesProvider<?> _preferencesProvider;
 
     @ManagedAttributeField
@@ -69,6 +72,8 @@ public abstract class AbstractAuthentica
     {
         super(parentsMap(broker), attributes);
         _broker = broker;
+        _eventLogger = _broker.getEventLogger();
+        _eventLogger.message(AuthenticationProviderMessages.CREATE(getName()));
     }
 
     @Override
@@ -233,6 +238,7 @@ public abstract class AbstractAuthentica
                             finally
                             {
                                 returnVal.set(null);
+                                _eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
                             }
                         }
                     }, getTaskExecutor().getExecutor());
@@ -248,6 +254,7 @@ public abstract class AbstractAuthentica
                     finally
                     {
                         returnVal.set(null);
+                        _eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
                     }
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message