You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/09/06 12:06:06 UTC
svn commit: r992988 - in /qpid/trunk/qpid/java/broker/src:
main/java/org/apache/qpid/server/logging/messages/
main/java/org/apache/qpid/server/management/
test/java/org/apache/qpid/server/logging/messages/
Author: robbie
Date: Mon Sep 6 10:06:06 2010
New Revision: 992988
URL: http://svn.apache.org/viewvc?rev=992988&view=rev
Log:
QPID-2843: move the text to the properties file to allow for il8n
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties?rev=992988&r1=992987&r2=992988&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsole_logmessages.properties Mon Sep 6 10:06:06 2010
@@ -25,7 +25,7 @@ LISTENING = MNG-1002 : Starting : {0} :
# 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}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java?rev=992988&r1=992987&r2=992988&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java Mon Sep 6 10:06:06 2010
@@ -106,7 +106,7 @@ public class JMXManagedObjectRegistry im
//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 im
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));
}
/*
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=992988&r1=992987&r2=992988&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java Mon Sep 6 10:06:06 2010
@@ -65,7 +65,7 @@ public class ManagementConsoleMessagesTe
public void testManagementReady()
{
- _logMessage = ManagementConsoleMessages.READY("",false);
+ _logMessage = ManagementConsoleMessages.READY(false);
List<Object> log = performLog();
String[] expected = {"Ready"};
@@ -74,10 +74,10 @@ public class ManagementConsoleMessagesTe
_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);
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org