qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r886722 - in /qpid/branches/0.5.x-dev/qpid/java: broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/exchange/ broker/src/main/java/org/apache/qpid/server/logging/messages/ broker/src/main/java/org/apach...
Date Thu, 03 Dec 2009 09:43:53 GMT
Author: ritchiem
Date: Thu Dec  3 09:43:37 2009
New Revision: 886722

URL: http://svn.apache.org/viewvc?rev=886722&view=rev
Log:
QPID-2001 : Converted Log Messages from XXX-<Number> toa more meaningfull XXX-<Name>. This makes the code more readable and does not affect the log message output. Removed the en_US properties as a) it is not required b) the two english files were not being kept in sync.

Removed:
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages_en_US.properties
Modified:
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBinding.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
    qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
    qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java Thu Dec  3 09:43:37 2009
@@ -41,7 +41,6 @@
 import org.apache.qpid.server.flow.FlowCreditManager;
 import org.apache.qpid.server.flow.Pre0_10CreditManager;
 import org.apache.qpid.server.protocol.AMQProtocolSession;
-import org.apache.qpid.server.protocol.AMQMinaProtocolSession;
 import org.apache.qpid.server.queue.*;
 import org.apache.qpid.server.subscription.Subscription;
 import org.apache.qpid.server.subscription.SubscriptionFactoryImpl;
@@ -54,7 +53,6 @@
 import org.apache.qpid.server.txn.TransactionalContext;
 import org.apache.qpid.server.logging.LogActor;
 import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.LogMessage;
 import org.apache.qpid.server.logging.messages.ChannelMessages;
 import org.apache.qpid.server.logging.subjects.ChannelLogSubject;
 import org.apache.qpid.server.logging.actors.AMQPChannelActor;
@@ -132,7 +130,7 @@
         _actor = new AMQPChannelActor(this, session.getLogActor().getRootMessageLogger());
         _logSubject = new ChannelLogSubject(this);
         
-        _actor.message(ChannelMessages.CHN_1001());
+        _actor.message(ChannelMessages.CHN_CREATE());
 
         _storeContext = new StoreContext("Session: " + session.getClientIdentifier() + "; channel: " + channelId);
 
@@ -388,7 +386,7 @@
     {
         _closing = closing;
 
-        CurrentActor.get().message(_logSubject, ChannelMessages.CHN_1003());
+        CurrentActor.get().message(_logSubject, ChannelMessages.CHN_CLOSE());
     }
 
     private void unsubscribeAllConsumers() throws AMQException
@@ -796,7 +794,7 @@
             // Log Flow Started before we start the subscriptions
             if (!suspended)
             {
-                _actor.message(_logSubject, ChannelMessages.CHN_1002("Started"));
+                _actor.message(_logSubject, ChannelMessages.CHN_FLOW("Started"));
             }
 
 
@@ -847,7 +845,7 @@
             // stopped.
             if (suspended)
             {
-                _actor.message(_logSubject, ChannelMessages.CHN_1002("Stopped"));
+                _actor.message(_logSubject, ChannelMessages.CHN_FLOW("Stopped"));
             }
 
         }
@@ -933,7 +931,7 @@
 
     public void setCredit(final long prefetchSize, final int prefetchCount)
     {
-        _actor.message(ChannelMessages.CHN_1004(prefetchSize, prefetchCount));
+        _actor.message(ChannelMessages.CHN_PREFETCH_SIZE(prefetchSize, prefetchCount));
         _creditManager.setCreditLimits(prefetchSize, prefetchCount);
     }
 
@@ -988,7 +986,7 @@
 
             if(_blocking.compareAndSet(false,true))
             {
-                _actor.message(_logSubject, ChannelMessages.CHN_1005(queue.getName().toString()));
+                _actor.message(_logSubject, ChannelMessages.CHN_FLOW_ENFORCED(queue.getName().toString()));
                 flow(false);
             }
         }
@@ -1000,7 +998,7 @@
         {
             if(_blocking.compareAndSet(true,false))
             {
-                _actor.message(_logSubject, ChannelMessages.CHN_1006());
+                _actor.message(_logSubject, ChannelMessages.CHN_FLOW_REMOVED());
 
                 flow(true);
             }

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java Thu Dec  3 09:43:37 2009
@@ -240,7 +240,7 @@
         }
         else
         {
-            CurrentActor.get().message(BrokerMessages.BRK_1006(configFile.getAbsolutePath()));
+            CurrentActor.get().message(BrokerMessages.BRK_CONFIG(configFile.getAbsolutePath()));
         }
 
         String logConfig = commandLine.getOptionValue("l");
@@ -436,7 +436,7 @@
             _brokerLogger.info("Qpid Broker Ready :" + QpidProperties.getReleaseVersion()
                                + " build: " + QpidProperties.getBuildVersion());
 
-            CurrentActor.get().message(BrokerMessages.BRK_1004());
+            CurrentActor.get().message(BrokerMessages.BRK_READY());
 
         }
         catch (Exception e)
@@ -461,7 +461,7 @@
     {
         acceptor.getIoAcceptor().bind(bindAddress, handler, sconfig);
 
-        CurrentActor.get().message(BrokerMessages.BRK_1002(acceptor.toString(), bindAddress.getPort()));
+        CurrentActor.get().message(BrokerMessages.BRK_LISTENING(acceptor.toString(), bindAddress.getPort()));
 
         ApplicationRegistry.getInstance().addAcceptor(bindAddress, acceptor);
     }
@@ -515,7 +515,7 @@
     {
         if (logConfigFile.exists() && logConfigFile.canRead())
         {
-            CurrentActor.get().message(BrokerMessages.BRK_1007(logConfigFile.getAbsolutePath()));            
+            CurrentActor.get().message(BrokerMessages.BRK_LOG_CONFIG(logConfigFile.getAbsolutePath()));
             System.out.println("Configuring logger using configuration file " + logConfigFile.getAbsolutePath());
             if (logWatchTime > 0)
             {

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Thu Dec  3 09:43:37 2009
@@ -170,7 +170,7 @@
         _logSubject = new ExchangeLogSubject(this, this.getVirtualHost());
 
         // Log Exchange creation
-        CurrentActor.get().message(ExchangeMessages.EXH_1001(String.valueOf(getType()), String.valueOf(name), durable));
+        CurrentActor.get().message(ExchangeMessages.EXH_CREATED(String.valueOf(getType()), String.valueOf(name), durable));
     }
 
     public boolean isDurable()
@@ -195,7 +195,7 @@
             _exchangeMbean.unregister();
         }
 
-        CurrentActor.get().message(_logSubject, ExchangeMessages.EXH_1002());
+        CurrentActor.get().message(_logSubject, ExchangeMessages.EXH_DELETED());
     }    
 
     public String toString()

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/LogMessages.properties Thu Dec  3 09:43:37 2009
@@ -20,88 +20,91 @@
 #Broker
 # 0 - Version
 # 1 = Build
-BRK-1001 = Startup : Version: {0} Build: {1}
+BRK_STARTUP = BRK-1001 : Startup : Version: {0} Build: {1}
 # 0 - Transport
 # 1 - Port
-BRK-1002 = Starting : Listening on {0} port {1,number,#}
+BRK_LISTENING = BRK-1002 : Starting : Listening on {0} port {1,number,#}
 # 0 - Transport
 # 1 - Port
-BRK-1003 = Shuting down : {0} port {1,number,#}
-BRK-1004 = Ready
-BRK-1005 = Stopped
+BRK_SHUTTING_DOWN = BRK-1003 : Shuting down : {0} port {1,number,#}
+BRK_READY = BRK-1004 : Ready
+BRK_STOPPED = BRK-1005 : Stopped
 # 0 - path
-BRK-1006 = Using configuration : {0}
+BRK_CONFIG = BRK-1006 : Using configuration : {0}
 # 0 - path
-BRK-1007 = Using logging configuration : {0}
+BRK_LOG_CONFIG = BRK-1007 : Using logging configuration : {0}
 
 #ManagementConsole
-MNG-1001 = Startup
+MNG_STARTUP = MNG-1001 : Startup
 # 0 - Service
 # 1 - Port
-MNG-1002 = Starting : {0} : Listening on port {1,number,#}
+MNG_LISTENING = MNG-1002 : Starting : {0} : Listening on port {1,number,#}
 # 0 - Service
 # 1 - Port
-MNG-1003 = Shuting down : {0} : port {1,number,#}
-MNG-1004 = Ready
-MNG-1005 = Stopped
+MNG_SHUTTING_DOWN = MNG-1003 : Shuting down : {0} : port {1,number,#}
+MNG_READY = MNG-1004 : Ready
+MNG_STOPPED = MNG-1005 : Stopped
 # 0 - Path
-MNG-1006 = Using SSL Keystore : {0}
-MNG-1007 = Open : User {0}
-MNG-1008 = Close
+MNG_SSL_KEYSTORE = MNG-1006 : Using SSL Keystore : {0}
+MNG_OPEN = MNG-1007 : Open : User {0}
+MNG_CLOSE = MNG-1008 : Close
 
 
 #VirtualHost
 # 0 - name
-VHT-1001 = Created : {0}
-VHT-1002 = Closed
+VHT_CREATED = VHT-1001 : Created : {0}
+VHT_CLOSED = VHT-1002 : Closed
 
 #MessageStore
 # 0 - name
-MST-1001 = Created : {0}
+MST_CREATED = MST-1001 : Created : {0}
 # 0 - path
-MST-1002 = Store location : {0}
-MST-1003 = Closed
+MST_STORE_LOCATION = MST-1002 : Store location : {0}
+MST_CLOSED = MST-1003 : Closed
 # 0 - queue name
-MST-1004 = Recovery Start[ : {0}]
+MST_RECOVERY_START = MST-1004 : Recovery Start[ : {0}]
 # 0 - count
 # 1 - queue count
-MST-1005 = Recovered {0,number} messages for queue {1}
+MST_RECOVERED = MST-1005 : Recovered {0,number} messages for queue {1}
 # 0 - queue name
-MST-1006 = Recovery Complete[ : {0}]
+MST_RECOVERY_COMPLETE = MST-1006 : Recovery Complete[ : {0}]
 
 #Connection
 # 0 - Client id
 # 1 - Protocol Version
-CON-1001 = Open[ : Client ID : {0}][ : Protocol Version : {1}]
-CON-1002 = Close
+CON_OPEN = CON-1001 : Open[ : Client ID : {0}][ : Protocol Version : {1}]
+CON_CLOSE = CON-1002 : Close
 
 #Channel
-CHN-1001 = Create
+CHN_CREATE = CHN-1001 : Create
 # 0 - flow
-CHN-1002 = Flow {0}
-CHN-1003 = Close
+CHN_FLOW = CHN-1002 : Flow {0}
+CHN_CLOSE = CHN-1003 : Close
 # 0 - bytes allowed in prefetch
 # 1 - number of messagse.
-CHN-1004 = Prefetch Size (bytes) {0,number} : Count {1,number}
+CHN_PREFETCH_SIZE = CHN-1004 : Prefetch Size (bytes) {0,number} : Count {1,number}
+CHN_FLOW_ENFORCED = CHN-1005 : Flow Control Enforced (Queue {0})
+CHN_FLOW_REMOVED = CHN-1006 : Flow Control Removed
 
 #Queue
 # 0 - owner
 # 1 - priority
-QUE-1001 = Create :[ Owner: {0}][ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
-QUE-1002 = Deleted
+QUE_CREATED = QUE-1001 : Create :[ Owner: {0}][ AutoDelete][ Durable][ Transient][ Priority: {1,number,#}]
+QUE_DELETED = QUE-1002 : Deleted
+QUE_OVERFULL = QUE-1003 : Overfull : Size : {0,number} bytes, Capacity : {1,number}
+QUE_UNDERFULL = QUE-1004 : Underfull : Size : {0,number} bytes, Resume Capacity : {1,number}
 
 #Exchange
 # 0 - type
 # 1 - name
-EXH-1001 = Create :[ Durable] Type: {0} Name: {1}
-EXH-1002 = Deleted
+EXH_CREATED = EXH-1001 : Create :[ Durable] Type: {0} Name: {1}
+EXH_DELETED = EXH-1002 : Deleted
 
 #Binding
-BND-1001 = Create[ : Arguments : {0}]
-BND-1002 = Deleted
+BND_CREATED = BND-1001 : Create[ : Arguments : {0}]
+BND_DELETED = BND-1002 : Deleted
 
 #Subscription
-SUB-1001 = Create[ : Durable][ : Arguments : {0}]
-SUB-1002 = Close
-# 0 - The current subscription state
-SUB-1003 = State : {0}
\ No newline at end of file
+SUB_CREATE = SUB-1001 : Create[ : Durable][ : Arguments : {0}]
+SUB_CLOSE = SUB-1002 : Close
+SUB_STATE = SUB-1003 : State : {0}

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java Thu Dec  3 09:43:37 2009
@@ -99,7 +99,7 @@
     public void start() throws IOException, ConfigurationException
     {
 
-        CurrentActor.get().message(ManagementConsoleMessages.MNG_1001());
+        CurrentActor.get().message(ManagementConsoleMessages.MNG_STARTUP());
         
         //check if system properties are set to use the JVM's out-of-the-box JMXAgent
         if (areOutOfTheBoxJMXOptionsSet())
@@ -170,7 +170,7 @@
                 _log.info("JMX ConnectorServer using SSL keystore file " + ksf.getAbsolutePath());
                 _startupLog.info("JMX ConnectorServer using SSL keystore file " + ksf.getAbsolutePath());
 
-                CurrentActor.get().message(ManagementConsoleMessages.MNG_1006(ksf.getAbsolutePath()));
+                CurrentActor.get().message(ManagementConsoleMessages.MNG_SSL_KEYSTORE(ksf.getAbsolutePath()));
             }
 
             //check the key store password is set
@@ -198,8 +198,8 @@
             _startupLog.warn("Starting JMX ConnectorServer on port '"+ port + "' (+" + 
                      (port +PORT_EXPORT_OFFSET) + ") with SSL");
 
-            CurrentActor.get().message(ManagementConsoleMessages.MNG_1002("SSL RMI Registry", port));
-            CurrentActor.get().message(ManagementConsoleMessages.MNG_1002("SSL RMI ConnectorServer", port + PORT_EXPORT_OFFSET));
+            CurrentActor.get().message(ManagementConsoleMessages.MNG_LISTENING("SSL RMI Registry", port));
+            CurrentActor.get().message(ManagementConsoleMessages.MNG_LISTENING("SSL RMI ConnectorServer", port + PORT_EXPORT_OFFSET));
 
         }
         else
@@ -210,8 +210,8 @@
 
             _log.warn("Starting JMX ConnectorServer on port '" + port + "' (+" + (port +PORT_EXPORT_OFFSET) + ")");
             _startupLog.warn("Starting JMX ConnectorServer on port '" + port + "' (+" + (port +PORT_EXPORT_OFFSET) + ")");
-            CurrentActor.get().message(ManagementConsoleMessages.MNG_1002("RMI Registry", port));
-            CurrentActor.get().message(ManagementConsoleMessages.MNG_1002("RMI ConnectorServer", port + PORT_EXPORT_OFFSET));
+            CurrentActor.get().message(ManagementConsoleMessages.MNG_LISTENING("RMI Registry", port));
+            CurrentActor.get().message(ManagementConsoleMessages.MNG_LISTENING("RMI ConnectorServer", port + PORT_EXPORT_OFFSET));
         }
 
         //add a JMXAuthenticator implementation the env map to authenticate the RMI based JMX connector server
@@ -291,7 +291,7 @@
         _cs.start();
 
 
-        CurrentActor.get().message(ManagementConsoleMessages.MNG_1004());
+        CurrentActor.get().message(ManagementConsoleMessages.MNG_READY());
     }
 
     /*
@@ -379,8 +379,8 @@
             try
             {
                 _cs.stop();
-                CurrentActor.get().message(ManagementConsoleMessages.MNG_1003("RMI Registry", _cs.getAddress().getPort() - PORT_EXPORT_OFFSET));
-                CurrentActor.get().message(ManagementConsoleMessages.MNG_1003("RMI ConnectorServer", _cs.getAddress().getPort()));
+                CurrentActor.get().message(ManagementConsoleMessages.MNG_SHUTTING_DOWN("RMI Registry", _cs.getAddress().getPort() - PORT_EXPORT_OFFSET));
+                CurrentActor.get().message(ManagementConsoleMessages.MNG_SHUTTING_DOWN("RMI ConnectorServer", _cs.getAddress().getPort()));
             }
             catch (IOException e)
             {
@@ -411,7 +411,7 @@
             }
         }
 
-        CurrentActor.get().message(ManagementConsoleMessages.MNG_1005());        
+        CurrentActor.get().message(ManagementConsoleMessages.MNG_STOPPED());
     }
 
 }

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java Thu Dec  3 09:43:37 2009
@@ -26,8 +26,6 @@
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.actors.ManagementActor;
 import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
-import org.apache.qpid.server.logging.messages.ConnectionMessages;
-import org.apache.qpid.server.logging.LogActor;
 import org.apache.log4j.Logger;
 
 import javax.management.remote.MBeanServerForwarder;
@@ -47,7 +45,6 @@
 import java.security.AccessController;
 import java.security.Principal;
 import java.security.AccessControlContext;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Properties;
@@ -276,12 +273,12 @@
 
         if (notification.getType().equals(JMXConnectionNotification.OPENED))
         {
-            _logActor.message(ManagementConsoleMessages.MNG_1007(user));
+            _logActor.message(ManagementConsoleMessages.MNG_OPEN(user));
         }
         else if (notification.getType().equals(JMXConnectionNotification.CLOSED) ||
                  notification.getType().equals(JMXConnectionNotification.FAILED))
         {
-            _logActor.message(ManagementConsoleMessages.MNG_1008());
+            _logActor.message(ManagementConsoleMessages.MNG_CLOSE());
         }
     }
 }

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java Thu Dec  3 09:43:37 2009
@@ -81,7 +81,6 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicMarkableReference;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 public class AMQMinaProtocolSession implements AMQProtocolSession, Managable
@@ -165,7 +164,7 @@
 
         _actor = new AMQPConnectionActor(this, virtualHostRegistry.getApplicationRegistry().getRootMessageLogger());
 
-        _actor.message(ConnectionMessages.CON_1001(null, null, false, false));
+        _actor.message(ConnectionMessages.CON_OPEN(null, null, false, false));
 
         try
         {
@@ -302,7 +301,7 @@
         try
         {
             // Log incomming protocol negotiation request
-            _actor.message(ConnectionMessages.CON_1001(null, pi._protocolMajor + "-" + pi._protocolMinor, false, true));
+            _actor.message(ConnectionMessages.CON_OPEN(null, pi._protocolMajor + "-" + pi._protocolMinor, false, true));
 
             ProtocolVersion pv = pi.checkVersion(); // Fails if not correct
 
@@ -684,7 +683,7 @@
 
             _closed = true;
 
-            CurrentActor.get().message(_logSubject, ConnectionMessages.CON_1002());
+            CurrentActor.get().message(_logSubject, ConnectionMessages.CON_CLOSE());
         }
         else
         {
@@ -817,7 +816,7 @@
                 setContextKey(new AMQShortString(clientID));
 
                 // Log the Opening of the connection for this client
-                _actor.message(ConnectionMessages.CON_1001(clientID, _protocolVersion.toString(), true, true));
+                _actor.message(ConnectionMessages.CON_OPEN(clientID, _protocolVersion.toString(), true, true));
             }
 
             if (_clientProperties.getString(ClientProperties.version.toString()) != null)

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBinding.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBinding.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBinding.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ExchangeBinding.java Thu Dec  3 09:43:37 2009
@@ -45,7 +45,7 @@
         _arguments = arguments == null ? EMPTY_ARGUMENTS : arguments;
         _logSubject = new BindingLogSubject(routingKey,exchange,queue);
 
-        CurrentActor.get().message(_logSubject, BindingMessages.BND_1001(String.valueOf(_arguments), arguments != null));
+        CurrentActor.get().message(_logSubject, BindingMessages.BND_CREATED(String.valueOf(_arguments), arguments != null));
     }
 
 
@@ -54,7 +54,7 @@
     {
         _exchange.deregisterQueue(_routingKey, queue, _arguments);
 
-        CurrentActor.get().message(_logSubject, BindingMessages.BND_1002());
+        CurrentActor.get().message(_logSubject, BindingMessages.BND_DELETED());
     }
 
     public Exchange getExchange()

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java Thu Dec  3 09:43:37 2009
@@ -179,7 +179,7 @@
         // Log the creation of this Queue.
         // The priorities display is toggled on if we set priorities > 0
         CurrentActor.get().message(_logSubject,
-                                   QueueMessages.QUE_1001(String.valueOf(_owner),
+                                   QueueMessages.QUE_CREATED(String.valueOf(_owner),
                                                           priorities,
                                                           _owner != null,
                                                           autoDelete,
@@ -1167,7 +1167,7 @@
             stop();
             
             //Log Queue Deletion
-            CurrentActor.get().message(_logSubject, QueueMessages.QUE_1002());
+            CurrentActor.get().message(_logSubject, QueueMessages.QUE_DELETED());
 
         }
         return getMessageCount();
@@ -1190,7 +1190,7 @@
             {
                 _overfull.set(true);
                 //Overfull log message
-                _logActor.message(_logSubject, QueueMessages.QUE_1003(_atomicQueueSize.get(), _capacity));
+                _logActor.message(_logSubject, QueueMessages.QUE_OVERFULL(_atomicQueueSize.get(), _capacity));
 
                 if(_blockedChannels.putIfAbsent(channel, Boolean.TRUE)==null)
                 {
@@ -1201,7 +1201,7 @@
                 {
 
                     //Underfull log message
-                    _logActor.message(_logSubject, QueueMessages.QUE_1004(_atomicQueueSize.get(), _flowResumeCapacity));
+                    _logActor.message(_logSubject, QueueMessages.QUE_UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity));
 
                    channel.unblock(this);
                    _blockedChannels.remove(channel);
@@ -1223,7 +1223,7 @@
             {
                 if(_overfull.compareAndSet(true,false))
                 {//Underfull log message
-                    _logActor.message(_logSubject, QueueMessages.QUE_1004(_atomicQueueSize.get(), _flowResumeCapacity));
+                    _logActor.message(_logSubject, QueueMessages.QUE_UNDERFULL(_atomicQueueSize.get(), _flowResumeCapacity));
                 }
 
 

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Thu Dec  3 09:43:37 2009
@@ -248,7 +248,7 @@
 
 //        _pluginManager.close();
 
-        CurrentActor.get().message(BrokerMessages.BRK_1005());        
+        CurrentActor.get().message(BrokerMessages.BRK_STOPPED());
     }
 
     private void unbind()
@@ -259,7 +259,7 @@
             {
                 QpidAcceptor acceptor = _acceptors.get(bindAddress);
                 acceptor.getIoAcceptor().unbind(bindAddress);
-                CurrentActor.get().message(BrokerMessages.BRK_1003(acceptor.toString(), bindAddress.getPort()));
+                CurrentActor.get().message(BrokerMessages.BRK_SHUTTING_DOWN(acceptor.toString(), bindAddress.getPort()));
             }
         }
     }

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java Thu Dec  3 09:43:37 2009
@@ -59,7 +59,7 @@
         // Set the Actor for current log messages
         CurrentActor.set(new BrokerActor(_registryName, _rootMessageLogger));
 
-        CurrentActor.get().message(BrokerMessages.BRK_1001(QpidProperties.getReleaseVersion(),QpidProperties.getBuildVersion()));        
+        CurrentActor.get().message(BrokerMessages.BRK_STARTUP(QpidProperties.getReleaseVersion(),QpidProperties.getBuildVersion()));
 
         initialiseManagedObjectRegistry();
 

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/AbstractMessageStore.java Thu Dec  3 09:43:37 2009
@@ -34,11 +34,11 @@
     public void configure(VirtualHost virtualHost, String base, VirtualHostConfiguration hostConfig) throws Exception
     {
         _logSubject = new MessageStoreLogSubject(virtualHost, this);
-        CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1001(this.getClass().getName()));
+        CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_CREATED(this.getClass().getName()));
     }
     
     public void close() throws Exception
     {
-        CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_1003());
+        CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_CLOSED());
     }
 }

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java Thu Dec  3 09:43:37 2009
@@ -30,10 +30,8 @@
 import org.apache.qpid.framing.abstraction.MessagePublishInfo;
 import org.apache.qpid.server.configuration.VirtualHostConfiguration;
 import org.apache.qpid.server.exchange.Exchange;
-import org.apache.qpid.server.logging.actors.BrokerActor;
 import org.apache.qpid.server.logging.actors.CurrentActor;
 import org.apache.qpid.server.logging.messages.MessageStoreMessages;
-import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject;
 import org.apache.qpid.server.queue.AMQMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.AMQQueueFactory;
@@ -172,7 +170,7 @@
             }
         }
 
-        CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1002(environmentPath.getAbsolutePath()));
+        CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_STORE_LOCATION(environmentPath.getAbsolutePath()));
 
         createOrOpenDatabase(databasePath);
 
@@ -318,7 +316,7 @@
     {
         stateTransition(State.CONFIGURING, State.RECOVERING);
 
-        CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_1004(null, false));
+        CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_RECOVERY_START(null, false));
 
         StoreContext context = new StoreContext();
 
@@ -337,7 +335,7 @@
                 commitTran(context);
 
                 //Recovery Complete
-                CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1006(null, false));
+                CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_RECOVERY_COMPLETE(null, false));
             }
             finally
             {
@@ -382,7 +380,7 @@
             
             queueMap.put(queueNameShortString,q);
             
-            CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_1004(String.valueOf(q.getName()), true));
+            CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_RECOVERY_START(String.valueOf(q.getName()), true));
 
             //Record that we have a queue for recovery
             _queueRecoveries.put(new AMQShortString(queueName), 0);
@@ -1419,7 +1417,7 @@
                     queues.put(queueName, queue);
 
                     //Log Recovery Start
-                    CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1004(String.valueOf(queue.getName()), true));
+                    CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_RECOVERY_START(String.valueOf(queue.getName()), true));
                 }
 
                 long messageId = rs.getLong(2);
@@ -1479,9 +1477,9 @@
 
         for(Map.Entry<AMQShortString,Integer> entry : _queueRecoveries.entrySet())
         {
-            CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1005(entry.getValue(), String.valueOf(entry.getKey())));
+            CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_RECOVERED(entry.getValue(), String.valueOf(entry.getKey())));
 
-            CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1006(String.valueOf(entry.getKey()), true));
+            CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_RECOVERY_COMPLETE(String.valueOf(entry.getKey()), true));
         }
 
         // Free the memory

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java Thu Dec  3 09:43:37 2009
@@ -375,7 +375,7 @@
 
             CurrentActor.get().
                     message(_logSubject,
-                            SubscriptionMessages.SUB_1001(filterLogString,
+                            SubscriptionMessages.SUB_CREATE(filterLogString,
                                                           queue.isDurable() && exclusive,
                                                           filterLogString != null));
         }
@@ -526,7 +526,7 @@
 
 
         //Log Subscription closed
-        CurrentActor.get().message(_logSubject, SubscriptionMessages.SUB_1002());
+        CurrentActor.get().message(_logSubject, SubscriptionMessages.SUB_CLOSE());
     }
 
     public boolean isClosed()
@@ -613,7 +613,7 @@
                 _stateListener.stateChange(this, State.ACTIVE, State.SUSPENDED);
             }
         }
-        CurrentActor.get().message(_logSubject,SubscriptionMessages.SUB_1003(_state.get().toString()));
+        CurrentActor.get().message(_logSubject,SubscriptionMessages.SUB_STATE(_state.get().toString()));
     }
 
     public State getState()

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Thu Dec  3 09:43:37 2009
@@ -20,9 +20,7 @@
  */
 package org.apache.qpid.server.virtualhost;
 
-import org.apache.commons.configuration.Configuration;
 import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.framing.AMQShortString;
@@ -30,7 +28,6 @@
 import org.apache.qpid.framing.abstraction.ContentChunk;
 import org.apache.qpid.server.AMQBrokerManagerMBean;
 import org.apache.qpid.server.logging.actors.CurrentActor;
-import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.logging.messages.VirtualHostMessages;
 import org.apache.qpid.server.configuration.ExchangeConfiguration;
 import org.apache.qpid.server.configuration.QueueConfiguration;
@@ -52,7 +49,6 @@
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.security.access.ACLManager;
 import org.apache.qpid.server.security.access.Accessable;
-import org.apache.qpid.server.security.access.plugins.SimpleXML;
 import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
 import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
 import org.apache.qpid.server.store.MessageStore;
@@ -158,7 +154,7 @@
         _configuration = hostConfig;
         _name = hostConfig.getName();
 
-        CurrentActor.get().message(VirtualHostMessages.VHT_1001(_name));        
+        CurrentActor.get().message(VirtualHostMessages.VHT_CREATED(_name));
 
         if (_name == null || _name.length() == 0)
         {
@@ -445,7 +441,7 @@
             _messageStore.close();
         }
 
-        CurrentActor.get().message(VirtualHostMessages.VHT_1002());
+        CurrentActor.get().message(VirtualHostMessages.VHT_CLOSED());
     }
 
     public ManagedObject getBrokerMBean()

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/LogMessageTest.java Thu Dec  3 09:43:37 2009
@@ -29,9 +29,11 @@
 {
 
     /**
-     * Test that the US local is loadable. 
+     * Test that the US local has a loadable bundle.
+     * No longer have a specific en_US bundle so cannot verify that that version
+     * is loaded.
      */
-    public void testUSLocale()
+    public void testBundle()
     {
         Locale usLocal = Locale.US;
         Locale.setDefault(usLocal);
@@ -39,8 +41,6 @@
                                                             usLocal);
 
         assertNotNull("Unable to load ResourceBundle", _messages);
-
-        assertEquals("Loaded bundle has incorrect locale.", usLocal, _messages.getLocale());
     }
 
     /**

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BindingMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -28,9 +28,9 @@
 public class BindingMessagesTest extends AbstractTestMessages
 {
 
-    public void testMessage1001_NoArgs()
+    public void testBindCreate_NoArgs()
     {
-        _logMessage = BindingMessages.BND_1001(null, false);
+        _logMessage = BindingMessages.BND_CREATED(null, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create"};
@@ -38,11 +38,11 @@
         validateLogMessage(log, "BND-1001", expected);
     }
 
-    public void testMessage1001_Args()
+    public void testBindCreate_Args()
     {
         String arguments = "arguments";
 
-        _logMessage = BindingMessages.BND_1001(arguments, true);
+        _logMessage = BindingMessages.BND_CREATED(arguments, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create", ": Arguments :", arguments};
@@ -50,9 +50,9 @@
         validateLogMessage(log, "BND-1001", expected);
     }
         
-    public void testMessage1002()
+    public void testBindDelete()
     {
-        _logMessage = BindingMessages.BND_1002();
+        _logMessage = BindingMessages.BND_DELETED();
 
         List<Object> log = performLog();
 

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/BrokerMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,12 +27,12 @@
  */
 public class BrokerMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testBrokerStartup()
     {
         String version = "Qpid 0.6";
         String build = "796936M";
 
-        _logMessage = BrokerMessages.BRK_1001(version, build);
+        _logMessage = BrokerMessages.BRK_STARTUP(version, build);
         List<Object> log = performLog();
 
         String[] expected = {"Startup :", "Version:", version, "Build:", build};
@@ -40,12 +40,12 @@
         validateLogMessage(log, "BRK-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testBrokerListening()
     {
         String transport = "TCP";
         Integer port = 2765;
 
-        _logMessage = BrokerMessages.BRK_1002(transport, port);
+        _logMessage = BrokerMessages.BRK_LISTENING(transport, port);
 
         List<Object> log = performLog();
 
@@ -55,12 +55,12 @@
         validateLogMessage(log, "BRK-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testBrokerShuttingDown()
     {
         String transport = "TCP";
         Integer port = 2765;
 
-        _logMessage = BrokerMessages.BRK_1003(transport, port);
+        _logMessage = BrokerMessages.BRK_SHUTTING_DOWN(transport, port);
 
         List<Object> log = performLog();
 
@@ -69,9 +69,9 @@
         validateLogMessage(log, "BRK-1003", expected);
     }
 
-    public void testMessage1004()
+    public void testBrokerReady()
     {
-        _logMessage = BrokerMessages.BRK_1004();
+        _logMessage = BrokerMessages.BRK_READY();
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
@@ -79,9 +79,9 @@
         validateLogMessage(log, "BRK-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testBrokerStopped()
     {
-        _logMessage = BrokerMessages.BRK_1005();
+        _logMessage = BrokerMessages.BRK_STOPPED();
         List<Object> log = performLog();
 
         String[] expected = {"Stopped"};
@@ -89,11 +89,11 @@
         validateLogMessage(log, "BRK-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testBrokerConfig()
     {
         String path = "/file/path/to/configuration.xml";
 
-        _logMessage = BrokerMessages.BRK_1006(path);
+        _logMessage = BrokerMessages.BRK_CONFIG(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using configuration :", path};
@@ -101,11 +101,11 @@
         validateLogMessage(log, "BRK-1006", expected);
     }
 
-    public void testMessage1007()
+    public void testBrokerLogConfig()
     {
         String path = "/file/path/to/configuration.xml";
 
-        _logMessage = BrokerMessages.BRK_1007(path);
+        _logMessage = BrokerMessages.BRK_LOG_CONFIG(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using logging configuration :", path};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ChannelMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,9 +27,9 @@
  */
 public class ChannelMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testChannelCreate()
     {
-        _logMessage = ChannelMessages.CHN_1001();
+        _logMessage = ChannelMessages.CHN_CREATE();
         List<Object> log = performLog();
 
         // We use the MessageFormat here as that is what the ChannelMessage
@@ -39,11 +39,11 @@
         validateLogMessage(log, "CHN-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testChannelFlow()
     {
         String flow = "ON";
 
-        _logMessage = ChannelMessages.CHN_1002(flow);
+        _logMessage = ChannelMessages.CHN_FLOW(flow);
         List<Object> log = performLog();
 
         String[] expected = {"Flow", flow};
@@ -51,9 +51,9 @@
         validateLogMessage(log, "CHN-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testChannelClose()
     {
-        _logMessage = ChannelMessages.CHN_1003();
+        _logMessage = ChannelMessages.CHN_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ConnectionMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,12 +27,12 @@
  */
 public class ConnectionMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001_WithClientIDProtocolVersion()
+    public void testConnectionOpen_WithClientIDProtocolVersion()
     {
         String clientID = "client";
         String protocolVersion = "8-0";
 
-        _logMessage = ConnectionMessages.CON_1001(clientID, protocolVersion, true , true);
+        _logMessage = ConnectionMessages.CON_OPEN(clientID, protocolVersion, true , true);
         List<Object> log = performLog();
 
         String[] expected = {"Open :", "Client ID", clientID,
@@ -41,11 +41,11 @@
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithClientIDNoProtocolVersion()
+    public void testConnectionOpen_WithClientIDNoProtocolVersion()
     {
         String clientID = "client";        
 
-        _logMessage = ConnectionMessages.CON_1001(clientID, null,true, false);
+        _logMessage = ConnectionMessages.CON_OPEN(clientID, null,true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Open :", "Client ID", clientID};
@@ -53,11 +53,11 @@
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithNOClientIDProtocolVersion()
+    public void testConnectionOpen_WithNOClientIDProtocolVersion()
     {
         String protocolVersion = "8-0";
 
-        _logMessage = ConnectionMessages.CON_1001(null, protocolVersion, false , true);
+        _logMessage = ConnectionMessages.CON_OPEN(null, protocolVersion, false , true);
         List<Object> log = performLog();
 
         String[] expected = {"Open", ": Protocol Version :", protocolVersion};
@@ -65,9 +65,9 @@
         validateLogMessage(log, "CON-1001", expected);
     }
 
-    public void testMessage1001_WithNoClientIDNoProtocolVersion()
+    public void testConnectionOpen_WithNoClientIDNoProtocolVersion()
     {
-        _logMessage = ConnectionMessages.CON_1001(null, null,false, false);
+        _logMessage = ConnectionMessages.CON_OPEN(null, null,false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Open"};
@@ -77,9 +77,9 @@
 
 
 
-    public void testMessage1002()
+    public void testConnectionClose()
     {
-        _logMessage = ConnectionMessages.CON_1002();
+        _logMessage = ConnectionMessages.CON_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ExchangeMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -30,7 +30,7 @@
  */
 public class ExchangeMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001_Transient()
+    public void testExchangeCreated_Transient()
     {
         // Get the Default Exchange on the Test Vhost for testing
         Exchange exchange = ApplicationRegistry.getInstance().
@@ -40,7 +40,7 @@
         String type = exchange.getType().toString();
         String name = exchange.getName().toString();
 
-        _logMessage = ExchangeMessages.EXH_1001(type, name, false);
+        _logMessage = ExchangeMessages.EXH_CREATED(type, name, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Type:", type, "Name:", name};
@@ -48,7 +48,7 @@
         validateLogMessage(log, "EXH-1001", expected);
     }
 
-    public void testMessage1001_Persistent()
+    public void testExchangeCreated_Persistent()
     {
         // Get the Default Exchange on the Test Vhost for testing
         Exchange exchange = ApplicationRegistry.getInstance().
@@ -58,7 +58,7 @@
         String type = exchange.getType().toString();
         String name = exchange.getName().toString();
 
-        _logMessage = ExchangeMessages.EXH_1001(type, name, true);
+        _logMessage = ExchangeMessages.EXH_CREATED(type, name, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable", "Type:", type, "Name:", name};
@@ -67,9 +67,9 @@
     }
 
 
-    public void testMessage1002()
+    public void testExchangeDeleted()
     {
-        _logMessage = ExchangeMessages.EXH_1002();
+        _logMessage = ExchangeMessages.EXH_DELETED();
         List<Object> log = performLog();
 
         String[] expected = {"Deleted"};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,9 +27,9 @@
  */
 public class ManagementConsoleMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testManagementStartup()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1001();
+        _logMessage = ManagementConsoleMessages.MNG_STARTUP();
         List<Object> log = performLog();
 
         String[] expected = {"Startup"};
@@ -37,12 +37,12 @@
         validateLogMessage(log, "MNG-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testManagementListening()
     {
         String transport = "JMX";
         Integer port = 8889;
 
-        _logMessage = ManagementConsoleMessages.MNG_1002(transport, port);
+        _logMessage = ManagementConsoleMessages.MNG_LISTENING(transport, port);
         List<Object> log = performLog();
 
         String[] expected = {"Starting :", transport, ": Listening on port", String.valueOf(port)};
@@ -50,12 +50,12 @@
         validateLogMessage(log, "MNG-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testManagementShuttingDown()
     {
         String transport = "JMX";
         Integer port = 8889;
 
-        _logMessage = ManagementConsoleMessages.MNG_1003(transport, port);
+        _logMessage = ManagementConsoleMessages.MNG_SHUTTING_DOWN(transport, port);
         List<Object> log = performLog();
 
         String[] expected = {"Shuting down :", transport, ": port", String.valueOf(port)};
@@ -63,9 +63,9 @@
         validateLogMessage(log, "MNG-1003", expected);
     }
 
-    public void testMessage1004()
+    public void testManagementReady()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1004();
+        _logMessage = ManagementConsoleMessages.MNG_READY();
         List<Object> log = performLog();
 
         String[] expected = {"Ready"};
@@ -73,9 +73,9 @@
         validateLogMessage(log, "MNG-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testManagementStopped()
     {
-        _logMessage = ManagementConsoleMessages.MNG_1005();
+        _logMessage = ManagementConsoleMessages.MNG_STOPPED();
         List<Object> log = performLog();
 
         String[] expected = {"Stopped"};
@@ -83,11 +83,11 @@
         validateLogMessage(log, "MNG-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testManagementSSLKeyStore()
     {
         String path = "/path/to/the/keystore/files.jks";
 
-        _logMessage = ManagementConsoleMessages.MNG_1006(path);
+        _logMessage = ManagementConsoleMessages.MNG_SSL_KEYSTORE(path);
         List<Object> log = performLog();
 
         String[] expected = {"Using SSL Keystore :", path};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/MessageStoreMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -28,11 +28,11 @@
  */
 public class MessageStoreMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testMessageStoreCreated()
     {
         String name = "DerbyMessageStore";
 
-        _logMessage = MessageStoreMessages.MST_1001(name);
+        _logMessage = MessageStoreMessages.MST_CREATED(name);
         List<Object> log = performLog();
 
         String[] expected = {"Created :", name};
@@ -40,11 +40,11 @@
         validateLogMessage(log, "MST-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testMessageStoreStoreLocation()
     {
         String location = "/path/to/the/message/store.files";
 
-        _logMessage = MessageStoreMessages.MST_1002(location);
+        _logMessage = MessageStoreMessages.MST_STORE_LOCATION(location);
         List<Object> log = performLog();
 
         String[] expected = {"Store location :", location};
@@ -52,9 +52,9 @@
         validateLogMessage(log, "MST-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testMessageStoreClosed()
     {
-        _logMessage = MessageStoreMessages.MST_1003();
+        _logMessage = MessageStoreMessages.MST_CLOSED();
         List<Object> log = performLog();
 
         String[] expected = {"Closed"};
@@ -62,9 +62,9 @@
         validateLogMessage(log, "MST-1003", expected);
     }
 
-    public void testMessage1004()
+    public void testMessageStoreRecoveryStart()
     {
-        _logMessage = MessageStoreMessages.MST_1004(null,false);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_START(null,false);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Start"};
@@ -72,11 +72,11 @@
         validateLogMessage(log, "MST-1004", expected);
     }
 
-    public void testMessage1004_withQueue()
+    public void testMessageStoreRecoveryStart_withQueue()
     {
         String queueName = "testQueue";
 
-        _logMessage = MessageStoreMessages.MST_1004(queueName, true);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_START(queueName, true);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Start :", queueName};
@@ -84,12 +84,12 @@
         validateLogMessage(log, "MST-1004", expected);
     }
 
-    public void testMessage1005()
+    public void testMessageStoreRecovered()
     {
         String queueName = "testQueue";
         Integer messasgeCount = 2000;
 
-        _logMessage = MessageStoreMessages.MST_1005(messasgeCount, queueName);
+        _logMessage = MessageStoreMessages.MST_RECOVERED(messasgeCount, queueName);
         List<Object> log = performLog();
 
         // Here we use MessageFormat to ensure the messasgeCount of 2000 is
@@ -101,9 +101,9 @@
         validateLogMessage(log, "MST-1005", expected);
     }
 
-    public void testMessage1006()
+    public void testMessageStoreRecoveryComplete()
     {
-        _logMessage = MessageStoreMessages.MST_1006(null,false);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_COMPLETE(null,false);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Complete"};
@@ -111,11 +111,11 @@
         validateLogMessage(log, "MST-1006", expected);
     }
 
-    public void testMessage1006_withQueue()
+    public void testMessageStoreRecoveryComplete_withQueue()
     {
         String queueName = "testQueue";
 
-        _logMessage = MessageStoreMessages.MST_1006(queueName, true);
+        _logMessage = MessageStoreMessages.MST_RECOVERY_COMPLETE(queueName, true);
         List<Object> log = performLog();
 
         String[] expected = {"Recovery Complete :", queueName};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/QueueMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,12 +27,12 @@
  */
 public class QueueMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001ALL()
+    public void testQueueCreatedALL()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -42,11 +42,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDelete()
+    public void testQueueCreatedOwnerAutoDelete()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete"};
@@ -54,12 +54,12 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerPriority()
+    public void testQueueCreatedOwnerPriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, false, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, false, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "Priority:",
@@ -68,12 +68,12 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeletePriority()
+    public void testQueueCreatedOwnerAutoDeletePriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -83,11 +83,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteTransient()
+    public void testQueueCreatedOwnerAutoDeleteTransient()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, false, true, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, false, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -96,12 +96,12 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteTransientPriority()
+    public void testQueueCreatedOwnerAutoDeleteTransientPriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, false, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, false, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -111,11 +111,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteDurable()
+    public void testQueueCreatedOwnerAutoDeleteDurable()
     {
         String owner = "guest";
 
-        _logMessage = QueueMessages.QUE_1001(owner, null, true, true, true, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(owner, null, true, true, true, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -124,12 +124,12 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001OwnerAutoDeleteDurablePriority()
+    public void testQueueCreatedOwnerAutoDeleteDurablePriority()
     {
         String owner = "guest";
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(owner, priority, true, true, true, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(owner, priority, true, true, true, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Owner:", owner, "AutoDelete",
@@ -139,9 +139,9 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDelete()
+    public void testQueueCreatedAutoDelete()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete"};
@@ -149,11 +149,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001Priority()
+    public void testQueueCreatedPriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, false, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, false, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Priority:",
@@ -162,11 +162,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeletePriority()
+    public void testQueueCreatedAutoDeletePriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -176,9 +176,9 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteTransient()
+    public void testQueueCreatedAutoDeleteTransient()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, false, true, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, false, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -187,11 +187,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteTransientPriority()
+    public void testQueueCreatedAutoDeleteTransientPriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, false, true, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, false, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -201,9 +201,9 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteDurable()
+    public void testQueueCreatedAutoDeleteDurable()
     {
-        _logMessage = QueueMessages.QUE_1001(null, null, false, true, true, false, false);
+        _logMessage = QueueMessages.QUE_CREATED(null, null, false, true, true, false, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -212,11 +212,11 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1001AutoDeleteDurablePriority()
+    public void testQueueCreatedAutoDeleteDurablePriority()
     {
         Integer priority = 3;
 
-        _logMessage = QueueMessages.QUE_1001(null, priority, false, true, true, false, true);
+        _logMessage = QueueMessages.QUE_CREATED(null, priority, false, true, true, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "AutoDelete",
@@ -226,9 +226,9 @@
         validateLogMessage(log, "QUE-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testQueueDeleted()
     {
-        _logMessage = QueueMessages.QUE_1002();
+        _logMessage = QueueMessages.QUE_DELETED();
         List<Object> log = performLog();
 
         String[] expected = {"Deleted"};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/SubscriptionMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,11 +27,11 @@
  */
 public class SubscriptionMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001ALL()
+    public void testSubscriptionCreateALL()
     {
         String arguments = "arguments";
 
-        _logMessage = SubscriptionMessages.SUB_1001(arguments, true, true);
+        _logMessage = SubscriptionMessages.SUB_CREATE(arguments, true, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable", "Arguments :", arguments};
@@ -39,9 +39,9 @@
         validateLogMessage(log, "SUB-1001", expected);
     }
 
-    public void testMessage1001Durable()
+    public void testSubscriptionCreateDurable()
     {
-        _logMessage = SubscriptionMessages.SUB_1001(null, true, false);
+        _logMessage = SubscriptionMessages.SUB_CREATE(null, true, false);
         List<Object> log = performLog();
 
         String[] expected = {"Create :", "Durable"};
@@ -49,11 +49,11 @@
         validateLogMessage(log, "SUB-1001", expected);
     }
 
-    public void testMessage1001Arguments()
+    public void testSubscriptionCreateArguments()
     {
         String arguments = "arguments";
 
-        _logMessage = SubscriptionMessages.SUB_1001(arguments, false, true);
+        _logMessage = SubscriptionMessages.SUB_CREATE(arguments, false, true);
         List<Object> log = performLog();
 
         String[] expected = {"Create :","Arguments :", arguments};
@@ -62,9 +62,9 @@
     }
 
 
-    public void testMessage1002()
+    public void testSubscriptionClose()
     {
-        _logMessage = SubscriptionMessages.SUB_1002();
+        _logMessage = SubscriptionMessages.SUB_CLOSE();
         List<Object> log = performLog();
 
         String[] expected = {"Close"};
@@ -72,11 +72,11 @@
         validateLogMessage(log, "SUB-1002", expected);
     }
 
-    public void testMessage1003()
+    public void testSubscriptionState()
     {
         String state = "ACTIVE";
 
-        _logMessage = SubscriptionMessages.SUB_1003(state);
+        _logMessage = SubscriptionMessages.SUB_STATE(state);
         List<Object> log = performLog();
 
         String[] expected = {"State :", state};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/messages/VirtualHostMessagesTest.java Thu Dec  3 09:43:37 2009
@@ -27,10 +27,10 @@
  */
 public class VirtualHostMessagesTest extends AbstractTestMessages
 {
-    public void testMessage1001()
+    public void testVirtualhostCreated()
     {
         String name = "test";
-        _logMessage = VirtualHostMessages.VHT_1001(name);
+        _logMessage = VirtualHostMessages.VHT_CREATED(name);
         List<Object> log = performLog();
 
         String[] expected = {"Created :", name};
@@ -38,9 +38,9 @@
         validateLogMessage(log, "VHT-1001", expected);
     }
 
-    public void testMessage1002()
+    public void testSubscriptionClosed()
     {
-        _logMessage = VirtualHostMessages.VHT_1002();
+        _logMessage = VirtualHostMessages.VHT_CLOSED();
         List<Object> log = performLog();
 
         String[] expected = {"Closed"};

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/java/org/apache/qpid/server/logging/GenerateLogMessages.java Thu Dec  3 09:43:37 2009
@@ -259,7 +259,7 @@
             if (message.startsWith(messageKey))
             {
                 // Method names can't have a '-' in them so lets make it '_'
-                // e.g. BRK_1001
+                // e.g. BRK_STARTUP
                 logEntryData.put("methodName", message.replace('-', '_'));
                 // Store the real name so we can use that in the actual log.
                 logEntryData.put("name", message);

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm Thu Dec  3 09:43:37 2009
@@ -121,7 +121,7 @@
     public static LogMessage ${message.methodName}(#foreach($parameter in ${message.parameters})${parameter.type} ${parameter.name}#if (${velocityCount} != ${message.parameters.size()} ), #end
 #end#if(${message.parameters.size()} > 0 && ${message.options.size()} > 0), #end#foreach($option in ${message.options})boolean ${option.name}#if (${velocityCount} != ${message.options.size()} ), #end#end)
     {
-        String rawMessage = "${message.name} : " + _messages.getString("${message.name}");
+        String rawMessage = _messages.getString("${message.name}");
 ## If we have some options then we need to build the message based
 ## on those values so only provide that logic if we need it.
 #if(${message.options.size()} > 0)

Modified: qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java?rev=886722&r1=886721&r2=886722&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java Thu Dec  3 09:43:37 2009
@@ -24,7 +24,6 @@
 import org.apache.qpid.client.AMQSession;
 import org.apache.qpid.client.AMQQueue;
 import org.apache.qpid.client.AMQDestination;
-import org.apache.qpid.test.utils.QpidTestCase;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.server.logging.AbstractTestLogging;
 import org.apache.qpid.framing.AMQShortString;
@@ -152,7 +151,7 @@
 
         results = _monitor.findMatches("QUE-1004");
 
-        assertEquals("Did not find correct number of QUE_1004 queue underfull messages", 1, results.size());
+        assertEquals("Did not find correct number of QUE_UNDERFULL queue underfull messages", 1, results.size());
 
 
         



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message