From 1cdc01fc448a7f252d041a266d2595cee6cca662 Mon Sep 17 00:00:00 2001 From: Martyn Taylor Date: Wed, 4 Nov 2015 14:48:03 +0000 Subject: [PATCH] ARTEMIS-295 Remove 'yet' from log messages --- .../artemis/core/client/impl/ClientSessionFactoryImpl.java | 2 +- .../activemq/artemis/jms/server/ActiveMQJMSServerLogger.java | 2 +- .../artemis/jms/server/impl/JMSServerManagerImpl.java | 2 +- .../activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ++-- .../extensions/xa/recovery/ActiveMQXARecoveryLogger.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java index c69ef4d9231..66d5cbb4a48 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java @@ -1080,7 +1080,7 @@ else if (backupConfig != null) { } else { if (ClientSessionFactoryImpl.isDebug) { - ActiveMQClientLogger.LOGGER.debug("Backup is not active yet"); + ActiveMQClientLogger.LOGGER.debug("Backup is not active."); } } diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java index d17add914d5..4a2f701d28b 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/ActiveMQJMSServerLogger.java @@ -48,7 +48,7 @@ public interface ActiveMQJMSServerLogger extends BasicLogger { ActiveMQJMSServerLogger LOGGER = Logger.getMessageLogger(ActiveMQJMSServerLogger.class, ActiveMQJMSServerLogger.class.getPackage().getName()); @LogMessage(level = Logger.Level.INFO) - @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active yet", + @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active.", format = Message.Format.MESSAGE_FORMAT) void serverCachingCommand(Object runnable); diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java index 99e0daa730b..9361e8efcb1 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java @@ -1360,7 +1360,7 @@ public int compare(final Entry entry1, final Entry entry2) private synchronized void checkInitialised() { if (!active) { - throw new IllegalStateException("Cannot access JMS Server, core server is not yet active"); + throw new IllegalStateException("Cannot access JMS Server, core server is not active"); } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java index aada31889d5..f2f77788b43 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java @@ -254,7 +254,7 @@ void messageWithDuplicateID(Object duplicateProperty, void restartingReplicatedBackupAfterFailback(); @LogMessage(level = Logger.Level.INFO) - @Message(id = 221040, value = "Remote group coordinators did not start yet", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 221040, value = "Remote group coordinators has not started.", format = Message.Format.MESSAGE_FORMAT) void remoteGroupCoordinatorsNotStarted(); @LogMessage(level = Logger.Level.INFO) @@ -701,7 +701,7 @@ void slowConsumerDetected(String sessionID, void errorQueryingBridge(@Cause Throwable t, SimpleString name); @LogMessage(level = Logger.Level.WARN) - @Message(id = 222097, value = "Address {0} does not have any bindings yet, retry #({1})", + @Message(id = 222097, value = "Address {0} does not have any bindings, retry #({1})", format = Message.Format.MESSAGE_FORMAT) void errorQueryingBridge(SimpleString address, Integer retryCount); diff --git a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java index b27c4b22d1d..02bf8396d8c 100644 --- a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java +++ b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXARecoveryLogger.java @@ -52,7 +52,7 @@ public interface ActiveMQXARecoveryLogger extends BasicLogger { void serverRunningCachedCommand(Runnable run); @LogMessage(level = Logger.Level.INFO) - @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active yet", + @Message(id = 121004, value = "JMS Server Manager Caching command for {0} since the JMS Server is not active.", format = Message.Format.MESSAGE_FORMAT) void serverCachingCommand(Object runnable);