activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [5/6] activemq-artemis git commit: Ensure all references to the project use ActiveMQ Artemis
Date Wed, 13 May 2015 13:29:41 GMT
Ensure all references to the project use ActiveMQ Artemis


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a17c828b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a17c828b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a17c828b

Branch: refs/heads/master
Commit: a17c828b85382ce5919dc3218cd24b526e4f10e0
Parents: d1b317b
Author: Martyn Taylor <mtaylor@redhat.com>
Authored: Wed May 13 11:12:07 2015 +0100
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Wed May 13 11:51:26 2015 +0100

----------------------------------------------------------------------
 RELEASING.md                                    |  2 +-
 .../apache/activemq/artemis/boot/Artemis.java   |  2 +-
 .../cli/commands/tools/XmlDataImporter.java     |  2 +-
 .../cli/commands/bin/artemis-service.xml        |  2 +-
 .../artemis/cli/commands/etc/artemis.profile    |  2 +-
 .../cli/commands/etc/artemis.profile.cmd        |  2 +-
 .../artemis/cli/commands/etc/broker.xml         |  4 ++--
 .../artemis/cli/commands/etc/logging.properties |  2 +-
 artemis-cli/src/test/resources/broker-nojms.xml |  4 ++--
 artemis-cli/src/test/resources/broker.xml       |  4 ++--
 .../artemis/api/core/ActiveMQBuffer.java        |  2 +-
 .../ActiveMQConnectionTimedOutException.java    |  2 +-
 .../api/core/ActiveMQDisconnectedException.java |  2 +-
 .../artemis/api/core/ActiveMQException.java     |  2 +-
 .../api/core/ActiveMQIllegalStateException.java |  2 +-
 .../core/ActiveMQInternalErrorException.java    |  2 +-
 .../api/core/ActiveMQNotConnectedException.java |  2 +-
 .../ActiveMQUnsupportedPacketException.java     |  2 +-
 .../activemq/artemis/api/core/SimpleString.java |  2 +-
 .../artemis/utils/ClassloadingUtil.java         |  2 +-
 .../activemq/artemis/utils/ReusableLatch.java   |  2 +-
 .../config/ActiveMQDefaultConfiguration.java    |  8 ++++----
 .../artemis/api/core/FilterConstants.java       | 16 ++++++++--------
 .../activemq/artemis/api/core/Interceptor.java  |  4 ++--
 .../api/core/JGroupsBroadcastEndpoint.java      |  2 +-
 .../api/core/JGroupsFileBroadcastEndpoint.java  |  2 +-
 .../JGroupsPropertiesBroadcastEndpoint.java     |  2 +-
 .../activemq/artemis/api/core/Message.java      |  2 +-
 .../api/core/TransportConfiguration.java        |  2 +-
 .../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 +-
 .../management/ActiveMQComponentControl.java    |  2 +-
 .../core/management/ActiveMQServerControl.java  |  4 ++--
 .../api/core/management/ManagementHelper.java   | 10 +++++-----
 .../api/core/management/NotificationType.java   |  4 ++--
 .../api/core/management/ObjectNameBuilder.java  |  4 ++--
 .../artemis/core/message/BodyEncoder.java       | 10 +++++-----
 .../artemis/core/message/impl/MessageImpl.java  |  2 +-
 .../protocol/core/CoreRemotingConnection.java   |  2 +-
 .../core/impl/ActiveMQSessionContext.java       |  4 ++--
 .../core/remoting/impl/ssl/SSLSupport.java      |  2 +-
 artemis-distribution/pom.xml                    |  2 +-
 .../activemq/artemis/dto/package-info.java      |  2 +-
 .../artemis/api/jms/ActiveMQJMSClient.java      |  2 +-
 .../artemis/api/jms/ActiveMQJMSConstants.java   |  2 +-
 .../management/ConnectionFactoryControl.java    |  2 +-
 .../api/jms/management/DestinationControl.java  |  2 +-
 .../api/jms/management/JMSManagementHelper.java |  2 +-
 .../api/jms/management/JMSServerControl.java    |  2 +-
 .../api/jms/management/SubscriptionInfo.java    |  2 +-
 .../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 +-
 .../artemis/jms/client/ActiveMQMessage.java     |  4 ++--
 .../jms/client/ActiveMQMessageConsumer.java     |  2 +-
 .../jms/client/ActiveMQMessageProducer.java     |  2 +-
 .../jms/client/ActiveMQObjectMessage.java       |  2 +-
 .../artemis/jms/client/ActiveMQQueue.java       |  2 +-
 .../jms/client/ActiveMQQueueBrowser.java        |  2 +-
 .../artemis/jms/client/ActiveMQSession.java     |  4 ++--
 .../jms/client/ActiveMQStreamMessage.java       |  2 +-
 .../jms/client/ActiveMQTemporaryQueue.java      |  2 +-
 .../artemis/jms/client/ActiveMQTextMessage.java |  4 ++--
 .../artemis/jms/client/ActiveMQTopic.java       |  2 +-
 .../jms/client/ActiveMQXAConnection.java        |  2 +-
 .../artemis/jms/client/SelectorTranslator.java  |  6 +++---
 .../jndi/ActiveMQInitialContextFactory.java     |  2 +-
 .../jms/bridge/QualityOfServiceMode.java        |  2 +-
 .../artemis/jms/bridge/impl/JMSBridgeImpl.java  |  2 +-
 .../ActiveMQProtonRemotingConnection.java       |  2 +-
 .../protocol/proton/ProtonProtocolManager.java  |  2 +-
 .../converter/jms/ServerJMSMapMessage.java      |  2 +-
 .../converter/jms/ServerJMSTextMessage.java     |  2 +-
 .../openwire/OpenWireMessageConverter.java      |  4 ++--
 .../context/AbstractProtonContextSender.java    |  4 ++--
 .../server/ProtonServerSenderContext.java       |  4 ++--
 .../org/proton/plug/util/ReusableLatch.java     |  2 +-
 .../core/protocol/stomp/StompDecoder.java       |  2 +-
 .../protocol/stomp/StompFrameInterceptor.java   |  4 ++--
 .../ra/ActiveMQRAManagedConnectionFactory.java  |  2 +-
 .../activemq/artemis/ra/ActiveMQRAService.java  |  2 +-
 .../org/apache/activemq/artemis/ra/package.html |  2 +-
 .../apache/activemq/artemis/rest/ActiveMQ.java  |  2 +-
 .../artemis/rest/util/HttpMessageHelper.java    |  2 +-
 .../src/main/resources/schema/artemis-rest.xsd  | 12 ++++++------
 .../artemis/core/config/Configuration.java      |  8 ++++----
 .../artemis/core/filter/impl/FilterImpl.java    |  4 ++--
 .../artemis/core/paging/PagingStore.java        |  2 +-
 .../core/paging/impl/PagingStoreImpl.java       |  2 +-
 .../core/security/impl/SecurityStoreImpl.java   |  2 +-
 .../artemis/core/server/ActiveMQServer.java     |  4 ++--
 .../core/server/ActiveMQServerLogger.java       |  2 +-
 .../core/server/embedded/EmbeddedActiveMQ.java  |  2 +-
 .../server/impl/AIOFileLockNodeManager.java     |  2 +-
 .../core/server/impl/ActiveMQServerImpl.java    |  4 ++--
 .../core/server/impl/ServiceRegistry.java       |  2 +-
 .../artemis/core/transaction/Transaction.java   |  2 +-
 .../spi/core/protocol/ProtocolManager.java      |  2 +-
 .../resources/schema/artemis-configuration.xsd  |  4 ++--
 .../artemis/core/filter/impl/FilterTest.java    |  2 +-
 .../xa/ActiveMQXAResourceWrapperImpl.java       |  2 +-
 .../xa/recovery/ActiveMQXAResourceRecovery.java |  4 ++--
 .../xa/recovery/ActiveMQXAResourceWrapper.java  |  2 +-
 docs/design-guide/en/clustering.md              |  2 +-
 docs/quickstart-guide/en/README.md              |  2 +-
 docs/quickstart-guide/en/about.md               | 10 +++++-----
 docs/quickstart-guide/en/download.md            |  4 ++--
 docs/quickstart-guide/en/examples.md            | 20 ++++++++++----------
 docs/quickstart-guide/en/installation.md        | 12 ++++++------
 docs/quickstart-guide/en/introduction.md        |  4 ++--
 docs/quickstart-guide/en/running.md             |  2 +-
 docs/user-manual/en/README.md                   |  2 +-
 docs/user-manual/en/architecture.md             |  8 ++++----
 docs/user-manual/en/configuration-index.md      |  4 ++--
 docs/user-manual/en/core-bridges.md             |  2 +-
 docs/user-manual/en/diverts.md                  |  2 +-
 docs/user-manual/en/flow-control.md             |  2 +-
 docs/user-manual/en/ha.md                       |  8 ++++----
 docs/user-manual/en/management.md               |  8 ++++----
 docs/user-manual/en/message-grouping.md         |  2 +-
 docs/user-manual/en/preface.md                  |  2 +-
 docs/user-manual/en/rest.md                     |  4 ++--
 docs/user-manual/en/using-jms.md                |  2 +-
 docs/user-manual/en/using-server.md             |  2 +-
 etc/findbugs-exclude.xml                        |  2 +-
 examples/core/embedded-remote/readme.html       | 14 +++++++-------
 .../core/example/EmbeddedRemoteExample.java     |  2 +-
 examples/core/embedded/readme.html              | 16 ++++++++--------
 .../artemis/core/example/EmbeddedExample.java   |  2 +-
 examples/core/vertx-connector/readme.html       | 10 +++++-----
 examples/jms/README.md                          |  2 +-
 examples/jms/aerogear/readme.html               |  2 +-
 .../jms/application-layer-failover/readme.html  | 12 ++++++------
 .../artemis-ra-rar/src/main/resources/ra.xml    |  4 ++--
 examples/jms/bridge/readme.html                 | 10 +++++-----
 examples/jms/browser/readme.html                |  4 ++--
 examples/jms/client-kickoff/readme.html         | 12 ++++++------
 .../jms/example/ClientKickoffExample.java       |  2 +-
 .../main/resources/activemq/server0/broker.xml  |  2 +-
 .../client-side-failoverlistener/readme.html    |  2 +-
 .../jms/client-side-load-balancing/readme.html  |  8 ++++----
 .../clustered-durable-subscription/readme.html  |  6 +++---
 examples/jms/clustered-grouping/readme.html     |  4 ++--
 examples/jms/clustered-jgroups/readme.html      | 12 ++++++------
 examples/jms/clustered-queue/readme.html        | 10 +++++-----
 .../jms/clustered-static-discovery/readme.html  | 10 +++++-----
 .../jms/clustered-static-oneway/readme.html     | 10 +++++-----
 examples/jms/clustered-topic/readme.html        |  4 ++--
 .../colocated-failover-scale-down/readme.html   |  2 +-
 examples/jms/colocated-failover/readme.html     |  2 +-
 .../artemis/common/example/ActiveMQExample.java |  2 +-
 examples/jms/consumer-rate-limit/readme.html    |  6 +++---
 examples/jms/dead-letter/readme.html            | 10 +++++-----
 .../artemis/jms/example/DeadLetterExample.java  |  2 +-
 examples/jms/delayed-redelivery/readme.html     |  4 ++--
 .../jms/example/DelayedRedeliveryExample.java   |  2 +-
 examples/jms/divert/readme.html                 |  4 ++--
 .../artemis/jms/example/DivertExample.java      |  2 +-
 examples/jms/durable-subscription/readme.html   |  4 ++--
 examples/jms/embedded-simple/readme.html        | 10 +++++-----
 .../artemis/jms/example/EmbeddedExample.java    |  2 +-
 examples/jms/embedded/readme.html               | 14 +++++++-------
 .../artemis/jms/example/EmbeddedExample.java    |  6 +++---
 examples/jms/expiry/readme.html                 | 12 ++++++------
 .../artemis/jms/example/ExpiryExample.java      |  2 +-
 examples/jms/http-transport/readme.html         |  8 ++++----
 .../instantiate-connection-factory/readme.html  |  2 +-
 examples/jms/interceptor/readme.html            |  6 +++---
 .../artemis/jms/example/InterceptorExample.java |  2 +-
 examples/jms/jms-auto-closeable/readme.html     |  2 +-
 examples/jms/jms-bridge/readme.html             | 12 ++++++------
 .../artemis/jms/example/JMSBridgeExample.java   |  2 +-
 .../jms/jms-completion-listener/readme.html     |  4 ++--
 examples/jms/jms-context/readme.html            |  4 ++--
 examples/jms/jms-shared-consumer/readme.html    |  2 +-
 examples/jms/jmx/readme.html                    |  8 ++++----
 .../artemis/jms/example/JMXExample.java         |  2 +-
 .../main/resources/activemq/server0/broker.xml  |  2 +-
 examples/jms/large-message/readme.html          | 12 ++++++------
 .../jms/example/LargeMessageExample.java        |  2 +-
 examples/jms/last-value-queue/readme.html       |  2 +-
 .../jms/management-notifications/readme.html    | 10 +++++-----
 examples/jms/management/readme.html             | 10 +++++-----
 .../artemis/jms/example/ManagementExample.java  |  2 +-
 examples/jms/message-counters/readme.html       |  8 ++++----
 examples/jms/message-group/readme.html          |  4 ++--
 examples/jms/message-group2/readme.html         |  4 ++--
 examples/jms/message-priority/readme.html       |  2 +-
 examples/jms/no-consumer-buffering/readme.html  | 10 +++++-----
 .../jms/example/NoConsumerBufferingExample.java |  2 +-
 .../jms/non-transaction-failover/readme.html    |  4 ++--
 examples/jms/openwire/readme.html               |  6 +++---
 .../artemis/jms/example/OpenWireExample.java    |  2 +-
 .../main/resources/activemq/server0/broker.xml  |  2 +-
 examples/jms/paging/readme.html                 |  6 +++---
 .../artemis/jms/example/PagingExample.java      |  2 +-
 examples/jms/perf/readme.html                   |  2 +-
 examples/jms/pre-acknowledge/readme.html        |  6 +++---
 .../jms/example/PreacknowledgeExample.java      |  2 +-
 examples/jms/producer-rate-limit/readme.html    |  6 +++---
 examples/jms/proton-cpp/readme.html             |  8 ++++----
 .../artemis/jms/example/ProtonCPPExample.java   |  2 +-
 examples/jms/proton-j/readme.html               |  8 ++++----
 examples/jms/proton-ruby/readme.html            |  6 +++---
 .../queue-message-redistribution/readme.html    | 14 +++++++-------
 .../QueueMessageRedistributionExample.java      |  2 +-
 examples/jms/queue-requestor/readme.html        |  4 ++--
 examples/jms/queue-selector/readme.html         |  2 +-
 examples/jms/queue/readme.html                  |  4 ++--
 examples/jms/reattach-node/readme.html          |  6 +++---
 .../jms/replicated-failback-static/readme.html  |  4 ++--
 examples/jms/replicated-failback/readme.html    |  4 ++--
 .../replicated-multiple-failover/readme.html    |  4 ++--
 .../replicated-transaction-failover/readme.html |  6 +++---
 examples/jms/request-reply/readme.html          |  2 +-
 examples/jms/rest/dup-send/README.txt           |  2 +-
 examples/jms/rest/javascript-chat/README.txt    |  2 +-
 examples/jms/rest/jms-to-rest/README.txt        |  2 +-
 examples/jms/rest/push/README.txt               |  4 ++--
 examples/jms/scale-down/readme.html             |  2 +-
 examples/jms/scheduled-message/readme.html      |  4 ++--
 examples/jms/security/readme.html               | 16 ++++++++--------
 examples/jms/send-acknowledgements/readme.html  |  4 ++--
 .../example/SendAcknowledgementsExample.java    |  2 +-
 examples/jms/spring-integration/readme.html     |  6 +++---
 examples/jms/ssl-enabled/readme.html            |  6 +++---
 examples/jms/static-selector-jms/readme.html    |  2 +-
 examples/jms/static-selector/readme.html        |  4 ++--
 examples/jms/stomp-websockets/readme.html       |  8 ++++----
 examples/jms/stomp/readme.html                  |  8 ++++----
 examples/jms/stomp1.1/readme.html               |  8 ++++----
 examples/jms/stomp1.2/readme.html               |  8 ++++----
 examples/jms/stop-server-failover/readme.html   |  4 ++--
 examples/jms/symmetric-cluster/readme.html      | 10 +++++-----
 .../jms/example/SymmetricClusterExample.java    |  2 +-
 examples/jms/temp-queue/readme.html             |  4 ++--
 examples/jms/topic-hierarchies/readme.html      |  6 +++---
 .../jms/topic-selector-example1/readme.html     |  2 +-
 .../jms/topic-selector-example2/readme.html     |  2 +-
 examples/jms/topic/readme.html                  |  4 ++--
 examples/jms/transaction-failover/readme.html   |  6 +++---
 examples/jms/transactional/readme.html          |  4 ++--
 examples/jms/xa-heuristic/readme.html           |  6 +++---
 examples/jms/xa-receive/readme.html             |  4 ++--
 examples/jms/xa-send/readme.html                |  6 +++---
 examples/soak/normal/README                     |  2 +-
 tests/config/logging.properties                 |  2 +-
 tests/config/logging.properties.trace           |  2 +-
 .../clientcrash/ClientCrashTest.java            |  2 +-
 .../integration/clientcrash/ClientExitTest.java |  2 +-
 .../server/SuppliedThreadPoolTest.java          |  2 +-
 .../ssl/CoreClientOverOneWaySSLTest.java        |  4 ++--
 .../ssl/CoreClientOverTwoWaySSLTest.java        |  4 ++--
 .../NettyConnectorWithHTTPUpgradeTest.java      |  4 ++--
 .../jms/tests/ConnectionFactoryTest.java        |  4 ++--
 .../artemis/jms/tests/MessageConsumerTest.java  |  2 +-
 .../artemis/jms/tests/PersistenceTest.java      |  8 ++++----
 .../activemq/artemis/jms/tests/QueueTest.java   |  2 +-
 .../jms/conform/connection/ConnectionTest.java  |  2 +-
 .../tests/soak/client/ClientAbstract.java       |  2 +-
 266 files changed, 551 insertions(+), 551 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/RELEASING.md
----------------------------------------------------------------------
diff --git a/RELEASING.md b/RELEASING.md
index 63a1963..57cc35f 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -23,4 +23,4 @@ Things to do before issuing a new release:
 
 * If every thing is successful.  Follow the Apache guide (http://www.apache.org/dev/publishing-maven-artifacts.html) to build and publish artifacts to Nexus and send out a release vote.
 
-Note: There is one additional step to remove the activemq-pom-<version>-source-release.zip from the Nexus staging repository before closing the staging repository.  At the moment this artifact is uploaded automatically by the Apache release plugin.  In future versions the ActiveMQ pom will be updated to take this into account.
+Note: There is one additional step to remove the activemq-pom-<version>-source-release.zip from the Nexus staging repository before closing the staging repository.  At the moment this artifact is uploaded automatically by the Apache release plugin.  In future versions the ActiveMQ Artemis pom will be updated to take this into account.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
----------------------------------------------------------------------
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 ca3699e..db5bbe6 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
@@ -29,7 +29,7 @@ import java.util.Comparator;
 /**
  * <p>
  * A main class which setups up a classpath and then passes
- * execution off to the ActiveMQ cli main.
+ * execution off to the ActiveMQ Artemis cli main.
  * </p>
  */
 public class Artemis

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
index ce3d673..a9865cc 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
@@ -59,7 +59,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
 
 /**
  * Read XML output from <code>org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataExporter</code>, create a core session, and
- * send the messages to a running instance of ActiveMQ.  It uses the StAX <code>javax.xml.stream.XMLStreamReader</code>
+ * send the messages to a running instance of ActiveMQ Artemis.  It uses the StAX <code>javax.xml.stream.XMLStreamReader</code>
  * for speed and simplicity.
  */
 @Command(name = "imp", description = "Import all message-data using an XML that could be interpreted by any system.")

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
index 3828dd0..5e37c56 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
@@ -32,7 +32,7 @@
    <argument>-Xms512M</argument>
    <argument>-Xmx1024M</argument>
 
-   <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+   <!-- Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
    <argument>-Dartemis.remoting.default.port=61617</argument>
    <argument>-Dartemis.remoting.amqp.port=5673</argument>
    <argument>-Dartemis.remoting.stomp.port=61614</argument>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 937a1f9..ff31642 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -17,7 +17,7 @@
 
 ARTEMIS_HOME='${artemis.home}'
 
-# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+# Cluster Properties: Used to pass arguments to ActiveMQ 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"
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index fc9ce0c..c52d70f 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -17,7 +17,7 @@ rem under the License.
 
 set ARTEMIS_HOME=${artemis.home}
 
-rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
+rem Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be referenced in broker.xml
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 761c6d9..851572e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -42,7 +42,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:${host}}:${activemq.remoting.default.port:${default.port}}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -51,7 +51,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:${host}}:${activemq.remoting.stomp.port:${stomp.port}}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:${host}}:${activemq.remoting.hornetq.port:${hq.port}}?protocols=HORNETQ,STOMP</acceptor>
       </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
index 084b74c..5a5ad3e 100644
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
@@ -21,7 +21,7 @@ loggers=org.jboss.logging,org.apache.activemq.artemis.core.server,org.apache.act
 
 # Root logger level
 logger.level=INFO
-# ActiveMQ logger levels
+# ActiveMQ 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/test/resources/broker-nojms.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/resources/broker-nojms.xml b/artemis-cli/src/test/resources/broker-nojms.xml
index d25c75c..e0fcced 100644
--- a/artemis-cli/src/test/resources/broker-nojms.xml
+++ b/artemis-cli/src/test/resources/broker-nojms.xml
@@ -36,7 +36,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -45,7 +45,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-cli/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-cli/src/test/resources/broker.xml b/artemis-cli/src/test/resources/broker.xml
index df5610d..de51e9a 100644
--- a/artemis-cli/src/test/resources/broker.xml
+++ b/artemis-cli/src/test/resources/broker.xml
@@ -40,7 +40,7 @@ under the License.
       </connectors>
 
       <acceptors>
-         <!-- Default ActiveMQ Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
+         <!-- Default ActiveMQ Artemis Acceptor.  Multi-protocol adapter.  Currently supports Core, OpenWire, Stomp and AMQP. -->
          <acceptor name="activemq">tcp://${activemq.remoting.default.host:localhost}:${activemq.remoting.default.port:61616}</acceptor>
 
          <!-- AMQP Acceptor.  Listens on default AMQP port for AMQP traffic.-->
@@ -49,7 +49,7 @@ under the License.
          <!-- STOMP Acceptor. -->
          <acceptor name="stomp">tcp://${activemq.remoting.stomp.host:localhost}:${activemq.remoting.stomp.port:61613}?protocols=STOMP</acceptor>
 
-         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Core and STOMP for legacy HornetQ clients. -->
+         <!-- HornetQ Compatibility Acceptor.  Enables ActiveMQ Artemis Core and STOMP for legacy HornetQ clients. -->
          <acceptor name="hornetq">tcp://${activemq.remoting.hornetq.host:localhost}:${activemq.remoting.hornetq.port:5445}?protocols=CORE,STOMP</acceptor>
       </acceptors>
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
----------------------------------------------------------------------
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 dcdc0b2..8a81bf7 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
@@ -21,7 +21,7 @@ import java.nio.ByteBuffer;
 import io.netty.buffer.ByteBuf;
 
 /**
- * A ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ code base.
+ * A ActiveMQBuffer wraps a Netty's ChannelBuffer and is used throughout ActiveMQ Artemis code base.
  * <p>
  * Instances of it can be obtained from {@link ActiveMQBuffers} factory.
  * <p>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
----------------------------------------------------------------------
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 2061e9c..6aa217b 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 server.
+ * A client timed out will connecting to ActiveMQ Artemis server.
  */
 public final class ActiveMQConnectionTimedOutException extends ActiveMQException
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
----------------------------------------------------------------------
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 663269a..fd5526e 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 server when the server has shut down.
+ * A client was disconnected from ActiveMQ Artemis server when the server has shut down.
  */
 public final class ActiveMQDisconnectedException extends ActiveMQException
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
----------------------------------------------------------------------
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 f8a09e9..d22bb68 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 API.
+ * ActiveMQException is the root exception for the ActiveMQ Artemis API.
  */
 public class ActiveMQException extends Exception
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
----------------------------------------------------------------------
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 1bf4185..bf311b9 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;
 
 /**
- * A ActiveMQ resource is not in a legal state (e.g. calling ClientConsumer.receive() if a
+ * A ActiveMQ Artemis resource is not in a legal state (e.g. calling ClientConsumer.receive() if a
  * MessageHandler is set).
  */
 public final class ActiveMQIllegalStateException extends ActiveMQException

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
----------------------------------------------------------------------
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 f1934d6..4c8d53d 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 from performing an important operation.
+ * Internal error which prevented ActiveMQ Artemis from performing an important operation.
  */
 public final class ActiveMQInternalErrorException extends ActiveMQException
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
----------------------------------------------------------------------
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 2878d69..6739070 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 server.
+ * A client is not able to connect to ActiveMQ Artemis server.
  */
 public final class ActiveMQNotConnectedException extends ActiveMQException
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
----------------------------------------------------------------------
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 d8b6aa9..f401f2b 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 PacketHandler.
+ * A packet of unsupported type was received by ActiveMQ Artemis PacketHandler.
  */
 public final class ActiveMQUnsupportedPacketException extends ActiveMQException
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
----------------------------------------------------------------------
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 3defc73..0e523f5 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
@@ -26,7 +26,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 for performance reasons.
+ * This object is used heavily throughout ActiveMQ Artemis for performance reasons.
  *
  */
 public final class SimpleString implements CharSequence, Serializable, Comparable<SimpleString>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
----------------------------------------------------------------------
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 e5cd954..77176c7 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
@@ -20,7 +20,7 @@ import java.net.URL;
 
 /**
  * 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 (ClassloadingUtil.getClass().getClassLoader()).
+ * such as load a class first using TCCL, and then the classLoader used by ActiveMQ Artemis (ClassloadingUtil.getClass().getClassLoader()).
  * <p>
  * Is't required to use a Security Block on any calls to this class.
  */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
----------------------------------------------------------------------
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 117386a..d6fa2aa 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
@@ -28,7 +28,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
  *
  * <p>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>
  *
- * <p>On ActiveMQ 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>
+ * <p>On ActiveMQ 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>
  *
  * <p>Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.</p>
  *

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
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 0cafc0b..c4043e1 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
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.journal.impl.JournalConstants;
 
 /**
- * Default values of ActiveMQ configuration parameters.
+ * Default values of ActiveMQ Artemis configuration parameters.
  */
 public final class ActiveMQDefaultConfiguration
 {
@@ -135,7 +135,7 @@ public final class ActiveMQDefaultConfiguration
    // Following fields are generated from the activemq-schema.xsd annotations
    // -------------------------------------------------------------------
 
-   // If true then the ActiveMQ 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 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.
    private static boolean DEFAULT_RESOLVE_PROTOCOLS = true;
 
    // true means that the server will load configuration from the configuration files
@@ -407,7 +407,7 @@ public final class ActiveMQDefaultConfiguration
 
 
    /**
-    * If true then the ActiveMQ 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 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.
     */
    public static boolean isDefaultResolveProtocols()
    {
@@ -543,7 +543,7 @@ public final class ActiveMQDefaultConfiguration
    }
 
    /**
-    * the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+    * the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
     */
    public static String getDefaultJmxDomain()
    {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
----------------------------------------------------------------------
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 25c862b..2430805 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 core
+ * Constants representing pre-defined message attributes that can be referenced in ActiveMQ Artemis core
  * filter expressions.
  */
 public final class FilterConstants
 {
    /**
-    * Name of the ActiveMQ UserID header.
+    * Name of the ActiveMQ Artemis UserID header.
     */
    public static final SimpleString ACTIVEMQ_USERID = new SimpleString("AMQUserID");
 
    /**
-    * Name of the ActiveMQ Message expiration header.
+    * Name of the ActiveMQ Artemis Message expiration header.
     */
    public static final SimpleString ACTIVEMQ_EXPIRATION = new SimpleString("AMQExpiration");
 
    /**
-    * Name of the ActiveMQ Message durable header.
+    * Name of the ActiveMQ Artemis Message durable header.
     */
    public static final SimpleString ACTIVEMQ_DURABLE = new SimpleString("AMQDurable");
 
@@ -48,22 +48,22 @@ public final class FilterConstants
    public static final SimpleString DURABLE = new SimpleString("DURABLE");
 
    /**
-    * Name of the ActiveMQ Message timestamp header.
+    * Name of the ActiveMQ Artemis Message timestamp header.
     */
    public static final SimpleString ACTIVEMQ_TIMESTAMP = new SimpleString("AMQTimestamp");
 
    /**
-    * Name of the ActiveMQ Message priority header.
+    * Name of the ActiveMQ Artemis Message priority header.
     */
    public static final SimpleString ACTIVEMQ_PRIORITY = new SimpleString("AMQPriority");
 
    /**
-    * Name of the ActiveMQ Message size header.
+    * Name of the ActiveMQ Artemis Message size header.
     */
    public static final SimpleString ACTIVEMQ_SIZE = new SimpleString("AMQSize");
 
    /**
-    * All ActiveMQ headers are prepended by this prefix.
+    * All ActiveMQ Artemis headers are prepended by this prefix.
     */
    public static final SimpleString ACTIVEMQ_PREFIX = new SimpleString("AMQ");
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
----------------------------------------------------------------------
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 2e1a9a3..c131d82 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 client and servers.
+ * This is class is a simple way to intercepting calls on ActiveMQ Artemis client and servers.
  * <p>
- * To add an interceptor to ActiveMQ server, you have to modify the server configuration file
+ * To add an interceptor to ActiveMQ Artemis server, you have to modify the server configuration file
  * {@literal broker.xml}.<br>
  * To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
  */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
----------------------------------------------------------------------
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 ea750c9..33e9fdf 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
@@ -28,7 +28,7 @@ import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
 
 /**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
  */
 public abstract class JGroupsBroadcastEndpoint implements BroadcastEndpoint
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
----------------------------------------------------------------------
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 d6181a0..f3d3403 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
@@ -21,7 +21,7 @@ import org.jgroups.JChannel;
 import java.net.URL;
 
 /**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
  */
 public final class JGroupsFileBroadcastEndpoint extends JGroupsBroadcastEndpoint
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
index 98f5ee9..cadc316 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
@@ -20,7 +20,7 @@ import org.jgroups.JChannel;
 import org.jgroups.conf.PlainConfigurator;
 
 /**
- * This class is the implementation of ActiveMQ members discovery that will use JGroups.
+ * This class is the implementation of ActiveMQ Artemis members discovery that will use JGroups.
  */
 public final class JGroupsPropertiesBroadcastEndpoint extends JGroupsBroadcastEndpoint
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index a159760..f773cba 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -158,7 +158,7 @@ public interface Message
     * Returns the message timestamp.
     * <br>
     * The timestamp corresponds to the time this message
-    * was handled by a ActiveMQ server.
+    * was handled by a ActiveMQ Artemis server.
     */
    long getTimestamp();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
----------------------------------------------------------------------
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 8d2fdb0..e29fca3 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
@@ -293,7 +293,7 @@ public class TransportConfiguration implements Serializable
    /**
     * Encodes this TransportConfiguration into a buffer.
     * <p>
-    * Note that this is only used internally ActiveMQ.
+    * Note that this is only used internally ActiveMQ Artemis.
     *
     * @param buffer the buffer to encode into
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
----------------------------------------------------------------------
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 fb11b88..e8b149f 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
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.uri.ServerLocatorParser;
 import java.net.URI;
 
 /**
- * Utility class for creating ActiveMQ {@link ClientSessionFactory} objects.
+ * Utility class for creating ActiveMQ 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
----------------------------------------------------------------------
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 91c8e88..62057f2 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 queues.
+ * A ClientConsumer receives messages from ActiveMQ Artemis queues.
  * <br>
  * Messages can be consumed synchronously by using the <code>receive()</code> methods
  * which will block until a message is received (or a timeout expires) or asynchronously
@@ -36,7 +36,7 @@ public interface ClientConsumer extends AutoCloseable
 
    /**
     * The server's ID associated with this consumer.
-    * ActiveMQ implements this as a long but this could be protocol dependent.
+    * ActiveMQ Artemis implements this as a long but this could be protocol dependent.
     * @return
     */
    ConsumerContext getConsumerContext();
@@ -65,7 +65,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 server to
+    * Receives a message from a queue. This call will force a network trip to ActiveMQ 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

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
----------------------------------------------------------------------
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 a487190..5801a67 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.Message;
 
 /**
  *
- * A ClientMessage represents a message sent and/or received by ActiveMQ.
+ * A ClientMessage represents a message sent and/or received by ActiveMQ Artemis.
  */
 public interface ClientMessage extends Message
 {
@@ -37,7 +37,7 @@ public interface ClientMessage extends Message
    /**
     * Sets the delivery count for this message.
     * <p>
-    * This method is not meant to be called by ActiveMQ clients.
+    * This method is not meant to be called by ActiveMQ Artemis clients.
     * @param deliveryCount message delivery count
     * @return this ClientMessage
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
----------------------------------------------------------------------
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 87ce2e9..3aeca3e 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
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 
 
 /**
- * A ClientSessionFactory is the entry point to create and configure ActiveMQ resources to produce and consume messages.
+ * A ClientSessionFactory is the entry point to create and configure ActiveMQ Artemis resources to produce and consume messages.
  * <br>
  * It is possible to configure a factory using the setter methods only if no session has been created.
  * Once a session is created, the configuration is fixed and any call to a setter method will throw a IllegalStateException.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
----------------------------------------------------------------------
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 97d6121..18df184 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;
 
 /**
- * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ component.
+ * A ActiveMQComponentControl is used to manage the life cycle of a ActiveMQ Artemis component.
  */
 public interface ActiveMQComponentControl
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
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 9aa93ac..d8c1cae 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
@@ -19,7 +19,7 @@ package org.apache.activemq.artemis.api.core.management;
 import javax.management.MBeanOperationInfo;
 
 /**
- * A ActiveMQServerControl is used to manage ActiveMQ servers.
+ * A ActiveMQServerControl is used to manage ActiveMQ Artemis servers.
  */
 public interface ActiveMQServerControl
 {
@@ -508,7 +508,7 @@ public interface ActiveMQServerControl
    String[] listSessions(@Parameter(desc = "a connection ID", name = "connectionID") String connectionID) throws Exception;
 
    /**
-    * This method is used by ActiveMQ clustering and must not be called by ActiveMQ clients.
+    * This method is used by ActiveMQ Artemis clustering and must not be called by ActiveMQ Artemis clients.
     */
    void sendQueueInfoToQueue(String queueName, String address) throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
----------------------------------------------------------------------
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 ae9c091..00bb831 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
@@ -28,7 +28,7 @@ import org.apache.activemq.artemis.utils.json.JSONArray;
 import org.apache.activemq.artemis.utils.json.JSONObject;
 
 /**
- * Helper class to use ActiveMQ Core messages to manage server resources.
+ * Helper class to use ActiveMQ Artemis Core messages to manage server resources.
  */
 public final class ManagementHelper
 {
@@ -298,7 +298,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by ActiveMQ management service.
+    * Used by ActiveMQ Artemis management service.
     */
    public static Object[] retrieveOperationParameters(final Message message) throws Exception
    {
@@ -334,7 +334,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by ActiveMQ management service.
+    * Used by ActiveMQ Artemis management service.
     */
    public static void storeResult(final Message message, final Object result) throws Exception
    {
@@ -418,7 +418,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by ActiveMQ management service.
+    * Used by ActiveMQ Artemis management service.
     */
    public static Map<String, Object> fromCommaSeparatedKeyValues(final String str) throws Exception
    {
@@ -434,7 +434,7 @@ public final class ManagementHelper
    }
 
    /**
-    * Used by ActiveMQ management service.
+    * Used by ActiveMQ Artemis management service.
     */
    public static Object[] fromCommaSeparatedArrayOfCommaSeparatedKeyValues(final String str) throws Exception
    {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
----------------------------------------------------------------------
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 29878ac..8a8dfa5 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 servers.
+ * Types of notification emitted by ActiveMQ 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 user manual section on "Management Notifications"
+ * @see the ActiveMQ Artemis user manual section on "Management Notifications"
  */
 public interface NotificationType
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
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 7a48fc0..2a1dfe1 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
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 
 /**
- * Helper class to build ObjectNames for ActiveMQ resources.
+ * Helper class to build ObjectNames for ActiveMQ Artemis resources.
  */
 public final class ObjectNameBuilder
 {
@@ -30,7 +30,7 @@ public final class ObjectNameBuilder
    // Constants -----------------------------------------------------
 
    /**
-    * Default JMX domain for ActiveMQ resources.
+    * Default JMX domain for ActiveMQ Artemis resources.
     */
    public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
----------------------------------------------------------------------
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 951f156..aaea7f9 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
@@ -29,27 +29,27 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
 public interface BodyEncoder
 {
    /**
-    * This method must not be called directly by ActiveMQ clients.
+    * This method must not be called directly by ActiveMQ Artemis clients.
     */
    void open() throws ActiveMQException;
 
    /**
-    * This method must not be called directly by ActiveMQ clients.
+    * This method must not be called directly by ActiveMQ Artemis clients.
     */
    void close() throws ActiveMQException;
 
    /**
-    * This method must not be called directly by ActiveMQ clients.
+    * This method must not be called directly by ActiveMQ Artemis clients.
     */
    int encode(ByteBuffer bufferRead) throws ActiveMQException;
 
    /**
-    * This method must not be called directly by ActiveMQ clients.
+    * This method must not be called directly by ActiveMQ Artemis clients.
     */
    int encode(ActiveMQBuffer bufferOut, int size) throws ActiveMQException;
 
    /**
-    * This method must not be called directly by ActiveMQ clients.
+    * This method must not be called directly by ActiveMQ Artemis clients.
     */
    long getLargeBodySize();
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
index 1fc3073..c4a76f1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
@@ -38,7 +38,7 @@ import org.apache.activemq.artemis.utils.UUID;
 /**
  * A concrete implementation of a message
  * <p>
- * All messages handled by ActiveMQ core are of this type
+ * All messages handled by ActiveMQ Artemis core are of this type
  */
 public abstract class MessageImpl implements MessageInternal
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
----------------------------------------------------------------------
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 25e8275..f87f982 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.spi.core.protocol.RemotingConnection;
 
 
 /**
- * Extension of RemotingConnection for the ActiveMQ core protocol
+ * Extension of RemotingConnection for the ActiveMQ Artemis core protocol
  */
 public interface CoreRemotingConnection extends RemotingConnection
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
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 aad2ec6..c3f50d71 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
@@ -384,7 +384,7 @@ public class ActiveMQSessionContext extends SessionContext
    }
 
    /**
-    * ActiveMQ does support large messages
+    * ActiveMQ Artemis does support large messages
     *
     * @return
     */
@@ -750,7 +750,7 @@ public class ActiveMQSessionContext extends SessionContext
 
 
    /**
-    * This doesn't apply to other protocols probably, so it will be an ActiveMQ exclusive feature
+    * This doesn't apply to other protocols probably, so it will be an ActiveMQ Artemis exclusive feature
     *
     * @throws ActiveMQException
     */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
----------------------------------------------------------------------
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 ebdfcb5..7642e42 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
@@ -35,7 +35,7 @@ import javax.net.ssl.TrustManagerFactory;
 import org.apache.activemq.artemis.utils.ClassloadingUtil;
 
 /**
- * Please note, this class supports PKCS#11 keystores, but there are no specific tests in the ActiveMQ test-suite to
+ * Please note, this class supports PKCS#11 keystores, but there are no specific tests in the ActiveMQ 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 have a
  * null keystore path.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-distribution/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 0e9b22a..041bfcd 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -36,7 +36,7 @@
    </properties>
 
    <dependencies>
-     <!-- ActiveMQ artifacts -->
+     <!-- ActiveMQ Artemis artifacts -->
       <dependency>
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-boot</artifactId>

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
----------------------------------------------------------------------
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 7752e27..60e76fd 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 broker
+ * The JAXB POJOs for the XML configuration of ActiveMQ Artemis broker
  */
 @javax.xml.bind.annotation.XmlSchema(
         namespace = "http://activemq.org/schema",

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
----------------------------------------------------------------------
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 0ce6e81..9f70773 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
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQXATopicConnectionFactory;
 import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
 
 /**
- * A utility class for creating ActiveMQ client-side JMS managed resources.
+ * A utility class for creating ActiveMQ Artemis client-side JMS managed resources.
  */
 public class ActiveMQJMSClient
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
----------------------------------------------------------------------
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 fb51608..bd9096c 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 for property keys used for ActiveMQ specific extensions to JMS.
+ * Constants for ActiveMQ Artemis for property keys used for ActiveMQ Artemis specific extensions to JMS.
  */
 public class ActiveMQJMSConstants
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
index 5046f87..2ac8f69 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.api.core.management.Parameter;
 
 /**
  * A ConnectionFactoryControl is used to manage a JMS ConnectionFactory. <br>
- * ActiveMQ JMS ConnectionFactory uses an underlying ClientSessionFactory to connect to ActiveMQ
+ * ActiveMQ Artemis JMS ConnectionFactory uses an underlying ClientSessionFactory to connect to ActiveMQ
  * servers. Please refer to the ClientSessionFactory for a detailed description.
  *
  * @see org.apache.activemq.artemis.api.core.client.ServerLocator

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
index 7ee35a0..7547b29 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
@@ -34,7 +34,7 @@ public interface DestinationControl
    String getName();
 
    /**
-    * Returns the ActiveMQ address corresponding to this destination.
+    * Returns the ActiveMQ Artemis address corresponding to this destination.
     */
    String getAddress();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
----------------------------------------------------------------------
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 2e55002..765fc58 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
@@ -23,7 +23,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 server resources.
+ * Helper class to use JMS messages to manage ActiveMQ Artemis server resources.
  */
 public class JMSManagementHelper
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
index 4fa2fe2..06489d9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
@@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.management.Operation;
 import org.apache.activemq.artemis.api.core.management.Parameter;
 
 /**
- * A JMSSserverControl is used to manage ActiveMQ JMS server.
+ * A JMSSserverControl is used to manage ActiveMQ Artemis JMS server.
  */
 public interface JMSServerControl
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
----------------------------------------------------------------------
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
index 131f001..c71f8bc 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
@@ -87,7 +87,7 @@ public class SubscriptionInfo
    // Public --------------------------------------------------------
 
    /**
-    * Returns the name of the ActiveMQ core queue corresponding to this subscription.
+    * Returns the name of the ActiveMQ Artemis core queue corresponding to this subscription.
     */
    public String getQueueName()
    {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
----------------------------------------------------------------------
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 ed38b1c..c9cf9a9 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 implementation of a JMS {@link BytesMessage}.
+ * ActiveMQ Artemis implementation of a JMS {@link BytesMessage}.
  */
 public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessage
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
----------------------------------------------------------------------
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 282c6e6..1d98692 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
@@ -53,7 +53,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.apache.activemq.artemis.utils.VersionLoader;
 
 /**
- * ActiveMQ implementation of a JMS Connection.
+ * ActiveMQ 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.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
----------------------------------------------------------------------
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 1dd8327..17a96be 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
@@ -53,7 +53,7 @@ import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
 import org.apache.activemq.artemis.uri.ServerLocatorParser;
 
 /**
- * ActiveMQ implementation of a JMS ConnectionFactory.
+ * ActiveMQ Artemis implementation of a JMS ConnectionFactory.
  */
 public class ActiveMQConnectionFactory implements Externalizable, Referenceable, ConnectionFactory, XAConnectionFactory
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
----------------------------------------------------------------------
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 21b0765..c7edc5a 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
@@ -25,7 +25,7 @@ import javax.jms.JMSException;
 import org.apache.activemq.artemis.core.version.Version;
 
 /**
- * ActiveMQ implementation of a JMS ConnectionMetaData.
+ * ActiveMQ Artemis implementation of a JMS ConnectionMetaData.
  */
 public class ActiveMQConnectionMetaData implements ConnectionMetaData
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
----------------------------------------------------------------------
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 f451bae..728882d 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
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.jms.referenceable.DestinationObjectFactory;
 import org.apache.activemq.artemis.jms.referenceable.SerializableObjectRefAddr;
 
 /**
- * ActiveMQ implementation of a JMS Destination.
+ * ActiveMQ Artemis implementation of a JMS Destination.
  */
 public class ActiveMQDestination implements Destination, Serializable, Referenceable
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
----------------------------------------------------------------------
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 9cdbd15..d5aabb1 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 implementation of a JMSContext.
+ * ActiveMQ Artemis implementation of a JMSContext.
  */
 public class ActiveMQJMSContext implements JMSContext
 {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a17c828b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
----------------------------------------------------------------------
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 94cf695..9f1dcb4 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
@@ -37,7 +37,7 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
 import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
 
 /**
- * ActiveMQ implementation of a JMS MapMessage.
+ * ActiveMQ Artemis implementation of a JMS MapMessage.
  */
 public final class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage
 {


Mime
View raw message