This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 5d74d9db7a ARTEMIS-5818 Update project name in code comments
5d74d9db7a is described below
commit 5d74d9db7a120fff2b34ba1c142f950011a403b3
Author: Timothy Bish <[email protected]>
AuthorDate: Tue Dec 16 17:18:00 2025 -0500
ARTEMIS-5818 Update project name in code comments
Updates various code comments to replace the ActiveMQ Artemis name with the
new TLP project name. A few loggers in unit tests were also changed as they
won't affect existing users output.
---
.../org/apache/activemq/artemis/boot/Artemis.java | 2 +-
.../activemq/artemis/api/core/ActiveMQBuffer.java | 2 +-
.../core/ActiveMQConnectionTimedOutException.java | 2 +-
.../api/core/ActiveMQDisconnectedException.java | 2 +-
.../activemq/artemis/api/core/ActiveMQException.java | 2 +-
.../api/core/ActiveMQIllegalStateException.java | 2 +-
.../api/core/ActiveMQInternalErrorException.java | 2 +-
.../artemis/api/core/ActiveMQNativeIOError.java | 2 +-
.../api/core/ActiveMQNotConnectedException.java | 2 +-
.../api/core/ActiveMQUnsupportedPacketException.java | 2 +-
.../activemq/artemis/api/core/SimpleString.java | 2 +-
.../activemq/artemis/utils/ClassloadingUtil.java | 2 +-
.../apache/activemq/artemis/utils/ReusableLatch.java | 2 +-
.../activemq/artemis/utils/SelectorTranslator.java | 6 +++---
.../api/config/ActiveMQDefaultConfiguration.java | 12 ++++++------
.../activemq/artemis/api/core/FilterConstants.java | 20 ++++++++++----------
.../activemq/artemis/api/core/Interceptor.java | 4 ++--
.../artemis/api/core/JGroupsBroadcastEndpoint.java | 2 +-
.../api/core/JGroupsFileBroadcastEndpoint.java | 2 +-
.../artemis/api/core/TransportConfiguration.java | 4 ++--
.../artemis/api/core/client/ActiveMQClient.java | 2 +-
.../artemis/api/core/client/ClientConsumer.java | 6 +++---
.../artemis/api/core/client/ClientMessage.java | 4 ++--
.../api/core/client/ClientSessionFactory.java | 2 +-
.../core/management/ActiveMQComponentControl.java | 2 +-
.../api/core/management/ActiveMQServerControl.java | 2 +-
.../api/core/management/ManagementHelper.java | 6 +++---
.../api/core/management/NotificationType.java | 4 ++--
.../api/core/management/ObjectNameBuilder.java | 4 ++--
.../activemq/artemis/core/message/BodyEncoder.java | 10 +++++-----
.../artemis/core/message/LargeBodyReader.java | 12 ++++++------
.../core/protocol/core/CoreRemotingConnection.java | 2 +-
.../protocol/core/impl/ActiveMQSessionContext.java | 4 ++--
.../artemis/core/remoting/impl/ssl/SSLSupport.java | 2 +-
.../apache/activemq/artemis/dto/package-info.java | 2 +-
.../activemq/artemis/api/jms/ActiveMQJMSClient.java | 2 +-
.../artemis/api/jms/ActiveMQJMSConstants.java | 2 +-
.../api/jms/management/JMSManagementHelper.java | 2 +-
.../artemis/jms/client/ActiveMQBytesMessage.java | 2 +-
.../artemis/jms/client/ActiveMQConnection.java | 2 +-
.../jms/client/ActiveMQConnectionFactory.java | 2 +-
.../jms/client/ActiveMQConnectionMetaData.java | 2 +-
.../artemis/jms/client/ActiveMQDestination.java | 2 +-
.../artemis/jms/client/ActiveMQJMSContext.java | 2 +-
.../artemis/jms/client/ActiveMQMapMessage.java | 2 +-
.../activemq/artemis/jms/client/ActiveMQMessage.java | 4 ++--
.../artemis/jms/client/ActiveMQMessageConsumer.java | 2 +-
.../artemis/jms/client/ActiveMQMessageProducer.java | 2 +-
.../artemis/jms/client/ActiveMQObjectMessage.java | 2 +-
.../activemq/artemis/jms/client/ActiveMQQueue.java | 2 +-
.../artemis/jms/client/ActiveMQQueueBrowser.java | 2 +-
.../activemq/artemis/jms/client/ActiveMQSession.java | 2 +-
.../artemis/jms/client/ActiveMQStreamMessage.java | 2 +-
.../artemis/jms/client/ActiveMQTemporaryQueue.java | 2 +-
.../artemis/jms/client/ActiveMQTextMessage.java | 4 ++--
.../activemq/artemis/jms/client/ActiveMQTopic.java | 2 +-
.../artemis/jms/client/ActiveMQXAConnection.java | 2 +-
.../artemis/jndi/ActiveMQInitialContextFactory.java | 2 +-
.../artemis/jms/bridge/QualityOfServiceMode.java | 2 +-
.../artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 +-
.../artemis/junit/ActiveMQConsumerResource.java | 6 +++---
.../junit/ActiveMQDynamicProducerResource.java | 6 +++---
.../artemis/junit/ActiveMQProducerResource.java | 6 +++---
.../artemis/junit/EmbeddedActiveMQResource.java | 6 +++---
.../activemq/artemis/junit/EmbeddedJMSResource.java | 2 +-
.../artemis/junit/ActiveMQConsumerExtension.java | 6 +++---
.../junit/ActiveMQDynamicProducerExtension.java | 4 ++--
.../artemis/junit/ActiveMQProducerExtension.java | 4 ++--
.../artemis/junit/EmbeddedActiveMQExtension.java | 6 +++---
.../artemis/junit/ActiveMQConsumerDelegate.java | 2 +-
.../junit/ActiveMQDynamicProducerDelegate.java | 2 +-
.../artemis/junit/ActiveMQProducerDelegate.java | 2 +-
.../artemis/junit/EmbeddedActiveMQDelegate.java | 2 +-
.../artemis/junit/EmbeddedActiveMQOperations.java | 4 ++--
.../broker/ActiveMQProtonRemotingConnection.java | 2 +-
.../protocol/amqp/broker/ProtonProtocolManager.java | 2 +-
.../amqp/proton/ProtonServerSenderContext.java | 4 ++--
.../artemis/core/protocol/stomp/StompDecoder.java | 2 +-
.../core/protocol/stomp/StompFrameInterceptor.java | 4 ++--
.../activemq/artemis/ra/ActiveMQRAService.java | 2 +-
.../activemq/artemis/core/config/Configuration.java | 4 ++--
.../artemis/core/filter/impl/FilterImpl.java | 4 ++--
.../activemq/artemis/core/paging/PagingStore.java | 2 +-
.../artemis/core/paging/impl/PagingStoreImpl.java | 2 +-
.../core/security/impl/SecurityStoreImpl.java | 2 +-
.../activemq/artemis/core/server/ActiveMQServer.java | 4 ++--
.../core/server/embedded/EmbeddedActiveMQ.java | 2 +-
.../artemis/core/server/impl/ActiveMQServerImpl.java | 4 ++--
.../core/server/impl/ServiceRegistryImpl.java | 2 +-
.../artemis/core/transaction/Transaction.java | 2 +-
.../main/resources/schema/artemis-configuration.xsd | 4 ++--
.../artemis/core/filter/impl/FilterTest.java | 2 +-
.../extensions/xa/ActiveMQXAResourceWrapperImpl.java | 2 +-
.../xa/recovery/ActiveMQXAResourceRecovery.java | 4 ++--
.../xa/recovery/ActiveMQXAResourceWrapper.java | 2 +-
.../activemq/cli/test/WebServerComponentTest.java | 16 ++++++++--------
.../org/apache/activemq/broker/BrokerService.java | 8 ++++----
.../integration/clientcrash/ClientCrashTest.java | 2 +-
.../integration/clientcrash/ClientExitTest.java | 2 +-
.../integration/server/SuppliedThreadPoolTest.java | 2 +-
.../netty/NettyConnectorWithHTTPUpgradeTest.java | 4 ++--
.../artemis/jms/tests/ConnectionFactoryTest.java | 4 ++--
.../artemis/jms/tests/MessageConsumerTest.java | 2 +-
.../activemq/artemis/jms/tests/PersistenceTest.java | 8 ++++----
.../apache/activemq/artemis/jms/tests/QueueTest.java | 2 +-
.../artemis/common/testjndi/TestContextFactory.java | 2 +-
.../jms/conform/connection/ConnectionTest.java | 2 +-
.../servers/linuxUpgradeETC/artemis.profile | 2 +-
.../servers/linuxUpgradeETC/logging.properties | 2 +-
.../artemis/tests/soak/client/ClientAbstract.java | 2 +-
110 files changed, 185 insertions(+), 185 deletions(-)
diff --git
a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
index 3539c22fc2..e5a601bc26 100644
--- a/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
+++ b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
@@ -28,7 +28,7 @@ import java.util.Comparator;
import java.util.List;
/**
- * A main class which setups up a classpath and then passes execution off to
the ActiveMQ Artemis cli main.
+ * A main class which setups up a classpath and then passes execution off to
the Apache Artemis cli main.
*/
public class Artemis {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
index c3c2dde7d9..3ab4573b1e 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
@@ -22,7 +22,7 @@ import java.nio.ByteBuffer;
import io.netty.buffer.ByteBuf;
/**
- * An ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout
ActiveMQ Artemis code base.
+ * An ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout
Apache Artemis code base.
* <p>
* Instances of it can be obtained from {@link ActiveMQBuffers} factory.
* <p>
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
index 1b8a3c72d6..c5c8c937e3 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client timed out will connecting to ActiveMQ Artemis server.
+ * A client timed out will connecting to Apache Artemis server.
*/
public final class ActiveMQConnectionTimedOutException extends
ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
index 45a0e7aa1b..4bfbae3c8d 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client was disconnected from ActiveMQ Artemis server when the server has
shut down.
+ * A client was disconnected from Apache Artemis server when the server has
shut down.
*/
public final class ActiveMQDisconnectedException extends ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
index a5b7e1abaf..e03abe8aa7 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * ActiveMQException is the root exception for the ActiveMQ Artemis API.
+ * ActiveMQException is the root exception for the Apache Artemis API.
*/
public class ActiveMQException extends Exception {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
index f5a8935caa..323d42786a 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * An ActiveMQ Artemis resource is not in a legal state (e.g. calling
ClientConsumer.receive() if a MessageHandler is
+ * An Apache Artemis resource is not in a legal state (e.g. calling
ClientConsumer.receive() if a MessageHandler is
* set).
*/
public final class ActiveMQIllegalStateException extends ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
index 9da7d80188..9a9619d5e6 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * Internal error which prevented ActiveMQ Artemis from performing an
important operation.
+ * Internal error which prevented Apache Artemis from performing an important
operation.
*/
public final class ActiveMQInternalErrorException extends ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
index 90a529261c..f78188c3be 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNativeIOError.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * An error has happened at ActiveMQ's native (non-Java) code used in reading
and writing data.
+ * An error has happened in Apache Artemis native (non-Java) code used in
reading and writing data.
*/
public final class ActiveMQNativeIOError extends ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
index 19375a7efd..e84aaa1f77 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A client is not able to connect to ActiveMQ Artemis server.
+ * A client is not able to connect to the Apache Artemis server.
*/
public final class ActiveMQNotConnectedException extends ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
index 377d2c51d8..41492047ba 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core;
/**
- * A packet of unsupported type was received by ActiveMQ Artemis PacketHandler.
+ * A packet of unsupported type was received by Apache Artemis PacketHandler.
*/
public final class ActiveMQUnsupportedPacketException extends
ActiveMQException {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index 4ab391e856..1be958ab6e 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
* A simple String class that can store all characters, and stores as simple
{@code byte[]}, this minimises expensive
* copying between String objects.
* <p>
- * This object is used heavily throughout ActiveMQ Artemis for performance
reasons.
+ * This object is used heavily throughout Apache Artemis for performance
reasons.
*/
public final class SimpleString implements CharSequence, Serializable,
Comparable<SimpleString> {
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
index 14769a6204..2c284a6109 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
@@ -26,7 +26,7 @@ import java.lang.invoke.MethodHandles;
/**
* This class will be used to perform generic class-loader operations, such as
load a class first using TCCL, and then
- * the classLoader used by ActiveMQ Artemis
(ClassloadingUtil.getClass().getClassLoader()).
+ * the classLoader used by Apache Artemis
(ClassloadingUtil.getClass().getClassLoader()).
* <p>
* Is't required to use a Security Block on any calls to this class.
*/
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
index 8d8414d9eb..ac8a78394b 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
@@ -27,7 +27,7 @@ package org.apache.activemq.artemis.utils;
* It could be used for sync points when one process is feeding the latch
while another will wait when everything is
* done. (e.g. waiting IO completions to finish)
* <p>
- * On ActiveMQ Artemis we have the requirement of increment and decrement a
counter until the user fires a ready event
+ * On Apache Artemis we have the requirement of increment and decrement a
counter until the user fires a ready event
* (commit). At that point we just act as a regular countDown.
* <p>
* Note: This latch is reusable. Once it reaches zero, you can call up again,
and reuse it on further waits.
diff --git
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SelectorTranslator.java
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SelectorTranslator.java
index e8c6947807..b8881e610b 100644
---
a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SelectorTranslator.java
+++
b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SelectorTranslator.java
@@ -20,11 +20,11 @@ import java.util.ArrayList;
import java.util.List;
/**
- * This class converts a JMS selector expression into an ActiveMQ Artemis core
filter expression.
+ * This class converts a JMS selector expression into an Apache Artemis core
filter expression.
* <p>
- * JMS selector and ActiveMQ Artemis filters use the same syntax but have
different identifiers.
+ * JMS selector and Apache Artemis filters use the same syntax but have
different identifiers.
* <p>
- * We basically just need to replace the JMS header and property Identifier
names with the corresponding ActiveMQ
+ * We basically just need to replace the JMS header and property Identifier
names with the corresponding Apache
* Artemis field and header Identifier names.
* <p>
* We must be careful not to substitute any literals, or identifiers whose
name contains the name of one we want to
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 3d31bb5cb9..f49da2c223 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * Default values of ActiveMQ Artemis configuration parameters.
+ * Default values of Apache Artemis configuration parameters.
*/
public final class ActiveMQDefaultConfiguration {
@@ -128,7 +128,7 @@ public final class ActiveMQDefaultConfiguration {
// Following fields are generated from the activemq-schema.xsd annotations
// -------------------------------------------------------------------
- // If true then the ActiveMQ Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
+ // If true then the Apache Artemis Server will make use of any Protocol
Managers that are in available on the classpath. If false then only the core
protocol will be available, unless in Embedded mode where users can inject
their own Protocol Managers.
private static boolean DEFAULT_RESOLVE_PROTOCOLS = true;
// true means that the server will load configuration from the
configuration files
@@ -192,10 +192,10 @@ public final class ActiveMQDefaultConfiguration {
// true means that the management API is available via JMX
private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
- // the JMX domain used to registered ActiveMQ Artemis MBeans in the
MBeanServer
+ // the JMX domain used to registered Apache Artemis MBeans in the
MBeanServer
private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq.artemis";
- // the JMX domain used to registered ActiveMQ Artemis MBeans in the
MBeanServer
+ // the JMX domain used to registered Apache Artemis MBeans in the
MBeanServer
private static boolean DEFAULT_JMX_IS_USE_BROKER_NAME = true;
// true means that message counters are enabled
@@ -731,7 +731,7 @@ public final class ActiveMQDefaultConfiguration {
private static final int DEFAULT_CLUSTER_TOPOLOGY_SCANNER_ATTEMPTS = 30;
/**
- * If {@code true} then the ActiveMQ Artemis Server will make use of any
Protocol Managers that are in available on
+ * If {@code true} then the Apache Artemis Server will make use of any
Protocol Managers that are in available on
* the classpath. If false then only the core protocol will be available,
unless in Embedded mode where users can
* inject their own Protocol Managers.
*/
@@ -901,7 +901,7 @@ public final class ActiveMQDefaultConfiguration {
}
/**
- * the JMX domain used to registered ActiveMQ Artemis MBeans in the
MBeanServer
+ * the JMX domain used to registered Apache Artemis MBeans in the
MBeanServer
*/
public static String getDefaultJmxDomain() {
return DEFAULT_JMX_DOMAIN;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
index 97e9525a2c..0d53b19367 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
@@ -17,23 +17,23 @@
package org.apache.activemq.artemis.api.core;
/**
- * Constants representing pre-defined message attributes that can be
referenced in ActiveMQ Artemis core filter
+ * Constants representing pre-defined message attributes that can be
referenced in Apache Artemis core filter
* expressions.
*/
public final class FilterConstants {
/**
- * Name of the ActiveMQ Artemis UserID header.
+ * Name of the Apache Artemis UserID header.
*/
public static final SimpleString ACTIVEMQ_USERID =
SimpleString.of("AMQUserID");
/**
- * Name of the ActiveMQ Artemis Message expiration header.
+ * Name of the Apache Artemis Message expiration header.
*/
public static final SimpleString ACTIVEMQ_EXPIRATION =
SimpleString.of("AMQExpiration");
/**
- * Name of the ActiveMQ Artemis Message durable header.
+ * Name of the Apache Artemis Message durable header.
*/
public static final SimpleString ACTIVEMQ_DURABLE =
SimpleString.of("AMQDurable");
@@ -48,32 +48,32 @@ public final class FilterConstants {
public static final SimpleString DURABLE = SimpleString.of("DURABLE");
/**
- * Name of the ActiveMQ Artemis Message timestamp header.
+ * Name of the Apache Artemis Message timestamp header.
*/
public static final SimpleString ACTIVEMQ_TIMESTAMP =
SimpleString.of("AMQTimestamp");
/**
- * Name of the ActiveMQ Artemis Message priority header.
+ * Name of the Apache Artemis Message priority header.
*/
public static final SimpleString ACTIVEMQ_PRIORITY =
SimpleString.of("AMQPriority");
/**
- * Name of the ActiveMQ Artemis Message size header.
+ * Name of the Apache Artemis Message size header.
*/
public static final SimpleString ACTIVEMQ_SIZE = SimpleString.of("AMQSize");
/**
- * Name of the ActiveMQ Artemis Address header
+ * Name of the Apache Artemis Address header
*/
public static final SimpleString ACTIVEMQ_ADDRESS =
SimpleString.of("AMQAddress");
/**
- * Name of the ActiveMQ Artemis Message group id header.
+ * Name of the Apache Artemis Message group id header.
*/
public static final SimpleString ACTIVEMQ_GROUP_ID =
SimpleString.of("AMQGroupID");
/**
- * All ActiveMQ Artemis headers are prepended by this prefix.
+ * All Apache Artemis headers are prepended by this prefix.
*/
public static final SimpleString ACTIVEMQ_PREFIX = SimpleString.of("AMQ");
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
index ae3ce7d002..644dc659e9 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
@@ -19,9 +19,9 @@ package org.apache.activemq.artemis.api.core;
import org.apache.activemq.artemis.core.protocol.core.Packet;
/**
- * This is class is a simple way to intercepting calls on ActiveMQ Artemis
client and servers.
+ * This is class is a simple way to intercepting calls on Apache Artemis
client and servers.
* <p>
- * To add an interceptor to ActiveMQ Artemis server, you have to modify the
server configuration file
+ * To add an interceptor to Apache Artemis server, you have to modify the
server configuration file
* {@literal broker.xml}.
* <p>
* To add it to a client, use
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
index 4c1bace642..51f0454afd 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
@@ -27,7 +27,7 @@ import java.lang.invoke.MethodHandles;
import org.jgroups.JChannel;
/**
- * This class is the implementation of ActiveMQ Artemis members discovery that
will use JGroups.
+ * This class is the implementation of Apache Artemis members discovery that
will use JGroups.
*/
public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint {
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
index 689bb24dae..6b24dce509 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
@@ -22,7 +22,7 @@ import
org.apache.activemq.artemis.api.core.jgroups.JChannelManager;
import org.jgroups.JChannel;
/**
- * This class is the implementation of ActiveMQ Artemis members discovery that
will use JGroups.
+ * This class is the implementation of Apache Artemis members discovery that
will use JGroups.
*/
public final class JGroupsFileBroadcastEndpoint extends
JGroupsBroadcastEndpoint {
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
index b09777764f..eb6f25025c 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
@@ -330,7 +330,7 @@ public class TransportConfiguration implements Serializable
{
/**
* Encodes this TransportConfiguration into a buffer.
* <p>
- * Note that this is only used internally ActiveMQ Artemis.
+ * Note that this is only used internally Apache Artemis.
*
* @param buffer the buffer to encode into
*/
@@ -351,7 +351,7 @@ public class TransportConfiguration implements Serializable
{
/**
* Decodes this TransportConfiguration from a buffer.
* <p>
- * Note this is only used internally by ActiveMQ
+ * Note this is only used internally by Apache Artemis
*
* @param buffer the buffer to decode from
*/
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index c61195990e..748042f907 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -39,7 +39,7 @@ import
org.apache.activemq.artemis.utils.ActiveMQThreadPoolExecutor;
import org.apache.activemq.artemis.utils.sm.SecurityManagerShim;
/**
- * Utility class for creating ActiveMQ Artemis {@link ClientSessionFactory}
objects.
+ * Utility class for creating Apache Artemis {@link ClientSessionFactory}
objects.
* <p>
* Once a {@link ClientSessionFactory} has been created, it can be further
configured using its setter methods before
* creating the sessions. Once a session is created, the factory can no longer
be modified (its setter methods will
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
index 91e7705e9b..c5953b9705 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
/**
- * A ClientConsumer receives messages from ActiveMQ Artemis queues.
+ * A ClientConsumer receives messages from Apache Artemis queues.
* <p>
* Messages can be consumed synchronously by using the {@code receive()}
methods which will block until a message is
* received (or a timeout expires) or asynchronously by setting a {@link
MessageHandler}.
@@ -33,7 +33,7 @@ import
org.apache.activemq.artemis.spi.core.remoting.ConsumerContext;
public interface ClientConsumer extends AutoCloseable {
/**
- * The server's ID associated with this consumer. ActiveMQ Artemis
implements this as a long but this could be
+ * The server's ID associated with this consumer. Apache Artemis implements
this as a long but this could be
* protocol dependent.
*/
ConsumerContext getConsumerContext();
@@ -64,7 +64,7 @@ public interface ClientConsumer extends AutoCloseable {
ClientMessage receive(long timeout) throws ActiveMQException;
/**
- * Receives a message from a queue. This call will force a network trip to
ActiveMQ Artemis server to ensure that
+ * Receives a message from a queue. This call will force a network trip to
Apache Artemis server to ensure that
* there are no messages in the queue which can be delivered to this
consumer.
* <p>
* This call will never wait indefinitely for a message, it will return
{@code null} if no messages are available for
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
index b6c1287f6c..5fd2ef0a51 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.api.core.ICoreMessage;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
- * A ClientMessage represents a message sent and/or received by ActiveMQ
Artemis.
+ * A ClientMessage represents a message sent and/or received by Apache Artemis.
*/
public interface ClientMessage extends ICoreMessage {
@@ -37,7 +37,7 @@ public interface ClientMessage extends ICoreMessage {
/**
* Sets the delivery count for this message.
* <p>
- * This method is not meant to be called by ActiveMQ Artemis clients.
+ * This method is not meant to be called by Apache Artemis clients.
*
* @param deliveryCount message delivery count
* @return this ClientMessage
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
index 494c239acc..b4ab6f4d0d 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
@@ -21,7 +21,7 @@ import
org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
/**
- * A ClientSessionFactory is the entry point to create and configure ActiveMQ
Artemis resources to produce and consume
+ * A ClientSessionFactory is the entry point to create and configure Apache
Artemis resources to produce and consume
* messages.
* <p>
* It is possible to configure a factory using the setter methods only if no
session has been created. Once a session is
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
index b402ec942e..4965cceaec 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core.management;
/**
- * An ActiveMQComponentControl is used to manage the life cycle of an ActiveMQ
Artemis component.
+ * An ActiveMQComponentControl is used to manage the life cycle of an Apache
Artemis component.
*/
public interface ActiveMQComponentControl {
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 4169cf7898..1c7e1f3646 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
@@ -23,7 +23,7 @@ import
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import
org.apache.activemq.artemis.api.core.ActiveMQAddressDoesNotExistException;
/**
- * An ActiveMQServerControl is used to manage ActiveMQ Artemis servers.
+ * An ActiveMQServerControl is used to manage Apache Artemis servers.
*/
public interface ActiveMQServerControl {
String CONNECTION_COUNT_DESCRIPTION = "Number of clients connected to this
server";
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
index e4d9be8c25..f63a6ea90c 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.message.impl.CoreMessage;
/**
- * Helper class to use ActiveMQ Artemis Core messages to manage server
resources.
+ * Helper class to use Apache Artemis Core messages to manage server resources.
*/
public final class ManagementHelper {
@@ -198,7 +198,7 @@ public final class ManagementHelper {
}
/**
- * Used by ActiveMQ Artemis management service.
+ * Used by Apache Artemis management service.
*/
public static Object[] retrieveOperationParameters(final Message message)
throws Exception {
SimpleString sstring =
message.toCore().getReadOnlyBodyBuffer().readNullableSimpleString();
@@ -228,7 +228,7 @@ public final class ManagementHelper {
}
/**
- * Used by ActiveMQ Artemis management service.
+ * Used by Apache Artemis management service.
*/
public static void storeResult(final CoreMessage message, final Object
result) throws Exception {
String resultString;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
index 4952179d7f..2db7447d4d 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.core.management;
/**
- * Types of notification emitted by ActiveMQ Artemis servers.
+ * Types of notification emitted by Apache Artemis servers.
* <p>
* These notifications can be received through:
* <ul>
@@ -25,7 +25,7 @@ package org.apache.activemq.artemis.api.core.management;
* <li>Core messages to a notification address (default value is {@code
activemq.notifications})
* <li>JMS messages
* </ul>
- * see the ActiveMQ Artemis user manual section on "Management Notifications"
+ * see the Apache Artemis user manual section on "Management Notifications"
*/
public interface NotificationType {
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index 1ef8d0474d..5d6dec53ee 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -23,13 +23,13 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.RoutingType;
/**
- * Helper class to build ObjectNames for ActiveMQ Artemis resources.
+ * Helper class to build ObjectNames for Apache Artemis resources.
*/
public final class ObjectNameBuilder {
/**
- * Default JMX domain for ActiveMQ Artemis resources.
+ * Default JMX domain for Apache Artemis resources.
*/
public static final ObjectNameBuilder DEFAULT = new
ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain(),
"localhost", true);
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
index b6c4092de4..16966060aa 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
@@ -25,27 +25,27 @@ import
org.apache.activemq.artemis.api.core.ActiveMQException;
public interface BodyEncoder {
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
void open() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
void close() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
int encode(ByteBuffer bufferRead) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
int encode(ActiveMQBuffer bufferOut, int size) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
long getLargeBodySize();
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/LargeBodyReader.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/LargeBodyReader.java
index 042314e7da..8445726ee9 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/LargeBodyReader.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/LargeBodyReader.java
@@ -30,37 +30,37 @@ import
org.apache.activemq.artemis.api.core.ActiveMQException;
public interface LargeBodyReader extends AutoCloseable {
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
void open() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
* <p>
* This is the reading position.
*/
void position(long position) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
* <p>
* This is the reading position.
*/
long position();
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
@Override
void close() throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
int readInto(ByteBuffer bufferRead) throws ActiveMQException;
/**
- * This method must not be called directly by ActiveMQ Artemis clients.
+ * This method must not be called directly by Apache Artemis clients.
*/
long getSize() throws ActiveMQException;
}
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
index 30ab0532f6..8ee9e3d822 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
@@ -21,7 +21,7 @@ import
org.apache.activemq.artemis.core.security.ActiveMQPrincipal;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
/**
- * Extension of RemotingConnection for the ActiveMQ Artemis core protocol
+ * Extension of RemotingConnection for the Apache Artemis core protocol
*/
public interface CoreRemotingConnection extends RemotingConnection {
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index 3ea42955ea..ca3ee1a6aa 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -552,7 +552,7 @@ public class ActiveMQSessionContext extends SessionContext {
}
/**
- * ActiveMQ Artemis does support large messages
+ * Apache Artemis does support large messages
*/
@Override
public boolean supportsLargeMessage() {
@@ -1015,7 +1015,7 @@ public class ActiveMQSessionContext extends
SessionContext {
}
/**
- * This doesn't apply to other protocols probably, so it will be an
ActiveMQ Artemis exclusive feature
+ * This doesn't apply to other protocols probably, so it will be an Apache
Artemis exclusive feature
*/
private void handleConsumerDisconnected(DisconnectConsumerMessage packet)
throws ActiveMQException {
DisconnectConsumerMessage message = packet;
diff --git
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 975ee89b60..9e8c21dc33 100644
---
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -68,7 +68,7 @@ import org.apache.activemq.artemis.utils.ClassloadingUtil;
import org.apache.activemq.artemis.utils.sm.SecurityManagerShim;
/**
- * Please note, this class supports PKCS#11 keystores, but there are no
specific tests in the ActiveMQ Artemis
+ * Please note, this class supports PKCS#11 keystores, but there are no
specific tests in the Apache Artemis
* test-suite to validate/verify this works because this requires a
functioning PKCS#11 provider which is not available
* by default (see java.security.Security#getProviders()). The main thing to
keep in mind is that PKCS#11 keystores
* will either use null, and empty string, or NONE for their keystore path.
diff --git
a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
index 8f99fa1f9f..8a9bcd799a 100644
---
a/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
+++
b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
/**
- * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
+ * The JAXB POJOs for the XML configuration of Apache Artemis broker
*/
@javax.xml.bind.annotation.XmlSchema(
namespace = "http://activemq.apache.org/schema";,
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
index da5fa58db8..f23dd86170 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * A utility class for creating ActiveMQ Artemis client-side JMS managed
resources.
+ * A utility class for creating Apache Artemis client-side JMS managed
resources.
*/
public class ActiveMQJMSClient {
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
index 966a5c4a4b..e51e0e5114 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.api.jms;
/**
- * Constants for ActiveMQ Artemis for property keys used for ActiveMQ Artemis
specific extensions to JMS.
+ * Constants for Apache Artemis for property keys used for Apache Artemis
specific extensions to JMS.
*/
public class ActiveMQJMSConstants {
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 2c1668e138..15a00c95ee 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
@@ -24,7 +24,7 @@ import
org.apache.activemq.artemis.api.core.management.ManagementHelper;
import org.apache.activemq.artemis.jms.client.ActiveMQMessage;
/**
- * Helper class to use JMS messages to manage ActiveMQ Artemis server
resources.
+ * Helper class to use JMS messages to manage Apache Artemis server resources.
*/
public class JMSManagementHelper {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index 348ec07e9f..a3a14189ab 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -54,7 +54,7 @@ import static
org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteShor
import static
org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF;
/**
- * ActiveMQ Artemis implementation of a JMS {@link BytesMessage}.
+ * Apache Artemis implementation of a JMS {@link BytesMessage}.
*/
public class ActiveMQBytesMessage extends ActiveMQMessage implements
BytesMessage {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index f5030a2087..dc0e2b9aed 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -59,7 +59,7 @@ import
org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.sm.SecurityManagerShim;
/**
- * ActiveMQ Artemis implementation of a JMS Connection.
+ * Apache Artemis implementation of a JMS Connection.
* <p>
* The flat implementation of {@link TopicConnection} and {@link
QueueConnection} is per design, following the common
* usage of these as one flat API in JMS 1.1.
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index 832f101820..145ebea422 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -64,7 +64,7 @@ import org.apache.activemq.artemis.utils.uri.BeanSupport;
import org.apache.activemq.artemis.utils.uri.URISupport;
/**
- * ActiveMQ Artemis implementation of a JMS ConnectionFactory.
+ * Apache Artemis implementation of a JMS ConnectionFactory.
* <p>
* This connection factory will use defaults defined by {@link
DefaultConnectionProperties}.
*/
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
index 7b1e5f06ef..89770abb81 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
@@ -28,7 +28,7 @@ import java.util.Vector;
import org.apache.activemq.artemis.core.version.Version;
/**
- * ActiveMQ Artemis implementation of a JMS ConnectionMetaData.
+ * Apache Artemis implementation of a JMS ConnectionMetaData.
*/
public class ActiveMQConnectionMetaData implements ConnectionMetaData {
public static final String DEFAULT_PROP_FILE_NAME =
"jms-version.properties";
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 6a866b8322..2a5f8cffee 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.jndi.JNDIStorable;
import org.apache.activemq.artemis.utils.DestinationUtil;
/**
- * ActiveMQ Artemis implementation of a JMS Destination.
+ * Apache Artemis implementation of a JMS Destination.
*/
public class ActiveMQDestination extends JNDIStorable implements Destination,
Serializable {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
index d4f6c952ba..ec8d96eaf2 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
@@ -43,7 +43,7 @@ import javax.transaction.xa.XAResource;
import java.io.Serializable;
/**
- * ActiveMQ Artemis implementation of a JMSContext.
+ * Apache Artemis implementation of a JMSContext.
*/
public class ActiveMQJMSContext implements JMSContext {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index da0bbe8456..94c0304d47 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -34,7 +34,7 @@ import static
org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
/**
- * ActiveMQ Artemis implementation of a JMS MapMessage.
+ * Apache Artemis implementation of a JMS MapMessage.
*/
public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
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 6131982c59..e527bad313 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
@@ -58,7 +58,7 @@ import static
org.apache.activemq.artemis.jms.client.ActiveMQDestination.TEMP_TO
import static
org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_QUALIFIED_PREFIX;
/**
- * ActiveMQ Artemis implementation of a JMS Message.
+ * Apache Artemis implementation of a JMS Message.
* <p>
* JMS Messages only live on the client side - the server only deals with
MessageImpl instances
*/
@@ -260,7 +260,7 @@ public class ActiveMQMessage implements javax.jms.Message {
}
} else {
// Some providers like WSMQ do automatic conversions between native
byte[] correlation id and String
- // correlation id. This makes it impossible for ActiveMQ Artemis to
guarantee to return the correct type as set
+ // correlation id. This makes it impossible for Apache Artemis to
guarantee to return the correct type as set
// by the user. Therefore, we allow the behaviour to be overridden by
a system property.
String corrIDString = foreign.getJMSCorrelationID();
if (corrIDString != null) {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index 4f6a3bd5d2..787fa6fe3b 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -40,7 +40,7 @@ import
org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
import
org.apache.activemq.artemis.jms.client.compatible1X.ActiveMQCompatibleMessage;
/**
- * ActiveMQ Artemis implementation of a JMS MessageConsumer.
+ * Apache Artemis implementation of a JMS MessageConsumer.
*/
public final class ActiveMQMessageConsumer implements QueueReceiver,
TopicSubscriber {
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 68cf2b13e6..a109e67833 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
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * ActiveMQ Artemis implementation of a JMS MessageProducer.
+ * Apache Artemis implementation of a JMS MessageProducer.
*/
public class ActiveMQMessageProducer implements MessageProducer, QueueSender,
TopicPublisher {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 63798c8c45..d65b71160f 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -31,7 +31,7 @@ import
org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
/**
- * ActiveMQ Artemis implementation of a JMS ObjectMessage.
+ * Apache Artemis implementation of a JMS ObjectMessage.
* <p>
* Don't used ObjectMessage if you want good performance!
* <p>
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
index 96e8f44e35..e38395333d 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
- * ActiveMQ Artemis implementation of a JMS Queue.
+ * Apache Artemis implementation of a JMS Queue.
* <p>
* This class can be instantiated directly.
*/
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
index 46b801bf27..f33bec4dc5 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
@@ -32,7 +32,7 @@ import
org.apache.activemq.artemis.jms.client.compatible1X.ActiveMQCompatibleMes
import org.apache.activemq.artemis.utils.SelectorTranslator;
/**
- * ActiveMQ Artemis implementation of a JMS QueueBrowser.
+ * Apache Artemis implementation of a JMS QueueBrowser.
*/
public final class ActiveMQQueueBrowser implements QueueBrowser {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 518dabfe1b..5c41de449f 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -79,7 +79,7 @@ import org.apache.activemq.artemis.utils.CompositeAddress;
import org.apache.activemq.artemis.utils.SelectorTranslator;
/**
- * ActiveMQ Artemis implementation of a JMS {@link Session}.
+ * Apache Artemis implementation of a JMS {@link Session}.
* <p>
* Note that we *do not* support JMS ASF (Application Server Facilities)
optional constructs such as
* {@code ConnectionConsumer}
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 12b28026d5..a4f12c346f 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -42,7 +42,7 @@ import static
org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadSho
import static
org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadString;
/**
- * ActiveMQ Artemis implementation of a JMS StreamMessage.
+ * Apache Artemis implementation of a JMS StreamMessage.
*/
public class ActiveMQStreamMessage extends ActiveMQMessage implements
StreamMessage {
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
index 9cc8748a1f..a2f85fe3ae 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
@@ -20,7 +20,7 @@ import javax.jms.TemporaryQueue;
import java.util.Objects;
/**
- * ActiveMQ Artemis implementation of a JMS TemporaryQueue.
+ * Apache Artemis implementation of a JMS TemporaryQueue.
* <p>
* This class can be instantiated directly.
*/
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index 7c1c579eb7..70d0f4bf89 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -29,7 +29,7 @@ import static
org.apache.activemq.artemis.reader.TextMessageUtil.readBodyText;
import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
/**
- * ActiveMQ Artemis implementation of a JMS TextMessage.
+ * Apache Artemis implementation of a JMS TextMessage.
*/
public class ActiveMQTextMessage extends ActiveMQMessage implements
TextMessage {
@@ -50,7 +50,7 @@ public class ActiveMQTextMessage extends ActiveMQMessage
implements TextMessage
}
/**
- * A copy constructor for non-ActiveMQ Artemis JMS TextMessages.
+ * A copy constructor for non-Apache Artemis JMS TextMessages.
*/
public ActiveMQTextMessage(final TextMessage foreign, final ClientSession
session) throws JMSException {
super(foreign, ActiveMQTextMessage.TYPE, session);
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
index e2436e988c..6c82f66f48 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
@@ -23,7 +23,7 @@ import java.util.Objects;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
- * ActiveMQ Artemis implementation of a JMS Topic.
+ * Apache Artemis implementation of a JMS Topic.
* <p>
* This class can be instantiated directly.
*/
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
index 7b2ef06c9c..025843e15d 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
@@ -27,7 +27,7 @@ import javax.jms.XATopicSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
/**
- * ActiveMQ Artemis implementation of a JMS XAConnection.
+ * Apache Artemis implementation of a JMS XAConnection.
* <p>
* The flat implementation of {@link XATopicConnection} and {@link
XAQueueConnection} is per design, following common
* practices of JMS 1.1.
diff --git
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
index 82146e75ef..bf017ef2d0 100644
---
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
+++
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
@@ -34,7 +34,7 @@ import org.apache.activemq.artemis.uri.JMSConnectionOptions;
import org.apache.activemq.artemis.utils.uri.URISchema;
/**
- * A factory of the ActiveMQ Artemis InitialContext which contains {@link
javax.jms.ConnectionFactory} instances as well
+ * A factory of the Apache Artemis InitialContext which contains {@link
javax.jms.ConnectionFactory} instances as well
* as a child context called <i>destinations</i> which contain all of the
current active destinations, in child context
* depending on the QoS such as transient or durable and queue or topic.
*/
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
index 54762be78a..92aa9c668c 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
@@ -36,7 +36,7 @@ package org.apache.activemq.artemis.jms.bridge;
* <h3>QOS_ONCE_AND_ONLY_ONCE</h3>
* <p>
* This QoS mode ensures messages will reach the destination from the source
once and only once. (Sometimes this mode is
- * known as "exactly once"). If both the source and the destination are on the
same ActiveMQ Artemis server instance
+ * known as "exactly once"). If both the source and the destination are on the
same Apache Artemis server instance
* then this can be achieved by sending and acknowledging the messages in the
same local transaction. If the source and
* destination are on different servers this is achieved by enlisting the
sending and consuming sessions in a JTA
* transaction. The JTA transaction is controlled by JBoss Transactions JTA
implementation which is a fully recovering
diff --git
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 7d775d2698..420818289b 100644
---
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -1615,7 +1615,7 @@ public final class JMSBridgeImpl implements JMSBridge {
Object val = entry.getValue();
if (val instanceof byte[] == false) {
- //Can't set byte[] array props through the JMS API - if we're
bridging an ActiveMQ Artemis message it might have such props
+ //Can't set byte[] array props through the JMS API - if we're
bridging an Apache Artemis message it might have such props
msg.setObjectProperty(propName, entry.getValue());
} else if (msg instanceof ActiveMQMessage activeMQMessage) {
activeMQMessage.getCoreMessage().putBytesProperty(propName,
(byte[]) val);
diff --git
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
index 0d95b63588..736f77c320 100644
---
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
+++
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java
@@ -24,9 +24,9 @@ import
org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.junit.rules.ExternalResource;
/**
- * A JUnit Rule that embeds an ActiveMQ Artemis ClientConsumer into a test.
This JUnit Rule is designed to simplify
- * using ActiveMQ Artemis clients in unit tests. Adding the rule to a test
will startup a ClientConsumer, which can then
- * be used to consume messages from an ActiveMQ Artemis server.
+ * A JUnit Rule that embeds an Apache Artemis ClientConsumer into a test. This
JUnit Rule is designed to simplify
+ * using Apache Artemis clients in unit tests. Adding the rule to a test will
startup a ClientConsumer, which can then
+ * be used to consume messages from an Apache Artemis server.
*
* <pre>{@code
* public class SimpleTest {
diff --git
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
index 720418d46f..b65605ffa9 100644
---
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
+++
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
@@ -24,9 +24,9 @@ import
org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.junit.rules.ExternalResource;
/**
- * A JUnit Rule that embeds an dynamic (i.e. unbound) ActiveMQ Artemis
ClientProducer into a test. This JUnit Rule is
- * designed to simplify using ActiveMQ Artemis clients in unit tests. Adding
the rule to a test will startup an unbound
- * ClientProducer, which can then be used to feed messages to any address on
the ActiveMQ Artemis server.
+ * A JUnit Rule that embeds an dynamic (i.e. unbound) Apache Artemis
ClientProducer into a test. This JUnit Rule is
+ * designed to simplify using Apache Artemis clients in unit tests. Adding the
rule to a test will startup an unbound
+ * ClientProducer, which can then be used to feed messages to any address on
the Apache Artemis server.
*
* <pre>{@code
* public class SimpleTest {
diff --git
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
index dbf4d97ed9..331b4146b8 100644
---
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
+++
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
@@ -24,12 +24,12 @@ import
org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.junit.rules.ExternalResource;
/**
- * A JUnit Rule that embeds an ActiveMQ Artemis ClientProducer bound to a
specific address into a
+ * A JUnit Rule that embeds an Apache Artemis ClientProducer bound to a
specific address into a
* test.
* <p>
- * This JUnit Rule is designed to simplify using ActiveMQ Artemis clients in
unit tests. Adding the
+ * This JUnit Rule is designed to simplify using Apache Artemis clients in
unit tests. Adding the
* rule to a test will startup a ClientProducer, which can then be used to
feed messages to the
- * bound address on an ActiveMQ Artemis server.
+ * bound address on an Apache Artemis server.
*
* <pre>{@code
* public class SimpleTest {
diff --git
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
index e94bca43d8..41691b3b7b 100644
---
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
+++
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A JUnit Rule that embeds an ActiveMQ Artemis server into a test. This JUnit
Rule is designed to simplify using
+ * A JUnit Rule that embeds an Apache Artemis server into a test. This JUnit
Rule is designed to simplify using
* embedded servers in unit tests. Adding the rule to a test will startup an
embedded server, which can then be used by
* client applications.
*
@@ -106,7 +106,7 @@ public class EmbeddedActiveMQResource extends
ExternalResource implements Embedd
}
/**
- * Invoked by JUnit to setup the resource - start the embedded ActiveMQ
Artemis server
+ * Invoked by JUnit to setup the resource - start the embedded Apache
Artemis server
*/
@Override
protected void before() throws Throwable {
@@ -118,7 +118,7 @@ public class EmbeddedActiveMQResource extends
ExternalResource implements Embedd
}
/**
- * Invoked by JUnit to tear down the resource - stops the embedded ActiveMQ
Artemis server
+ * Invoked by JUnit to tear down the resource - stops the embedded Apache
Artemis server
*/
@Override
protected void after() {
diff --git
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
index ddaea2dc9c..14b26c3f44 100644
---
a/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
+++
b/artemis-junit/artemis-junit-4/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
/**
* Deprecated in favor of EmbeddedActiveMQResource. Since Artemis 2.0 all JMS
specific broker management classes,
* interfaces, and methods have been deprecated in favor of their more general
counter-parts. A JUnit Rule that embeds
- * an ActiveMQ Artemis JMS server into a test. This JUnit Rule is designed to
simplify using embedded servers in unit
+ * an Apache Artemis JMS server into a test. This JUnit Rule is designed to
simplify using embedded servers in unit
* tests. Adding the rule to a test will startup an embedded JMS server, which
can then be used by client applications.
*
* <pre>{@code
diff --git
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerExtension.java
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerExtension.java
index 6817f7ca3d..27f50cddda 100644
---
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerExtension.java
+++
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerExtension.java
@@ -26,10 +26,10 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
/**
- * A JUnit Extension that embeds an ActiveMQ Artemis ClientConsumer into a
test.
+ * A JUnit Extension that embeds an Apache Artemis ClientConsumer into a test.
* <p>
- * This JUnit Extension is designed to simplify using ActiveMQ Artemis clients
in unit tests. Adding the extension to a
- * test will startup a ClientConsumer, which can then be used to consume
messages from an ActiveMQ Artemis server.
+ * This JUnit Extension is designed to simplify using Apache Artemis clients
in unit tests. Adding the extension to a
+ * test will startup a ClientConsumer, which can then be used to consume
messages from an Apache Artemis server.
*
* <pre>{@code
* public class SimpleTest {
diff --git
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerExtension.java
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerExtension.java
index 9e173b077f..eed94f1012 100644
---
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerExtension.java
+++
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerExtension.java
@@ -26,9 +26,9 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
/**
- * A JUnit Extension that embeds an dynamic (i.e. unbound) ActiveMQ Artemis
ClientProducer into a test.
+ * A JUnit Extension that embeds an dynamic (i.e. unbound) Apache Artemis
ClientProducer into a test.
* <p>
- * This JUnit Extension is designed to simplify using ActiveMQ Artemis clients
in unit tests. Adding the extension to a
+ * This JUnit Extension is designed to simplify using Apache Artemis clients
in unit tests. Adding the extension to a
* test will startup an unbound ClientProducer, which can then be used to feed
messages to any address on the ActiveMQ
* Artemis server.
*
diff --git
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerExtension.java
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerExtension.java
index 3d7b023891..99e3f46f90 100644
---
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerExtension.java
+++
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerExtension.java
@@ -26,9 +26,9 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
/**
- * A JUnit Extension that embeds an ActiveMQ Artemis ClientProducer bound to a
specific address into a test.
+ * A JUnit Extension that embeds an Apache Artemis ClientProducer bound to a
specific address into a test.
* <p>
- * This JUnit Extension is designed to simplify using ActiveMQ Artemis clients
in unit tests. Adding the extension to a
+ * This JUnit Extension is designed to simplify using Apache Artemis clients
in unit tests. Adding the extension to a
* test will startup a ClientProducer, which can then be used to feed messages
to the bound address on an ActiveMQ
* Artemis server.
*
diff --git
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQExtension.java
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQExtension.java
index 363fe4b0ad..a3643dfdcf 100644
---
a/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQExtension.java
+++
b/artemis-junit/artemis-junit-5/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQExtension.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A JUnit Extension that embeds an ActiveMQ Artemis server into a test.
+ * A JUnit Extension that embeds an Apache Artemis server into a test.
* <p>
* This JUnit Extension is designed to simplify using embedded servers in unit
tests. Adding the extension to a test will startup
* an embedded server, which can then be used by client applications.
@@ -100,7 +100,7 @@ public class EmbeddedActiveMQExtension implements
BeforeAllCallback, AfterAllCal
}
/**
- * Invoked by JUnit to setup the resource - start the embedded ActiveMQ
Artemis server
+ * Invoked by JUnit to setup the resource - start the embedded Apache
Artemis server
*/
@Override
public void beforeAll(ExtensionContext context) throws Exception {
@@ -111,7 +111,7 @@ public class EmbeddedActiveMQExtension implements
BeforeAllCallback, AfterAllCal
}
/**
- * Invoked by JUnit to tear down the resource - stops the embedded ActiveMQ
Artemis server
+ * Invoked by JUnit to tear down the resource - stops the embedded Apache
Artemis server
*/
@Override
public void afterAll(ExtensionContext context) throws Exception {
diff --git
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerDelegate.java
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerDelegate.java
index eb226b48e9..25262d07fa 100644
---
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerDelegate.java
+++
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerDelegate.java
@@ -25,7 +25,7 @@ import
org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.api.core.RoutingType;
/**
- * Base class to embed an ActiveMQ Artemis ClientConsumer into a test.
+ * Base class to embed an Apache Artemis ClientConsumer into a test.
*/
public class ActiveMQConsumerDelegate extends AbstractActiveMQClientDelegate
implements ActiveMQConsumerOperations {
diff --git
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerDelegate.java
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerDelegate.java
index d23b6a685a..f9b2cd11e9 100644
---
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerDelegate.java
+++
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerDelegate.java
@@ -25,7 +25,7 @@ import
org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
/**
- * Base class to embed an dynamic (i.e. unbound) ActiveMQ Artemis
ClientProducer into a test.
+ * Base class to embed an dynamic (i.e. unbound) Apache Artemis ClientProducer
into a test.
*/
public class ActiveMQDynamicProducerDelegate extends ActiveMQProducerDelegate
implements ActiveMQDynamicProducerOperations {
diff --git
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerDelegate.java
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerDelegate.java
index e067f27cf8..b9d34436ee 100644
---
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerDelegate.java
+++
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerDelegate.java
@@ -26,7 +26,7 @@ import
org.apache.activemq.artemis.api.core.client.ClientProducer;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
/**
- * Base class to embed an ActiveMQ Artemis ClientProducer bound to a specific
address into a test.
+ * Base class to embed an Apache Artemis ClientProducer bound to a specific
address into a test.
*/
public class ActiveMQProducerDelegate extends AbstractActiveMQClientDelegate
implements ActiveMQProducerOperations {
diff --git
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java
index f1e469a849..e8b5c76823 100644
---
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java
+++
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQDelegate.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * Base class to embed an ActiveMQ Artemis server into a test.
+ * Base class to embed an Apache Artemis server into a test.
*/
public class EmbeddedActiveMQDelegate implements EmbeddedActiveMQOperations {
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQOperations.java
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQOperations.java
index 732aa0c698..a00341088a 100644
---
a/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQOperations.java
+++
b/artemis-junit/artemis-junit-commons/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQOperations.java
@@ -27,13 +27,13 @@ import
org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
public interface EmbeddedActiveMQOperations {
/**
- * Start the embedded ActiveMQ Artemis server. The server will normally be
started by JUnit using the before()
+ * Start the embedded Apache Artemis server. The server will normally be
started by JUnit using the before()
* method. This method allows the server to be started manually to support
advanced testing scenarios.
*/
void start();
/**
- * Stop the embedded ActiveMQ Artemis server The server will normally be
stopped by JUnit using the after() method.
+ * Stop the embedded Apache Artemis server The server will normally be
stopped by JUnit using the after() method.
* This method allows the server to be stopped manually to support advanced
testing scenarios.
*/
void stop();
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
index ad514e1d1e..624ee6ecd1 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This is a Server's Connection representation used by ActiveMQ Artemis.
+ * This is a Server's Connection representation used by Apache Artemis.
*/
public class ActiveMQProtonRemotingConnection extends
AbstractRemotingConnection {
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java
index b5f682a717..c892324940 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
import java.lang.invoke.MethodHandles;
/**
- * A proton protocol manager, basically reads the Proton Input and maps proton
resources to ActiveMQ Artemis resources
+ * A proton protocol manager, basically reads the Proton Input and maps proton
resources to Apache Artemis resources
*/
public class ProtonProtocolManager extends
AbstractProtocolManager<AMQPMessage, AmqpInterceptor,
ActiveMQProtonRemotingConnection, AMQPRoutingHandler> implements
NotificationListener {
diff --git
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
index d8c738ba50..428cf8aee6 100644
---
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
+++
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerSenderContext.java
@@ -216,7 +216,7 @@ public class ProtonServerSenderContext extends
ProtonInitializable implements Pr
}
/**
- * Create the actual underlying ActiveMQ Artemis Server Consumer
+ * Create the actual underlying Apache Artemis Server Consumer
*/
@Override
public void initialize() throws Exception {
@@ -457,7 +457,7 @@ public class ProtonServerSenderContext extends
ProtonInitializable implements Pr
}
/**
- * handle an out going message from ActiveMQ Artemis, send via the Proton
Sender
+ * handle an out going message from Apache Artemis, send via the Proton
Sender
*/
public int deliverMessage(final MessageReference messageReference, final
ServerConsumer consumer) throws Exception {
if (closed) {
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
index 185d6b442e..32c9269062 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
@@ -325,7 +325,7 @@ public class StompDecoder {
// trim off leading whitespace from header values.
// The STOMP spec examples seem to imply that whitespace
should be trimmed although it is not
// explicit in the spec
- // ActiveMQ Artemis + StompConnect also seem to trim
whitespace from header values.
+ // Apache Artemis + StompConnect also seem to trim
whitespace from header values.
// Trimming is problematic though if the user has set a
header with a value which deliberately
// has
// leading whitespace since
diff --git
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
index 30e5285db5..8d21e481a8 100644
---
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
+++
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
@@ -19,9 +19,9 @@ package org.apache.activemq.artemis.core.protocol.stomp;
import org.apache.activemq.artemis.api.core.BaseInterceptor;
/**
- * This class is a simple way to intercepting client calls on ActiveMQ Artemis
using STOMP protocol.
+ * This class is a simple way to intercepting client calls on Apache Artemis
using STOMP protocol.
* <p>
- * To add an interceptor to ActiveMQ Artemis server, you have to modify the
server configuration file
+ * To add an interceptor to Apache Artemis server, you have to modify the
server configuration file
* {@literal broker.xml}.
*/
public interface StompFrameInterceptor extends BaseInterceptor<StompFrame> {
diff --git
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
index bb76a1fc20..27a59976ae 100644
---
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
+++
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
@@ -22,7 +22,7 @@ import javax.management.ObjectName;
import java.util.Set;
/**
- * An ActiveMQRAService ensures that ActiveMQ Artemis Resource Adapter will be
stopped *before* the ActiveMQ Artemis
+ * An ActiveMQRAService ensures that Apache Artemis Resource Adapter will be
stopped *before* the ActiveMQ Artemis
* server.
*/
public class ActiveMQRAService {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index d3554feabb..8a892f6598 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -56,7 +56,7 @@ import
org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings;
/**
- * A Configuration is used to configure ActiveMQ Artemis servers.
+ * A Configuration is used to configure Apache Artemis servers.
*/
public interface Configuration {
@@ -292,7 +292,7 @@ public interface Configuration {
/**
* Sets the domain used by JMX MBeans (provided JMX management is enabled).
* <p>
- * Changing this JMX domain is required if multiple ActiveMQ Artemis
servers are run inside the same JVM and all
+ * Changing this JMX domain is required if multiple Apache Artemis servers
are run inside the same JVM and all
* servers are using the same MBeanServer.
*/
Configuration setJMXDomain(String domain);
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index dafd9d91de..30bb6c3a54 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -39,9 +39,9 @@ import java.util.Objects;
import static
org.apache.activemq.artemis.api.core.FilterConstants.NATIVE_MESSAGE_ID;
/**
- * This class implements an ActiveMQ Artemis filter
+ * This class implements an Apache Artemis filter
* <p>
- * ActiveMQ Artemis filters have the same syntax as JMS 1.1 selectors, but the
identifiers are different.
+ * Apache Artemis filters have the same syntax as JMS 1.1 selectors, but the
identifiers are different.
* <p>
* Valid identifiers that can be used are:
* <ul>
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
index 54a51dbc2f..55775c5b53 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
@@ -160,7 +160,7 @@ public interface PagingStore extends ActiveMQComponent,
RefCountMessageListener
* Remove the first page from the Writing Queue. The file will still exist
until Page.delete is called, So, case the
* system is reloaded the same Page will be loaded back if delete is not
called.
*
- * @throws Exception Note: This should still be part of the interface, even
though ActiveMQ Artemis only uses through
+ * @throws Exception Note: This should still be part of the interface, even
though Apache Artemis only uses through
* the
*/
Page depage() throws Exception;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index a9dcb7d8ca..544b329e2e 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -1226,7 +1226,7 @@ public class PagingStoreImpl implements PagingStore {
returnPage.delete(null);
// This will trigger this address to exit the page mode,
- // and this will make ActiveMQ Artemis start using the journal
again
+ // and this will make Apache Artemis start using the journal
again
return null;
} else {
// We need to create a new page, as we can't lock the address
until we finish depaging.
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
index c55dce1f40..c0bb9d2874 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
@@ -64,7 +64,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The ActiveMQ Artemis SecurityStore implementation
+ * The Apache Artemis SecurityStore implementation
*/
public class SecurityStoreImpl implements SecurityStore,
HierarchicalRepositoryChangeListener {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index 47e645ac13..d6b0662a7b 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -87,7 +87,7 @@ import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
/**
- * This interface defines the internal interface of the ActiveMQ Artemis
Server exposed to other components of the
+ * This interface defines the internal interface of the Apache Artemis Server
exposed to other components of the
* server.
* <p>
* This is not part of our public API.
@@ -196,7 +196,7 @@ public interface ActiveMQServer extends ServiceComponent {
IOCriticalErrorListener getIoCriticalErrorListener();
/**
- * {@return the resource to manage this ActiveMQ Artemis server}
+ * {@return the resource to manage this Apache Artemis server}
*
* @throws IllegalStateException if the server is not properly started.
*/
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
index 46b8c77088..19fd9d27ea 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
@@ -33,7 +33,7 @@ import
org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
/**
- * Helper class to simplify bootstrap of ActiveMQ Artemis server. Bootstraps
from classpath-based config files.
+ * Helper class to simplify bootstrap of Apache Artemis server. Bootstraps
from classpath-based config files.
*/
public class EmbeddedActiveMQ {
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 98feca733d..0d43413323 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -230,7 +230,7 @@ import static java.util.stream.Collectors.groupingBy;
import static
org.apache.activemq.artemis.utils.collections.IterableStream.iterableOf;
/**
- * The ActiveMQ Artemis server implementation
+ * The Apache Artemis server implementation
*/
public class ActiveMQServerImpl implements ActiveMQServer {
@@ -3194,7 +3194,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
{
}
/**
- * Sets up ActiveMQ Artemis Executor Services.
+ * Sets up Apache Artemis Executor Services.
*/
private void initializeExecutorServices() {
int maxIoThreads = configuration.getPageMaxConcurrentIO() <= 0 ?
Integer.MAX_VALUE : configuration.getPageMaxConcurrentIO();
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 438b683381..c6dc608a1a 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -50,7 +50,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
private ScheduledExecutorService scheduledExecutorService;
/*
- * We are using a List rather than HashMap here as ActiveMQ Artemis allows
multiple instances of the same class to be added
+ * We are using a List rather than HashMap here as Apache Artemis allows
multiple instances of the same class to be added
* to the interceptor list
*/
private List<BaseInterceptor> incomingInterceptors;
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
index 716c80fe0a..34db5fa778 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/transaction/Transaction.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.server.impl.AckReason;
import org.apache.activemq.artemis.core.server.impl.RefsOperation;
/**
- * An ActiveMQ Artemis internal transaction
+ * An Apache Artemis internal transaction
*/
public interface Transaction {
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index fd9fbe07c6..0cf7e94fa3 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -68,7 +68,7 @@
minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- If true then the ActiveMQ Artemis Server will make use of
any Protocol Managers that are in available
+ If true then the Apache Artemis Server will make use of any
Protocol Managers that are in available
on the classpath. If false then only the core protocol will
be available, unless in Embedded mode
where users can inject their own Protocol Managers.
</xsd:documentation>
@@ -255,7 +255,7 @@
<xsd:element name="jmx-domain" type="xsd:string"
default="org.apache.activemq" maxOccurs="1" minOccurs="0">
<xsd:annotation>
<xsd:documentation>
- the JMX domain used to registered ActiveMQ Artemis MBeans in
the MBeanServer
+ the JMX domain used to registered Apache Artemis MBeans in
the MBeanServer
</xsd:documentation>
</xsd:annotation>
</xsd:element>
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
index 6dc639df14..f35de2d88c 100644
---
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
- * Tests the compliance with the ActiveMQ Artemis Filter syntax.
+ * Tests the compliance with the Apache Artemis Filter syntax.
*/
public class FilterTest extends SilentTestCase {
diff --git
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
index e4071635d6..53962e6eb7 100644
---
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
+++
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/ActiveMQXAResourceWrapperImpl.java
@@ -37,7 +37,7 @@ public class ActiveMQXAResourceWrapperImpl implements
ActiveMQXAResourceWrapper
/**
* Creates a new XAResourceWrapper. PRODUCT_NAME, productVersion and
jndiName are useful for log output in the
- * Transaction Manager. For ActiveMQ Artemis only the resourceManagerID is
required to allow Transaction Manager to
+ * Transaction Manager. For Apache Artemis only the resourceManagerID is
required to allow Transaction Manager to
* recover from relevant recovery scenarios.
*/
public ActiveMQXAResourceWrapperImpl(XAResource xaResource, Map<String,
Object> properties) {
diff --git
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
index 1f75aa441c..69fc540953 100644
---
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
+++
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
@@ -37,13 +37,13 @@ import java.lang.invoke.MethodHandles;
*
value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory"/>
* </pre>
* <p>
- * you'll need something like this if the ActiveMQ Artemis Server is remote
+ * you'll need something like this if the Apache Artemis Server is remote
* <pre>
* <property
name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
*
value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616"/>
* </pre>
* <p>
- * you'll need something like this if the ActiveMQ Artemis Server is remote
and has failover configured
+ * you'll need something like this if the Apache Artemis Server is remote and
has failover configured
* <pre>
* <property
name="com.arjuna.ats.jta.recovery.XAResourceRecovery.ACTIVEMQ2"
*
value="org.apache.activemq.artemis.jms.server.recovery.ActiveMQXAResourceRecovery;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost,port=61616;org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnectorFactory,guest,guest,host=localhost2,port=61617"/>
diff --git
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
index d48e8fc74f..ee3c9dd485 100644
---
a/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
+++
b/artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
@@ -39,7 +39,7 @@ import java.lang.invoke.MethodHandles;
* Mainly from org.jboss.server.XAResourceWrapper from the JBoss AS server
module
* <p>
* The reason why we don't use that class directly is that it assumes on
failure of connection the RM_FAIL or RM_ERR is
- * thrown, but in ActiveMQ Artemis we throw XA_RETRY since we want the
recovery manager to be able to retry on failure
+ * thrown, but in Apache Artemis we throw XA_RETRY since we want the recovery
manager to be able to retry on failure
* without having to manually retry
*/
public class ActiveMQXAResourceWrapper implements XAResource,
SessionFailureListener {
diff --git
a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
index d2b512f6e4..1f56dad6bd 100644
---
a/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
+++
b/artemis-web/src/test/java/org/apache/activemq/cli/test/WebServerComponentTest.java
@@ -538,11 +538,11 @@ public class WebServerComponentTest extends
ArtemisTestCase {
return true;
};
- // check server certificate contains ActiveMQ Artemis Server
+ // check server certificate contains Apache Artemis Server
assertTrue(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("CN=ActiveMQ
Artemis Server,"));
- // check server certificate doesn't contain ActiveMQ Artemis Server
+ // check server certificate doesn't contain Apache Artemis Server
assertFalse(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("CN=ActiveMQ
Artemis Other Server,"));
@@ -550,11 +550,11 @@ public class WebServerComponentTest extends
ArtemisTestCase {
Files.copy(WebServerComponentTest.class.getClassLoader().getResourceAsStream("other-server-keystore.p12"),
keyStoreFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
- // check server certificate contains ActiveMQ Artemis Other Server
+ // check server certificate contains Apache Artemis Other Server
Wait.assertTrue(() -> testSimpleSecureServer("localhost", port,
"localhost", null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("CN=ActiveMQ
Artemis Other Server,"));
- // check server certificate doesn't contain ActiveMQ Artemis Server
+ // check server certificate doesn't contain Apache Artemis Server
assertFalse(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("CN=ActiveMQ
Artemis Server,"));
} finally {
@@ -629,11 +629,11 @@ public class WebServerComponentTest extends
ArtemisTestCase {
return true;
};
- // check server certificate contains ActiveMQ Artemis Server
+ // check server certificate contains Apache Artemis Server
assertTrue(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("DNSName:
server.artemis.activemq"));
- // check server certificate doesn't contain ActiveMQ Artemis Server
+ // check server certificate doesn't contain Apache Artemis Server
assertFalse(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("DNSName:
other-server.artemis.activemq"));
@@ -644,11 +644,11 @@ public class WebServerComponentTest extends
ArtemisTestCase {
Files.copy(WebServerComponentTest.class.getClassLoader().getResourceAsStream("other-server-cert.pem"),
serverCertFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
- // check server certificate contains ActiveMQ Artemis Other Server
+ // check server certificate contains Apache Artemis Other Server
Wait.assertTrue(() -> testSimpleSecureServer("localhost", port,
"localhost", null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("DNSName:
other-server.artemis.activemq"));
- // check server certificate doesn't contain ActiveMQ Artemis Server
+ // check server certificate doesn't contain Apache Artemis Server
assertFalse(testSimpleSecureServer("localhost", port, "localhost",
null, hostnameVerifier) == 200 &&
sslSessionReference.get().getPeerCertificates()[0].toString().contains("DNSName:
server.artemis.activemq"));
} finally {
diff --git
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
index 51fb4350ef..79ccc203d8 100644
---
a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
+++
b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/BrokerService.java
@@ -174,7 +174,7 @@ public class BrokerService implements Service {
broker = getBroker();
brokerId = broker.getBrokerId();
- LOG.info("Apache ActiveMQ Artemis Wrapper {} ({}, {}) is starting", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
+ LOG.info("Apache Apache Artemis Wrapper {} ({}, {}) is starting", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
try {
broker.start();
@@ -184,7 +184,7 @@ public class BrokerService implements Service {
throw new Exception(t);
}
- LOG.info("Apache ActiveMQ Artemis Wrapper {} ({}, {}) started", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
+ LOG.info("Apache Apache Artemis Wrapper {} ({}, {}) started", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
LOG.info("For help or more information please see:
http://activemq.apache.org";);
}
@@ -193,14 +193,14 @@ public class BrokerService implements Service {
public void stop() throws Exception {
System.out.println("broker is: " + broker);
- LOG.info("Apache ActiveMQ Artemis{} ({}, {}) is shutting down", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
+ LOG.info("Apache Apache Artemis{} ({}, {}) is shutting down", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
if (broker != null) {
broker.stop();
broker = null;
}
tmpfolder.delete();
- LOG.info("Apache ActiveMQ Artemis {} ({}, {}) is shutdown", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
+ LOG.info("Apache Apache Artemis {} ({}, {}) is shutdown", new
Object[]{getBrokerVersion(), getBrokerName(), brokerId});
}
// Properties
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 822f53a660..890c212069 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -44,7 +44,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A test that makes sure that an ActiveMQ Artemis server cleans up the
associated resources when one of its client
+ * A test that makes sure that an Apache Artemis server cleans up the
associated resources when one of its client
* crashes.
*/
public class ClientCrashTest extends ClientTestBase {
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index 6b5a457e97..8d219dba09 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A test that makes sure that an ActiveMQ Artemis client gracefully exists
after the last session is closed.
+ * A test that makes sure that an Apache Artemis client gracefully exists
after the last session is closed.
* <p>
* This is not technically a crash test, but it uses the same type of topology
as the crash tests (local server, remote
* VM client).
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
index e208409cb4..df7f959322 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
@@ -92,7 +92,7 @@ public class SuppliedThreadPoolTest extends ActiveMQTestBase {
assertNotNull(threadPool);
assertNotNull(scheduledExecutorService);
- // Ensure that ActiveMQ Artemis does not shutdown supplied thread pools.
+ // Ensure that Apache Artemis does not shutdown supplied thread pools.
assertFalse(threadPool.isShutdown());
assertFalse(scheduledExecutorService.isShutdown());
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
index ba17a06c8b..e8df611f7c 100644
---
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/transports/netty/NettyConnectorWithHTTPUpgradeTest.java
@@ -141,7 +141,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends
ActiveMQTestBase {
locator = ActiveMQClient.createServerLocatorWithoutHA(new
TransportConfiguration(NETTY_CONNECTOR_FACTORY, httpConnectorParams));
addServerLocator(locator);
- // THe web server owns the HTTP port, not ActiveMQ Artemis.
+ // THe web server owns the HTTP port, not Apache Artemis.
startWebServer(HTTP_PORT);
}
@@ -240,7 +240,7 @@ public class NettyConnectorWithHTTPUpgradeTest extends
ActiveMQTestBase {
p.addLast("decoder", new HttpRequestDecoder());
p.addLast("encoder", new HttpResponseEncoder());
p.addLast("http-upgrade-handler", new
SimpleChannelInboundHandler<>() {
- // handle HTTP GET + Upgrade with a handshake specific to
ActiveMQ Artemis remoting.
+ // handle HTTP GET + Upgrade with a handshake specific to
Apache Artemis remoting.
@Override
protected void channelRead0(ChannelHandlerContext ctx, Object
msg) throws Exception {
if (msg instanceof HttpRequest request) {
diff --git
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
index 44c1eda846..2b4ebabf1d 100644
---
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
+++
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
@@ -114,7 +114,7 @@ public class ConnectionFactoryTest extends JMSTestCase {
@Test
public void testNoClientIDConfigured_1() throws Exception {
- // the ConnectionFactories that ship with ActiveMQ Artemis do not have
their clientID
+ // the ConnectionFactories that ship with Apache Artemis do not have
their clientID
// administratively configured.
deployConnectionFactory(0, JMSFactoryType.TOPIC_CF, "CF_XA_FALSE",
"/CF_XA_FALSE");
@@ -129,7 +129,7 @@ public class ConnectionFactoryTest extends JMSTestCase {
@Test
public void testNoClientIDConfigured_2() throws Exception {
- // the ConnectionFactories that ship with ActiveMQ Artemis do not have
their clientID
+ // the ConnectionFactories that ship with Apache Artemis do not have
their clientID
// administratively configured.
deployConnectionFactory(0, JMSFactoryType.TOPIC_CF, "CF_XA_FALSE",
"/CF_XA_FALSE");
diff --git
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index 4011ba1c2a..24b164402f 100644
---
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
+++
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -406,7 +406,7 @@ public class MessageConsumerTest extends JMSTestCase {
// It will be available some indeterminate time later.
// This is fine and as per spec.
// To implement receiveNoWait otherwise would be very costly
- // Also other messaging systems e.g. Sun, ActiveMQ Artemis implement
it this way
+ // Also other messaging systems e.g. Sun, Apache Artemis implement it
this way
Thread.sleep(500);
diff --git
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
index 1f9295a7c8..0aa1d99b2a 100644
---
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
+++
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/PersistenceTest.java
@@ -57,7 +57,7 @@ public class PersistenceTest extends JMSTestCase {
startNoDelete();
- // ActiveMQ Artemis server restart implies new ConnectionFactory
lookup
+ // Apache Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -137,7 +137,7 @@ public class PersistenceTest extends JMSTestCase {
startNoDelete();
- // ActiveMQ Artemis server restart implies new ConnectionFactory
lookup
+ // Apache Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -202,7 +202,7 @@ public class PersistenceTest extends JMSTestCase {
startNoDelete();
- // ActiveMQ Artemis server restart implies new ConnectionFactory
lookup
+ // Apache Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
@@ -463,7 +463,7 @@ public class PersistenceTest extends JMSTestCase {
startNoDelete();
- // ActiveMQ Artemis server restart implies new ConnectionFactory
lookup
+ // Apache Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
diff --git
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
index 52dd3616a0..edfffb4b08 100644
---
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
+++
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/QueueTest.java
@@ -81,7 +81,7 @@ public class QueueTest extends JMSTestCase {
startNoDelete();
- // ActiveMQ Artemis server restart implies new ConnectionFactory lookup
+ // Apache Artemis server restart implies new ConnectionFactory lookup
deployAndLookupAdministeredObjects();
conn = createConnection();
diff --git
a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContextFactory.java
b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContextFactory.java
index ea59df1357..95478b4c53 100644
---
a/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContextFactory.java
+++
b/tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/testjndi/TestContextFactory.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.jndi.LazyCreateContext;
import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
/**
- * A factory of the ActiveMQ Artemis InitialContext which contains {@link
ConnectionFactory} instances as well as a
+ * A factory of the Apache Artemis InitialContext which contains {@link
ConnectionFactory} instances as well as a
* child context called
* <i>destinations</i> which contain all of the current active destinations, in
* child context depending on the QoS such as transient or durable and queue
or topic.
diff --git
a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
index 9048c2cc06..11dd34d12f 100644
---
a/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
+++
b/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/conform/connection/ConnectionTest.java
@@ -44,7 +44,7 @@ public class ConnectionTest extends PTPTestCase {
receiverSession = receiverConnection.createQueueSession(false,
Session.CLIENT_ACKNOWLEDGE);
receiver.close(); // Before assigning a new receiver, we need to
close the old one...
// Not closing it could cause load balancing between receivers.
- // Not having this close might be valid for JORAM or JBossMQ, but
it's not valid for ActiveMQ Artemis (and still legal)
+ // Not having this close might be valid for JORAM or JBossMQ, but
it's not valid for Apache Artemis (and still legal)
receiver = receiverSession.createReceiver(receiverQueue);
receiverConnection.start();
diff --git
a/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/artemis.profile
b/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/artemis.profile
index 24f8ccf642..704e51cdfc 100644
---
a/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/artemis.profile
+++
b/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/artemis.profile
@@ -27,7 +27,7 @@
ARTEMIS_OOME_DUMP='${project.basedir}/target/classes/servers/linuxUpgrade/log/oo
ARTEMIS_INSTANCE_URI='file:${project.basedir}/target/classes/servers/linuxUpgrade/'
ARTEMIS_INSTANCE_ETC_URI='file:${project.basedir}/target/classes/servers/linuxUpgradeETC/'
-# Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be
referenced in broker.xml
+# Cluster Properties: Used to pass arguments to Apache Artemis which can be
referenced in broker.xml
#ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617
-Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614
-Dactivemq.remoting.hornetq.port=5446"
# Hawtio Properties
diff --git
a/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/logging.properties
b/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/logging.properties
index 97980b99c2..6579a90c7d 100644
---
a/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/logging.properties
+++
b/tests/smoke-tests/src/main/filtered-resources/servers/linuxUpgradeETC/logging.properties
@@ -21,7 +21,7 @@
loggers=org.eclipse.jetty,org.jboss.logging,org.apache.activemq.artemis.core.ser
# Root logger level
logger.level=INFO
-# ActiveMQ Artemis logger levels
+# Apache Artemis logger levels
logger.org.apache.activemq.artemis.core.server.level=INFO
logger.org.apache.activemq.artemis.journal.level=INFO
logger.org.apache.activemq.artemis.utils.level=INFO
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
index 7c7d279cd9..9fac765706 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/client/ClientAbstract.java
@@ -32,7 +32,7 @@ import java.lang.invoke.MethodHandles;
* class is doing the job of a TransactionManager that fits for the purpose of
this test only, however there are many
* more pitfalls to deal with Transactions.
* <p>
- * This is just to stress and soak test Transactions with ActiveMQ Artemis.
+ * This is just to stress and soak test Transactions with Apache Artemis.
* <p>
* And this is dealing with XA directly for the purpose testing only.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
