diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java index c1bea17cd5..dc6d0deb04 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/bootstrap/ActiveMQBootstrapLogger.java @@ -46,11 +46,11 @@ public interface ActiveMQBootstrapLogger extends BasicLogger ActiveMQBootstrapLogger LOGGER = Logger.getMessageLogger(ActiveMQBootstrapLogger.class, ActiveMQBootstrapLogger.class.getPackage().getName()); @LogMessage(level = Logger.Level.INFO) - @Message(id = 101000, value = "Starting ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 101000, value = "Starting ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT) void serverStarting(); @LogMessage(level = Logger.Level.INFO) - @Message(id = 101001, value = "Stopping ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 101001, value = "Stopping ActiveMQ Artemis Server", format = Message.Format.MESSAGE_FORMAT) void serverStopping(); @LogMessage(level = Logger.Level.INFO) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java index dffc871efc..9aa93ac9b7 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java @@ -484,8 +484,8 @@ public interface ActiveMQServerControl /** * Closes all the connections of clients connected to this server which matches the specified IP address. */ - @Operation(desc = "Closes all the consumer connections for the given ActiveMQ address", impact = MBeanOperationInfo.INFO) - boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a ActiveMQ address", name = "address") String address) throws Exception; + @Operation(desc = "Closes all the consumer connections for the given messaging address", impact = MBeanOperationInfo.INFO) + boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a messaging address", name = "address") String address) throws Exception; /** * Closes all the connections of sessions with a matching user name. diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java index 4bf6007f76..2e55002ea8 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java @@ -31,7 +31,7 @@ public class JMSManagementHelper { if (jmsMessage instanceof ActiveMQMessage == false) { - throw new IllegalArgumentException("Cannot send a non ActiveMQ message as a management message " + jmsMessage.getClass() + throw new IllegalArgumentException("Cannot send a foreign message as a management message " + jmsMessage.getClass() .getName()); } diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java index 739f6479ad..4fa2fe2330 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java @@ -271,8 +271,8 @@ public interface JMSServerControl /** * Closes all the connections on this server for consumers which are consuming from a queue associated with a particular address. */ - @Operation(desc = "Closes all the consumer connections for the given ActiveMQ address", impact = MBeanOperationInfo.INFO) - boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a ActiveMQ address", name = "address") String address) throws Exception; + @Operation(desc = "Closes all the consumer connections for the given messaging address", impact = MBeanOperationInfo.INFO) + boolean closeConsumerConnectionsForAddress(@Parameter(desc = "a messaging address", name = "address") String address) throws Exception; /** * Closes all the connections on this server for sessions using a particular user name. diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java index 41e4f43633..47b480748d 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java @@ -398,7 +398,7 @@ public class ActiveMQMessage implements javax.jms.Message { if (dest instanceof ActiveMQDestination == false) { - throw new InvalidDestinationException("Not a ActiveMQ destination " + dest); + throw new InvalidDestinationException("Foreign destination " + dest); } ActiveMQDestination jbd = (ActiveMQDestination)dest; diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java index 050046e752..b4300e3836 100644 --- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java +++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java @@ -330,7 +330,7 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To { if (destination != null && !(destination instanceof ActiveMQDestination)) { - throw new InvalidDestinationException("Not a ActiveMQ Destination:" + destination); + throw new InvalidDestinationException("Foreign destination:" + destination); } if (destination != null && defaultDestination != null) { diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java index 2e8b541c37..d4f89ac0b8 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java @@ -905,7 +905,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo { if (!server.isStarted()) { - throw new IllegalStateException("ActiveMQ JMS Server is not started. it can not be managed yet"); + throw new IllegalStateException("ActiveMQ Artemis JMS Server is not started. It can not be managed yet"); } } 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 a9930b3f74..d46c7b8274 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 @@ -66,7 +66,7 @@ public interface ActiveMQJMSServerLogger extends BasicLogger void noQueueOnTopic(String queueName, String name); @LogMessage(level = Logger.Level.WARN) - @Message(id = 122008, value = "XA Recovery can not connect to any ActiveMQ server on recovery {0}" , format = Message.Format.MESSAGE_FORMAT) + @Message(id = 122008, value = "XA Recovery can not connect to any broker on recovery {0}" , format = Message.Format.MESSAGE_FORMAT) void recoveryConnectFailed(String s); @LogMessage(level = Logger.Level.WARN) diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java index d83dd49441..82b8b0a761 100644 --- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java +++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/server/ActiveMQBootstrap.java @@ -155,7 +155,7 @@ public class ActiveMQBootstrap { restartFile.delete(); } - final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", false); + final Timer timer = new Timer("ActiveMQ Artemis Server Shutdown Timer", false); timer.scheduleAtFixedRate(new ServerStopTimerTask(stopFile, killFile, restartFile, timer), 500, 500); } } diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java index f2c6d68672..dbaf4b9383 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java @@ -155,7 +155,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple } catch (Exception e) { - throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.errorCreatingActiveMQConsumer(e.getMessage()); + throw ActiveMQAMQPProtocolMessageBundle.BUNDLE.errorCreatingConsumer(e.getMessage()); } } } diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java index b3d2258ef3..73d53f6c3d 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java @@ -50,10 +50,10 @@ public interface ActiveMQAMQPProtocolMessageBundle @Message(id = 219003, value = "error finding temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT) ActiveMQAMQPInternalErrorException errorFindingTemporaryQueue(String message); - @Message(id = 219005, value = "error creating ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT) - ActiveMQAMQPInternalErrorException errorCreatingActiveMQConsumer(String message); + @Message(id = 219005, value = "error creating consumer, {0}", format = Message.Format.MESSAGE_FORMAT) + ActiveMQAMQPInternalErrorException errorCreatingConsumer(String message); - @Message(id = 219006, value = "error starting ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 219006, value = "error starting consumer, {0}", format = Message.Format.MESSAGE_FORMAT) ActiveMQAMQPIllegalStateException errorStartingConsumer(String message); @Message(id = 219007, value = "error acknowledging message {0}, {1}", format = Message.Format.MESSAGE_FORMAT) diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java index ef269e2c77..64d0a56f31 100644 --- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java +++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java @@ -49,8 +49,8 @@ import static org.apache.activemq.artemis.core.protocol.stomp.ActiveMQStompProto public final class StompConnection implements RemotingConnection { protected static final String CONNECTION_ID_PROP = "__AMQ_CID"; - private static final String SERVER_NAME = "ActiveMQ/" + VersionLoader.getVersion().getFullVersion() + - " ActiveMQ Messaging Engine"; + private static final String SERVER_NAME = "ActiveMQ-Artemis/" + VersionLoader.getVersion().getFullVersion() + + " ActiveMQ Artemis Messaging Engine"; private final StompProtocolManager manager; diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java index 9a45b5c506..ac69a49d14 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java @@ -94,7 +94,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData ActiveMQRALogger.LOGGER.trace("getJMSProviderName()"); } - return "ActiveMQ"; + return "ActiveMQ Artemis"; } /** diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java index fcdc357e45..e29eb00a6f 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java @@ -58,11 +58,11 @@ public interface ActiveMQRALogger extends BasicLogger void attemptingReconnect(ActiveMQActivationSpec spec); @LogMessage(level = Logger.Level.INFO) - @Message(id = 151002, value = "Reconnected with ActiveMQ", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 151002, value = "Reconnected with broker", format = Message.Format.MESSAGE_FORMAT) void reconnected(); @LogMessage(level = Logger.Level.INFO) - @Message(id = 151003, value = "ActiveMQ resource adaptor stopped", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 151003, value = "resource adaptor stopped", format = Message.Format.MESSAGE_FORMAT) void raStopped(); @LogMessage(level = Logger.Level.INFO) @@ -70,11 +70,11 @@ public interface ActiveMQRALogger extends BasicLogger void instantiatingDestination(String destinationType, String destination); @LogMessage(level = Logger.Level.INFO) - @Message(id = 151005, value = "awaiting ActiveMQ Server availability", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 151005, value = "awaiting server availability", format = Message.Format.MESSAGE_FORMAT) void awaitingJMSServerCreation(); @LogMessage(level = Logger.Level.WARN) - @Message(id = 152001, value = "problem resetting ActiveMQ xa session after failure", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 152001, value = "problem resetting xa session after failure", format = Message.Format.MESSAGE_FORMAT) void problemResettingXASession(); @LogMessage(level = Logger.Level.WARN) @@ -90,7 +90,7 @@ public interface ActiveMQRALogger extends BasicLogger void handlingJMSFailure(@Cause Exception e); @LogMessage(level = Logger.Level.WARN) - @Message(id = 152005, value = "Failure in ActiveMQ activation {0}", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 152005, value = "Failure in broker activation {0}", format = Message.Format.MESSAGE_FORMAT) void failureInActivation(@Cause Throwable t, ActiveMQActivationSpec spec); @LogMessage(level = Logger.Level.WARN) @@ -102,7 +102,7 @@ public interface ActiveMQRALogger extends BasicLogger void errorCreatingReference(@Cause Exception e); @LogMessage(level = Logger.Level.ERROR) - @Message(id = 154001, value = "Unable to stop ActiveMQ resource adapter.", format = Message.Format.MESSAGE_FORMAT) + @Message(id = 154001, value = "Unable to stop resource adapter.", format = Message.Format.MESSAGE_FORMAT) void errorStoppingRA(@Cause Exception e); @LogMessage(level = Logger.Level.ERROR) diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java index fbcc8f27c3..6bf375d014 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java @@ -57,7 +57,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData ActiveMQRALogger.LOGGER.trace("getEISProductName()"); } - return "ActiveMQ"; + return "ActiveMQ Artemis"; } /** diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java index f8c5d978e6..7ae005af11 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java @@ -68,7 +68,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable /** * The Name of the product that this resource adapter represents. */ - public static final String PRODUCT_NAME = "ActiveMQ"; + public static final String PRODUCT_NAME = "ActiveMQ Artemis"; /** * Trace enabled @@ -262,7 +262,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } } - ActiveMQRALogger.LOGGER.info("ActiveMQ resource adaptor started"); + ActiveMQRALogger.LOGGER.info("Resource adaptor started"); } /** @@ -1982,7 +1982,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } else { - throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ActiveMQ ResourceAdapter Connection Factory"); + throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ResourceAdapter Connection Factory"); } setParams(cf, overrideProperties); @@ -2041,7 +2041,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } if (endpointFactory == null) { - throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ActiveMQ ResourceAdapter Connection Factory"); + throw new IllegalArgumentException("must provide either TransportType or DiscoveryGroupAddress and DiscoveryGroupPort for ResourceAdapter Connection Factory"); } } diff --git a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java index 9506e9e49f..05cfb3ac7b 100644 --- a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java +++ b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/queue/push/ActiveMQPushStrategy.java @@ -48,7 +48,7 @@ public class ActiveMQPushStrategy extends UriTemplateStrategy ClientResponse res = request.head(); if (res.getStatus() != 200) { - throw new RuntimeException("Failed to query ActiveMQ REST destination for init information. Status: " + res.getStatus()); + throw new RuntimeException("Failed to query REST destination for init information. Status: " + res.getStatus()); } String url = (String)res.getHeaders().getFirst("msg-create-with-id"); if (url == null) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index 47ac086dbe..2147eb6274 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -1089,7 +1089,7 @@ public class ConfigurationImpl implements Configuration, Serializable @Override public String toString() { - StringBuilder sb = new StringBuilder("ActiveMQ Configuration ("); + StringBuilder sb = new StringBuilder("Broker Configuration ("); sb.append("clustered=").append(isClustered()).append(","); sb.append("journalDirectory=").append(journalDirectory).append(","); sb.append("bindingsDirectory=").append(bindingsDirectory).append(","); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java index 52762248d0..ba3eddc0eb 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java @@ -2148,7 +2148,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active { if (!server.isStarted()) { - throw new IllegalStateException("ActiveMQ Server is not started. It can not be managed yet"); + throw new IllegalStateException("Broker is not started. It can not be managed yet"); } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java index e23dcc27f0..514ea6e6fb 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java @@ -1031,7 +1031,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl { if (!postOffice.isStarted()) { - throw new IllegalStateException("ActiveMQ Server is not started. Queue can not be managed yet"); + throw new IllegalStateException("Broker is not started. Queue can not be managed yet"); } } 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 15707ae912..177c9c3bbf 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 @@ -66,7 +66,7 @@ public interface ActiveMQXARecoveryLogger extends BasicLogger void noQueueOnTopic(String queueName, String name); @LogMessage(level = Logger.Level.WARN) - @Message(id = 122008, value = "XA Recovery can not connect to any ActiveMQ server on recovery {0}" , format = Message.Format.MESSAGE_FORMAT) + @Message(id = 122008, value = "XA Recovery can not connect to any broker on recovery {0}" , format = Message.Format.MESSAGE_FORMAT) void recoveryConnectFailed(String s); @LogMessage(level = Logger.Level.WARN) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java index 1ad9862470..323d7b3d0c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java @@ -1111,7 +1111,7 @@ public abstract class ClusterTestBase extends ServiceTestBase { String br = "-------------------------\n"; String out = br; - out += "ActiveMQ server " + server + "\n"; + out += "ActiveMQ Artemis server " + server + "\n"; ClusterManager clusterManager = server.getClusterManager(); if (clusterManager == null) {