Author: ritchiem Date: 2009-12-03 04:56:53 -0500 (Thu, 03 Dec 2009) New Revision: 3732 Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java Log: QPID-2001 : Converted Log Messages from XXX-<Number> to a 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. Modified: store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java =================================================================== --- store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-12-02 18:23:36 UTC (rev 3731) +++ store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-12-03 09:56:53 UTC (rev 3732) @@ -202,7 +202,7 @@ } } - CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1002(environmentPath.getAbsolutePath())); + CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_STORE_LOCATION(environmentPath.getAbsolutePath())); _version = config.getInt(DATABASE_FORMAT_VERSION_PROPERTY, DATABASE_FORMAT_VERSION); @@ -1231,7 +1231,7 @@ stateTransition(State.CONFIGURED, State.RECOVERING); _log.info("Recovering persistent state..."); - CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_1004(null, false)); + CurrentActor.get().message(_logSubject,MessageStoreMessages.MST_RECOVERY_START(null, false)); StoreContext context = new StoreContext(); try @@ -1241,7 +1241,7 @@ for (AMQQueue q : queues.values()) { - 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(q.getName(), 0); @@ -1253,7 +1253,7 @@ deliverMessages(context, queues); _log.info("Persistent state recovered successfully"); - CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_1006(null, false)); + CurrentActor.get().message(_logSubject, MessageStoreMessages.MST_RECOVERY_COMPLETE(null, false)); commitTran(context); @@ -1721,9 +1721,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