QPID-6356: Remove operational log 'MNG-1006 : Using SSL Keystore : {0}'

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1656805 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 0 insertions, 98 deletions

diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
index 16a115d1ae..9ac0a2fe73 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
@@ -46,7 +46,6 @@ public class ManagementConsoleMessages
     public static final String MANAGEMENTCONSOLE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole";
     public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open";
     public static final String LISTENING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.listening";
-    public static final String SSL_KEYSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.ssl_keystore";
     public static final String STOPPED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.stopped";
     public static final String CLOSE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.close";
     public static final String SHUTTING_DOWN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.shutting_down";
@@ -58,7 +57,6 @@ public class ManagementConsoleMessages
         Logger.getLogger(MANAGEMENTCONSOLE_LOG_HIERARCHY);
         Logger.getLogger(OPEN_LOG_HIERARCHY);
         Logger.getLogger(LISTENING_LOG_HIERARCHY);
-        Logger.getLogger(SSL_KEYSTORE_LOG_HIERARCHY);
         Logger.getLogger(STOPPED_LOG_HIERARCHY);
         Logger.getLogger(CLOSE_LOG_HIERARCHY);
         Logger.getLogger(SHUTTING_DOWN_LOG_HIERARCHY);
@@ -134,38 +132,6 @@ public class ManagementConsoleMessages
 
     /**
      * Log a ManagementConsole message of the Format:
-     * <pre>MNG-1006 : Using SSL Keystore : {0}</pre>
-     * Optional values are contained in [square brackets] and are numbered
-     * sequentially in the method call.
-     *
-     */
-    public static LogMessage SSL_KEYSTORE(String param1)
-    {
-        String rawMessage = _messages.getString("SSL_KEYSTORE");
-
-        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 SSL_KEYSTORE_LOG_HIERARCHY;
-            }
-        };
-    }
-
-    /**
-     * Log a ManagementConsole message of the Format:
      * <pre>MNG-1005 : {0} Management Stopped</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
index 7924be28d3..b6f1dbaa38 100644
--- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
+++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
@@ -30,8 +30,6 @@ SHUTTING_DOWN = MNG-1003 : Shutting down : {0} : port {1,number,#}
 READY = MNG-1004 : {0} Management Ready
 # 0 - Management Type
 STOPPED = MNG-1005 : {0} Management Stopped
-# 0 - Path
-SSL_KEYSTORE = MNG-1006 : Using SSL Keystore : {0}
 # 0 - Username
 OPEN = MNG-1007 : Open : User {0}
 # 0 - Username
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index dfc9357402..e72cb2806b 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
@@ -83,16 +83,5 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         validateLogMessage(log, "MNG-1005", expected);
     }
 
-    public void testManagementSSLKeyStore()
-    {
-        String path = "/path/to/the/keystore/files.jks";
-
-        _logMessage = ManagementConsoleMessages.SSL_KEYSTORE(path);
-        List<Object> log = performLog();
-
-        String[] expected = {"Using SSL Keystore :", path};
-
-        validateLogMessage(log, "MNG-1006", expected);
-    }
 
 }
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
index 75f4e59242..f62d8416bf 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
+++ b/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java
@@ -455,14 +455,6 @@ public class HttpManagement extends AbstractPluginAdapter<HttpManagement> implem
         {
             getBroker().getEventLogger().message(ManagementConsoleMessages.LISTENING(stringifyConnectorScheme(connector),
                                                                                      connector.getPort()));
-            if (connector instanceof SslSocketConnector)
-            {
-                SslContextFactory sslContextFactory = ((SslSocketConnector)connector).getSslContextFactory();
-                if (sslContextFactory != null && sslContextFactory.getKeyStorePath() != null)
-                {
-                    getBroker().getEventLogger().message(ManagementConsoleMessages.SSL_KEYSTORE(sslContextFactory.getKeyStorePath()));
-                }
-            }
         }
     }
 
diff --git a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
index 8fc1ea1d8e..1711968b8f 100644
--- a/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
+++ b/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
@@ -142,8 +142,6 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
                 throw new ServerScopedRuntimeException("Unable to create SSLContext for key store", e);
             }
 
-            getEventLogger().message(ManagementConsoleMessages.SSL_KEYSTORE(keyStore.getName()));
-
             //create the SSL RMI socket factories
             csf = new SslRMIClientSocketFactory();
             ssf = new QpidSslRMIServerSocketFactory(sslContext,_connectorPort.getEnabledCipherSuites(), _connectorPort.getDisabledCipherSuites());
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
index 4df81845d8..a5a167f633 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
@@ -211,47 +211,6 @@ public class ManagementLoggingTest extends AbstractTestLogging
     }
 
     /**
-     * Description:
-     * Using the default configuration with SSL enabled for the management port the SSL Keystore path should be reported via MNG-1006
-     * Input:
-     * Management SSL enabled default configuration.
-     * Output:
-     *
-     * <date> MESSAGE MNG-1006 : Using SSL Keystore : test_resources/ssl/keystore.jks
-     *
-     * Validation Steps:
-     *
-     * 1. The MNG ID is correct
-     * 2. The keystore path is as specified in the configuration
-     */
-    public void testManagementStartupSSLKeystore() throws Exception
-    {
-        if (isJavaBroker())
-        {
-            setSystemProperty("javax.net.debug", "ssl");
-            startBrokerAndCreateMonitor(true, true);
-
-            List<String> results = waitAndFindMatches("MNG-1006");
-
-            assertTrue("MNGer message not logged", results.size() > 0);
-
-            String log = getLogMessage(results, 0);
-
-            //1
-            validateMessageID("MNG-1006", log);
-
-            // Validate we only have two MNG-1002 (one via stdout, one via log4j)
-            results = findMatches("MNG-1006");
-            assertEquals("Upexpected SSL Keystore message count",
-                         1, results.size());
-
-            // Validate the keystore path is as expected
-            assertTrue("SSL Keystore entry expected.:" + getMessageString(log),
-                       getMessageString(log).endsWith("systestsKeyStore"));
-        }
-    }
-
-    /**
      * Description: Tests the management connection open/close are logged correctly.
      *
      * Output: