Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge PR #254 - Ensure all references to the project use ActiveMQ Artemis

This commit is contained in:
Andy Taylor 2015-05-13 14:28:47 +01:00
parent 0854371619 a17c828b85
commit d5f6aec084
266 changed files with 551 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASING.md
View File

@ -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.

2
artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
View File

@ -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

2
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java
View File

@ -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.")

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
View File

@ -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>

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
View File

@ -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"

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
View File

@ -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

4
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
View File

@ -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>

2
artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
View File

@ -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

4
artemis-cli/src/test/resources/broker-nojms.xml
View File

@ -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>

4
artemis-cli/src/test/resources/broker.xml
View File

@ -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>

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQBuffer.java
View File

@ -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>

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQConnectionTimedOutException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQDisconnectedException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQIllegalStateException.java
View File

@ -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

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQInternalErrorException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQNotConnectedException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQUnsupportedPacketException.java
View File

@ -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
{

2
artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
View File

@ -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>

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ClassloadingUtil.java
View File

@ -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.
*/

2
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ReusableLatch.java
View File

@ -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>
*

8
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
View File

@ -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()
{

16
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/FilterConstants.java
View File

@ -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");

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Interceptor.java
View File

@ -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)}
*/

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsBroadcastEndpoint.java
View File

@ -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
{

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsFileBroadcastEndpoint.java
View File

@ -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
{

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/JGroupsPropertiesBroadcastEndpoint.java
View File

@ -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
{

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
View File

@ -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();

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/TransportConfiguration.java
View File

@ -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
*/

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
View File

@ -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

6
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientConsumer.java
View File

@ -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

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientMessage.java
View File

@ -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
*/

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSessionFactory.java
View File

@ -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.

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQComponentControl.java
View File

@ -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
{

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
View File

@ -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;

10
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
View File

@ -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
{

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/NotificationType.java
View File

@ -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
{

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
View File

@ -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());

10
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/BodyEncoder.java
View File

@ -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();
}

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/MessageImpl.java
View File

@ -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
{

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/CoreRemotingConnection.java
View File

@ -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
{

4
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
View File

@ -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
*/

2
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
View File

@ -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.

2
artemis-distribution/pom.xml
View File

@ -36,7 +36,7 @@
</properties>
<dependencies>
<!-- ActiveMQ artifacts -->
<!-- ActiveMQ Artemis artifacts -->
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>artemis-boot</artifactId>

2
artemis-dto/src/main/java/org/apache/activemq/artemis/dto/package-info.java
View File

@ -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",

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSClient.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/ActiveMQJMSConstants.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/ConnectionFactoryControl.java
View File

@ -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

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/DestinationControl.java
View File

@ -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();

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSManagementHelper.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/SubscriptionInfo.java
View File

@ -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()
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
View File

@ -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.

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQJMSContext.java
View File

@ -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
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
View File

@ -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
{

4
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
View File

@ -48,7 +48,7 @@ import org.apache.activemq.artemis.utils.UUID;
/**
* ActiveMQ implementation of a JMS Message.
* ActiveMQ Artemis implementation of a JMS Message.
* <br>
* JMS Messages only live on the client side - the server only deals with MessageImpl
* instances
@ -271,7 +271,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 to guarantee to return the correct
// and String correlation id. This makes it impossible for ActiveMQ Artemis to guarantee to return the correct
// type as set by the user
// So we allow the behaviour to be overridden by a system property
// https://jira.jboss.org/jira/browse/HORNETQ-356

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
View File

@ -34,7 +34,7 @@ import org.apache.activemq.artemis.api.core.client.MessageHandler;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
/**
* ActiveMQ implementation of a JMS MessageConsumer.
* ActiveMQ Artemis implementation of a JMS MessageConsumer.
*/
public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscriber
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
View File

@ -43,7 +43,7 @@ import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
import org.apache.activemq.artemis.utils.UUID;
import org.apache.activemq.artemis.utils.UUIDGenerator;
/**
* ActiveMQ implementation of a JMS MessageProducer.
* ActiveMQ Artemis implementation of a JMS MessageProducer.
*/
public class ActiveMQMessageProducer implements MessageProducer, QueueSender, TopicPublisher
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
View File

@ -32,7 +32,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
/**
* ActiveMQ implementation of a JMS ObjectMessage.
* ActiveMQ Artemis implementation of a JMS ObjectMessage.
* <br>
* Don't used ObjectMessage if you want good performance!
* <p>

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
View File

@ -21,7 +21,7 @@ import javax.jms.Queue;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
* ActiveMQ implementation of a JMS Queue.
* ActiveMQ Artemis implementation of a JMS Queue.
* <br>
* This class can be instantiated directly.
*/

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
View File

@ -30,7 +30,7 @@ import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientSession;
/**
* ActiveMQ implementation of a JMS QueueBrowser.
* ActiveMQ Artemis implementation of a JMS QueueBrowser.
*/
public final class ActiveMQQueueBrowser implements QueueBrowser
{

4
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
View File

@ -61,7 +61,7 @@ import org.apache.activemq.artemis.api.core.client.ClientSession.AddressQuery;
import org.apache.activemq.artemis.api.core.client.ClientSession.QueueQuery;
/**
* ActiveMQ implementation of a JMS Session.
* ActiveMQ Artemis implementation of a JMS Session.
* <br>
* Note that we *do not* support JMS ASF (Application Server Facilities) optional
* constructs such as ConnectionConsumer
@ -307,7 +307,7 @@ public class ActiveMQSession implements QueueSession, TopicSession
{
if (destination != null && !(destination instanceof ActiveMQDestination))
{
throw new InvalidDestinationException("Not a ActiveMQ Destination:" + destination);
throw new InvalidDestinationException("Not a ActiveMQ Artemis Destination:" + destination);
}
try

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
View File

@ -42,7 +42,7 @@ import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadSho
import static org.apache.activemq.artemis.reader.StreamMessageUtil.streamReadString;
/**
* ActiveMQ implementation of a JMS StreamMessage.
* ActiveMQ Artemis implementation of a JMS StreamMessage.
*/
public final class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMessage
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
View File

@ -20,7 +20,7 @@ import javax.jms.TemporaryQueue;
/**
* ActiveMQ implementation of a JMS TemporaryQueue.
* ActiveMQ Artemis implementation of a JMS TemporaryQueue.
* <br>
* This class can be instantiated directly.
*/

4
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
View File

@ -30,7 +30,7 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
/**
* ActiveMQ implementation of a JMS TextMessage.
* ActiveMQ Artemis implementation of a JMS TextMessage.
* <br>
* This class was ported from SpyTextMessage in JBossMQ.
*/
@ -61,7 +61,7 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
}
/**
* A copy constructor for non-ActiveMQ JMS TextMessages.
* A copy constructor for non-ActiveMQ Artemis JMS TextMessages.
*/
public ActiveMQTextMessage(final TextMessage foreign, final ClientSession session) throws JMSException
{

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
View File

@ -21,7 +21,7 @@ import javax.jms.Topic;
import org.apache.activemq.artemis.api.core.SimpleString;
/**
* ActiveMQ implementation of a JMS Topic.
* ActiveMQ Artemis implementation of a JMS Topic.
* <br>
* This class can be instantiated directly.
*/

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQXAConnection.java
View File

@ -27,7 +27,7 @@ import javax.jms.XATopicSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
/**
* ActiveMQ implementation of a JMS XAConnection.
* ActiveMQ 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.

6
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/SelectorTranslator.java
View File

@ -21,12 +21,12 @@ import java.util.List;
/**
*
* This class converts a JMS selector expression into a ActiveMQ core filter expression.
* This class converts a JMS selector expression into a ActiveMQ Artemis core filter expression.
*
* JMS selector and ActiveMQ filters use the same syntax but have different identifiers.
* JMS selector and ActiveMQ Artemis filters use the same syntax but have different identifiers.
*
* We basically just need to replace the JMS header and property Identifier names
* with the corresponding ActiveMQ field and header Identifier names.
* with the corresponding ActiveMQ Artemis field and header Identifier names.
*
* We must be careful not to substitute any literals, or identifiers whose name contains the name
* of one we want to substitute.

2
artemis-jms-client/src/main/java/org/apache/activemq/artemis/jndi/ActiveMQInitialContextFactory.java
View File

@ -31,7 +31,7 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.uri.ConnectionFactoryParser;
/**
* A factory of the ActiveMQ InitialContext which contains
* A factory of the ActiveMQ 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

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/QualityOfServiceMode.java
View File

@ -42,7 +42,7 @@ package org.apache.activemq.artemis.jms.bridge;
*
* 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 server
* the source and the destination are on the same ActiveMQ 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

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
View File

@ -1843,7 +1843,7 @@ public final class JMSBridgeImpl implements JMSBridge
if (val instanceof byte[] == false)
{
//Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ message it might have such props
//Can't set byte[] array props through the JMS API - if we're bridging a ActiveMQ Artemis message it might have such props
msg.setObjectProperty(propName, entry.getValue());
}
else if (msg instanceof ActiveMQMessage)

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
View File

@ -26,7 +26,7 @@ import org.apache.activemq.artemis.spi.core.remoting.Connection;
import org.proton.plug.AMQPConnectionContext;
/**
* This is a Server's Connection representation used by ActiveMQ.
* This is a Server's Connection representation used by ActiveMQ Artemis.
*/
public class ActiveMQProtonRemotingConnection extends AbstractRemotingConnection
{

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ProtonProtocolManager.java
View File

@ -41,7 +41,7 @@ import org.proton.plug.AMQPServerConnectionContext;
import org.proton.plug.context.server.ProtonServerConnectionContextFactory;
/**
* A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ resources
* A proton protocol manager, basically reads the Proton Input and maps proton resources to ActiveMQ Artemis resources
*/
public class ProtonProtocolManager implements ProtocolManager<Interceptor>, NotificationListener
{

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
View File

@ -34,7 +34,7 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.readBodyMap;
import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
/**
* ActiveMQ implementation of a JMS MapMessage.
* ActiveMQ Artemis implementation of a JMS MapMessage.
*/
public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMessage
{

2
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
View File

@ -28,7 +28,7 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
/**
* ActiveMQ implementation of a JMS TextMessage.
* ActiveMQ Artemis implementation of a JMS TextMessage.
* <br>
* This class was ported from SpyTextMessage in JBossMQ.
*/

4
artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
View File

@ -103,7 +103,7 @@ public class OpenWireMessageConverter implements MessageConverter
return null;
}
//convert an ActiveMQ message to coreMessage
//convert an ActiveMQ Artemis message to coreMessage
public static void toCoreMessage(ServerMessageImpl coreMessage, Message messageSend, WireFormat marshaller) throws IOException
{
String type = messageSend.getType();
@ -400,7 +400,7 @@ public class OpenWireMessageConverter implements MessageConverter
case CommandTypes.ACTIVEMQ_MESSAGE:
return org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE;
default:
throw new IllegalStateException("Unknown ActiveMQ message type: " + amqType);
throw new IllegalStateException("Unknown ActiveMQ Artemis message type: " + amqType);
}
}

4
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
View File

@ -28,7 +28,7 @@ import org.proton.plug.util.CreditsSemaphore;
import org.proton.plug.util.NettyWritable;
/**
* A this is a wrapper around a ActiveMQ ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
* A this is a wrapper around a ActiveMQ Artemis ServerConsumer for handling outgoing messages and incoming acks via a Proton Sender
*/
public abstract class AbstractProtonContextSender extends ProtonInitializable implements ProtonDeliveryHandler
{
@ -79,7 +79,7 @@ public abstract class AbstractProtonContextSender extends ProtonInitializable im
@Override
/*
* handle an incoming Ack from Proton, basically pass to ActiveMQ to handle
* handle an incoming Ack from Proton, basically pass to ActiveMQ Artemis to handle
* */
public abstract void onMessage(Delivery delivery) throws ActiveMQAMQPException;

4
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
View File

@ -85,7 +85,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
}
/**
* create the actual underlying ActiveMQ Server Consumer
* create the actual underlying ActiveMQ Artemis Server Consumer
*/
@Override
public void initialise() throws Exception
@ -252,7 +252,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
/**
* handle an out going message from ActiveMQ, send via the Proton Sender
* handle an out going message from ActiveMQ Artemis, send via the Proton Sender
*/
public int deliverMessage(Object message, int deliveryCount) throws Exception
{

2
artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java
View File

@ -27,7 +27,7 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer;
* <p/>
* <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/>
* <p>On ActiveMQ we have the requirement of increment and decrement a counter until the user fires a ready handler (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 handler (commit). At that point we just act as a regular countDown.</p>
* <p/>
* <p>Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.</p>
* <p/>

2
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompDecoder.java
View File

@ -371,7 +371,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 + StompConnect also seem to trim whitespace from header values.
// ActiveMQ 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

4
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompFrameInterceptor.java
View File

@ -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 using STOMP protocol.
* This class is a simple way to intercepting client calls on ActiveMQ Artemis using STOMP protocol.
* <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>
*/
public interface StompFrameInterceptor extends BaseInterceptor<StompFrame>

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
View File

@ -33,7 +33,7 @@ import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.service.extensions.xa.recovery.XARecoveryConfig;
/**
* ActiveMQ ManagedConnectionFactory
* ActiveMQ Artemis ManagedConnectionFactory
*/
public final class ActiveMQRAManagedConnectionFactory implements ManagedConnectionFactory, ResourceAdapterAssociation
{

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
View File

@ -24,7 +24,7 @@ import javax.management.ObjectName;
/**
* A ActiveMQRAService ensures that ActiveMQ Resource Adapter will be stopped *before* the ActiveMQ server.
* A ActiveMQRAService ensures that ActiveMQ Artemis Resource Adapter will be stopped *before* the ActiveMQ Artemis server.
* https://jira.jboss.org/browse/HORNETQ-339
*/
public class ActiveMQRAService

2
artemis-ra/src/main/java/org/apache/activemq/artemis/ra/package.html
View File

@ -22,7 +22,7 @@
</head>
<body bgcolor="white">
<h1>ActiveMQ Resource Adaptor</h1>
<h1>ActiveMQ Artemis Resource Adaptor</h1>
</body>
</html>

2
artemis-rest/src/main/java/org/apache/activemq/artemis/rest/ActiveMQ.java
View File

@ -178,7 +178,7 @@ public class ActiveMQ
}
/**
* Was this ActiveMQ message generated from a REST call?
* Was this ActiveMQ Artemis message generated from a REST call?
*
* @param msg
* @return

2
artemis-rest/src/main/java/org/apache/activemq/artemis/rest/util/HttpMessageHelper.java
View File

@ -114,7 +114,7 @@ public class HttpMessageHelper
}
else
{
// assume posted as a JMS or ActiveMQ object message
// assume posted as a JMS or ActiveMQ Artemis object message
size = message.getBodyBuffer().readInt();
byte[] body = new byte[size];
message.getBodyBuffer().readBytes(body);

12
artemis-rest/src/main/resources/schema/artemis-rest.xsd
View File

@ -24,8 +24,8 @@
<xsd:element name="server-in-vm-id" type="xsd:string" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The ActiveMQ REST implementation uses the IN-VM transport to communicate
with ActiveMQ. It uses the default server id, which is "0".
The ActiveMQ Artemis REST implementation uses the IN-VM transport to communicate
with ActiveMQ Artemis. It uses the default server id, which is "0".
</xsd:documentation>
</xsd:annotation>
</xsd:element>
@ -33,7 +33,7 @@
<xsd:annotation>
<xsd:documentation>
By default, all links (URLs) are published using custom headers.
You can instead have the ActiveMQ REST implementation publish links
You can instead have the ActiveMQ Artemis REST implementation publish links
using the Link Header specification instead if you desire.
</xsd:documentation>
</xsd:annotation>
@ -73,7 +73,7 @@
<xsd:element name="producer-session-pool-size" type="xsd:int" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
The REST implementation pools ActiveMQ sessions for sending messages.
The REST implementation pools ActiveMQ Artemis sessions for sending messages.
This is the size of the pool. That number of sessions will be created
at startup time.
</xsd:documentation>
@ -106,8 +106,8 @@
<xsd:element name="consumer-window-size" type="xsd:int" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>
For consumers, this config option is the same as the ActiveMQ one of the
same name. It will be used by sessions created by the ActiveMQ REST
For consumers, this config option is the same as the ActiveMQ Artemis one of the
same name. It will be used by sessions created by the ActiveMQ Artemis REST
implementation.
</xsd:documentation>
</xsd:annotation>

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
View File

@ -31,7 +31,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 servers.
* A Configuration is used to configure ActiveMQ Artemis servers.
*/
public interface Configuration
{
@ -187,7 +187,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 servers are run inside
* Changing this JMX domain is required if multiple ActiveMQ Artemis servers are run inside
* the same JVM and all servers are using the same MBeanServer.
*/
Configuration setJMXDomain(String domain);
@ -837,14 +837,14 @@ public interface Configuration
boolean isMaskPassword();
/*
* Whether or not that ActiveMQ should use all protocols available on the classpath. If false only the core protocol will
* Whether or not that ActiveMQ Artemis should use all protocols available on the classpath. If false only the core protocol will
* be set, any other protocols will need to be set directly on the ActiveMQServer
* */
Configuration setResolveProtocols(boolean resolveProtocols);
/*
* @see #setResolveProtocols()
* @return whether ActiveMQ should resolve and use any Protocols available on the classpath
* @return whether ActiveMQ Artemis should resolve and use any Protocols available on the classpath
* Default value is {@value org.apache.activemq.artemis.api.config.org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}.
* */
boolean isResolveProtocols();

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
View File

@ -29,9 +29,9 @@ import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
import org.apache.activemq.artemis.core.server.ServerMessage;
/**
* This class implements a ActiveMQ filter
* This class implements a ActiveMQ Artemis filter
*
* ActiveMQ filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
* ActiveMQ Artemis filters have the same syntax as JMS 1.1 selectors, but the identifiers are different.
*
* Valid identifiers that can be used are:
*

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
View File

@ -106,7 +106,7 @@ public interface PagingStore extends ActiveMQComponent
* 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 only uses through the
* @throws Exception Note: This should still be part of the interface, even though ActiveMQ Artemis only uses through the
*/
Page depage() throws Exception;

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
View File

@ -663,7 +663,7 @@ public class PagingStoreImpl implements PagingStore
returnPage.delete(null);
// This will trigger this address to exit the page mode,
// and this will make ActiveMQ start using the journal again
// and this will make ActiveMQ Artemis start using the journal again
return null;
}
else

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
View File

@ -38,7 +38,7 @@ import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.TypedProperties;
/**
* The ActiveMQ SecurityStore implementation
* The ActiveMQ Artemis SecurityStore implementation
*/
public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryChangeListener
{

4
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
View File

@ -49,7 +49,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.utils.ExecutorFactory;
/**
* This interface defines the internal interface of the ActiveMQ Server exposed to other components
* This interface defines the internal interface of the ActiveMQ Artemis Server exposed to other components
* of the server.
* <p>
* This is not part of our public API.
@ -91,7 +91,7 @@ public interface ActiveMQServer extends ActiveMQComponent
NodeManager getNodeManager();
/**
* Returns the resource to manage this ActiveMQ server.
* Returns the resource to manage this ActiveMQ Artemis server.
* @throws IllegalStateException if the server is not properly started.
*/
ActiveMQServerControlImpl getActiveMQServerControl();

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
View File

@ -322,7 +322,7 @@ public interface ActiveMQServerLogger extends BasicLogger
void divertBindingNotExists(SimpleString bindingName);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT)
@Message(id = 222007, value = "Security risk! Apache ActiveMQ Artemis is running with the default cluster admin user and default password. Please see the cluster chapter in the ActiveMQ Artemis User Guide for instructions on how to change this.", format = Message.Format.MESSAGE_FORMAT)
void clusterSecurityRisk();
@LogMessage(level = Logger.Level.WARN)

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/embedded/EmbeddedActiveMQ.java
View File

@ -27,7 +27,7 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManagerImpl;
/**
* Helper class to simplify bootstrap of ActiveMQ server. Bootstraps from classpath-based config files.
* Helper class to simplify bootstrap of ActiveMQ Artemis server. Bootstraps from classpath-based config files.
*/
public class EmbeddedActiveMQ
{

2
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
View File

@ -23,7 +23,7 @@ import java.nio.channels.FileLock;
import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
/**
* This is using the ActiveMQ Libaio Native to perform calls to flock on a Linux system. At the
* This is using the ActiveMQ Artemis Libaio Native to perform calls to flock on a Linux system. At the
* current version of RHEL there's a bug on GFS2 and because of that fctl is not functional what
* will cause issues on Failover over Shared Storage.
* <p/>

Some files were not shown because too many files have changed in this diff Show More