QPID-2843: move the text to the properties file to allow for il8n

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

3 files changed, 6 insertions, 6 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties b/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
index 9bdfe41f0f..ab77476da2 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
+++ b/qpid/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[ : {0}]
+READY = MNG-1004 : Ready[ : Using the platform JMX Agent]
 STOPPED = MNG-1005 : Stopped
 # 0 - Path
 SSL_KEYSTORE = MNG-1006 : Using SSL Keystore : {0}
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
index 9f09afa1de..03e1d1fcaa 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
+++ b/qpid/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())
         {
-            CurrentActor.get().message(ManagementConsoleMessages.READY("Using the platform JMX Agent", true));
+            CurrentActor.get().message(ManagementConsoleMessages.READY(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("", false));
+        CurrentActor.get().message(ManagementConsoleMessages.READY(false));
     }
 
     /*
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
index d7bec7a503..4bfbae44ac 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
@@ -65,7 +65,7 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
 
     public void testManagementReady()
     {
-        _logMessage = ManagementConsoleMessages.READY("",false);
+        _logMessage = ManagementConsoleMessages.READY(false);
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
@@ -74,10 +74,10 @@ public class ManagementConsoleMessagesTest extends AbstractTestMessages
         
         _logger.clearLogMessages();
         
-        _logMessage = ManagementConsoleMessages.READY("Info",true);
+        _logMessage = ManagementConsoleMessages.READY(true);
         log = performLog();
 
-        expected = new String[]{"Ready : Info"};
+        expected = new String[]{"Ready : Using the platform JMX Agent"};
 
         validateLogMessage(log, "MNG-1004", expected);
     }