QPID-6356: Add port transport into operational log message for starting managegement plugins

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

3 files changed, 9 insertions, 7 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 9ac0a2fe73..6c27b51ce0 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
@@ -100,16 +100,16 @@ public class ManagementConsoleMessages
 
     /**
      * Log a ManagementConsole message of the Format:
-     * <pre>MNG-1002 : Starting : {0} : Listening on port {1,number,#}</pre>
+     * <pre>MNG-1002 : Starting : {0} : Listening on {1} port {2,number,#}</pre>
      * Optional values are contained in [square brackets] and are numbered
      * sequentially in the method call.
      *
      */
-    public static LogMessage LISTENING(String param1, Number param2)
+    public static LogMessage LISTENING(String param1, String param2, Number param3)
     {
         String rawMessage = _messages.getString("LISTENING");
 
-        final Object[] messageArguments = {param1, param2};
+        final Object[] messageArguments = {param1, param2, param3};
         // Create a new MessageFormat to ensure thread safety.
         // Sharing a MessageFormat and using applyPattern is not thread safe
         MessageFormat formatter = new MessageFormat(rawMessage, _currentLocale);
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 b6f1dbaa38..bb4dce7d36 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
@@ -22,7 +22,7 @@
 STARTUP = MNG-1001 : {0} Management Startup
 # 0 - Service
 # 1 - Port
-LISTENING = MNG-1002 : Starting : {0} : Listening on port {1,number,#}
+LISTENING = MNG-1002 : Starting : {0} : Listening on {1} port {2,number,#}
 # 0 - Service
 # 1 - Port
 SHUTTING_DOWN = MNG-1003 : Shutting down : {0} : port {1,number,#}
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 e72cb2806b..4b4fbb2db6 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
@@ -22,6 +22,8 @@ package org.apache.qpid.server.logging.messages;
 
 import java.util.List;
 
+import org.apache.qpid.server.model.Transport;
+
 /**
  * Test MNG Log Messages
  */
@@ -39,13 +41,13 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
 
     public void testManagementListening()
     {
-        String transport = "JMX";
+        String management = "JMX";
         Integer port = 8889;
 
-        _logMessage = ManagementConsoleMessages.LISTENING(transport, port);
+        _logMessage = ManagementConsoleMessages.LISTENING(management, Transport.TCP.name(), port);
         List<Object> log = performLog();
 
-        String[] expected = {"Starting :", transport, ": Listening on port", String.valueOf(port)};
+        String[] expected = {"Starting :", management, ": Listening on ", Transport.TCP.name(), " port", String.valueOf(port)};
 
         validateLogMessage(log, "MNG-1002", expected);
     }