QPID-2843: Ensure that a MNG-1004 message is logged when using the platform agent (and indicates use of the platform agent), merge the BRK-1004 message text with the previously used stdout startup log message.

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

4 files changed, 14 insertions, 5 deletions

diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
index 3782026bad..6b83a7e7a5 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Broker_logmessages.properties
@@ -27,7 +27,7 @@ LISTENING = BRK-1002 : Starting : Listening on {0} port {1,number,#}
 # 0 - Transport
 # 1 - Port
 SHUTTING_DOWN = BRK-1003 : Shuting down : {0} port {1,number,#}
-READY = BRK-1004 : Ready
+READY = BRK-1004 : Qpid Broker Ready
 STOPPED = BRK-1005 : Stopped
 # 0 - path
 CONFIG = BRK-1006 : Using configuration : {0}
diff --git a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
index 722b02d935..9bdfe41f0f 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
+++ b/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
@@ -25,7 +25,7 @@ LISTENING = MNG-1002 : Starting : {0} : Listening on port {1,number,#}
 # 0 - Service
 # 1 - Port
 SHUTTING_DOWN = MNG-1003 : Shutting down : {0} : port {1,number,#}
-READY = MNG-1004 : Ready
+READY = MNG-1004 : Ready[ : {0}]
 STOPPED = MNG-1005 : Stopped
 # 0 - Path
 SSL_KEYSTORE = MNG-1006 : Using SSL Keystore : {0}
diff --git a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index a33f61ce8c..9f09afa1de 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
@@ -106,7 +106,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         //check if system properties are set to use the JVM's out-of-the-box JMXAgent
         if (areOutOfTheBoxJMXOptionsSet())
         {
-            _log.warn("JMX: Using the out of the box JMX Agent");
+            CurrentActor.get().message(ManagementConsoleMessages.READY("Using the platform JMX Agent", true));
             return;
         }
 
@@ -314,7 +314,7 @@ public class JMXManagedObjectRegistry implements ManagedObjectRegistry
         String connectorServer = (sslEnabled ? "SSL " : "") + "JMX RMIConnectorServer";
         CurrentActor.get().message(ManagementConsoleMessages.LISTENING(connectorServer, port + PORT_EXPORT_OFFSET));
 
-        CurrentActor.get().message(ManagementConsoleMessages.READY());
+        CurrentActor.get().message(ManagementConsoleMessages.READY("", false));
     }
 
     /*
diff --git a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index cbdc842464..d7bec7a503 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
@@ -65,12 +65,21 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
 
     public void testManagementReady()
     {
-        _logMessage = ManagementConsoleMessages.READY();
+        _logMessage = ManagementConsoleMessages.READY("",false);
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
 
         validateLogMessage(log, "MNG-1004", expected);
+        
+        _logger.clearLogMessages();
+        
+        _logMessage = ManagementConsoleMessages.READY("Info",true);
+        log = performLog();
+
+        expected = new String[]{"Ready : Info"};
+
+        validateLogMessage(log, "MNG-1004", expected);
     }
 
     public void testManagementStopped()