diff --git a/activemq-client-jakarta/pom.xml b/activemq-client-jakarta/pom.xml index f39508a699..aa0dd7da4e 100644 --- a/activemq-client-jakarta/pom.xml +++ b/activemq-client-jakarta/pom.xml @@ -26,6 +26,9 @@ bundle ActiveMQ :: Client Jakarta Jakarta transition module for ActiveMQ Client implementation + + true + org.apache.activemq diff --git a/activemq-client/src/main/grammar/SelectorParser.jj b/activemq-client/src/main/grammar/SelectorParser.jj index 435b2d4eb1..605dec42c4 100755 --- a/activemq-client/src/main/grammar/SelectorParser.jj +++ b/activemq-client/src/main/grammar/SelectorParser.jj @@ -53,7 +53,7 @@ package org.apache.activemq.selector; import java.io.*; import java.util.*; -import javax.jms.InvalidSelectorException; +import jakarta.jms.InvalidSelectorException; import org.apache.activemq.filter.*; import org.apache.activemq.filter.FunctionCallExpression.invalidFunctionExpressionException; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java index 2ccac1d99c..a91349b28b 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java @@ -37,23 +37,23 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.Connection; -import javax.jms.ConnectionConsumer; -import javax.jms.ConnectionMetaData; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueSession; -import javax.jms.ServerSessionPool; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.TopicConnection; -import javax.jms.TopicSession; -import javax.jms.XAConnection; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionConsumer; +import jakarta.jms.ConnectionMetaData; +import jakarta.jms.Destination; +import jakarta.jms.ExceptionListener; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; +import jakarta.jms.QueueConnection; +import jakarta.jms.QueueSession; +import jakarta.jms.ServerSessionPool; +import jakarta.jms.Session; +import jakarta.jms.Topic; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicSession; +import jakarta.jms.XAConnection; import org.apache.activemq.advisory.DestinationSource; import org.apache.activemq.blob.BlobTransferPolicy; @@ -436,9 +436,9 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * @param newClientID the unique client identifier * @throws JMSException if the JMS provider fails to set the client ID for * this connection due to some internal error. - * @throws javax.jms.InvalidClientIDException if the JMS client specifies an + * @throws jakarta.jms.InvalidClientIDException if the JMS client specifies an * invalid or duplicate client ID. - * @throws javax.jms.IllegalStateException if the JMS client attempts to set + * @throws jakarta.jms.IllegalStateException if the JMS client attempts to set * a connection's client ID at the wrong time or when it has * been administratively configured. */ @@ -474,7 +474,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * @return the connection metadata * @throws JMSException if the JMS provider fails to get the connection * metadata for this connection. - * @see javax.jms.ConnectionMetaData + * @see jakarta.jms.ConnectionMetaData */ @Override public ConnectionMetaData getMetaData() throws JMSException { @@ -492,7 +492,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * this connection. * @throws JMSException if the JMS provider fails to get the * ExceptionListener for this connection. - * @see javax.jms.Connection#setExceptionListener(ExceptionListener) + * @see jakarta.jms.Connection#setExceptionListener(ExceptionListener) */ @Override public ExceptionListener getExceptionListener() throws JMSException { @@ -560,7 +560,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * * @throws JMSException if the JMS provider fails to start message delivery * due to some internal error. - * @see javax.jms.Connection#stop() + * @see jakarta.jms.Connection#stop() */ @Override public void start() throws JMSException { @@ -603,7 +603,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * * @throws JMSException if the JMS provider fails to stop message delivery * due to some internal error. - * @see javax.jms.Connection#start() + * @see jakarta.jms.Connection#start() */ @Override public void stop() throws JMSException { @@ -799,11 +799,11 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * create a connection consumer due to some internal error * or invalid arguments for sessionPool and * messageSelector. - * @throws javax.jms.InvalidDestinationException if an invalid destination + * @throws jakarta.jms.InvalidDestinationException if an invalid destination * is specified. - * @throws javax.jms.InvalidSelectorException if the message selector is + * @throws jakarta.jms.InvalidSelectorException if the message selector is * invalid. - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer * @since 1.1 */ @Override @@ -833,11 +833,11 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * create a connection consumer due to some internal error * or invalid arguments for sessionPool and * messageSelector. - * @throws javax.jms.InvalidDestinationException if an invalid destination + * @throws jakarta.jms.InvalidDestinationException if an invalid destination * is specified. - * @throws javax.jms.InvalidSelectorException if the message selector is + * @throws jakarta.jms.InvalidSelectorException if the message selector is * invalid. - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer * @since 1.1 */ public ConnectionConsumer createDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages, @@ -868,7 +868,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon /** * - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer * @since 2.0 */ @Override @@ -879,7 +879,7 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon /** * - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer * @since 2.0 */ @Override @@ -1214,11 +1214,11 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * to create a connection consumer due to some internal * error or invalid arguments for sessionPool * and messageSelector. - * @throws javax.jms.InvalidDestinationException if an invalid topic is + * @throws jakarta.jms.InvalidDestinationException if an invalid topic is * specified. - * @throws javax.jms.InvalidSelectorException if the message selector is + * @throws jakarta.jms.InvalidSelectorException if the message selector is * invalid. - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer */ @Override public ConnectionConsumer createConnectionConsumer(Topic topic, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { @@ -1243,11 +1243,11 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * to create a connection consumer due to some internal * error or invalid arguments for sessionPool * and messageSelector. - * @throws javax.jms.InvalidDestinationException if an invalid queue is + * @throws jakarta.jms.InvalidDestinationException if an invalid queue is * specified. - * @throws javax.jms.InvalidSelectorException if the message selector is + * @throws jakarta.jms.InvalidSelectorException if the message selector is * invalid. - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer */ @Override public ConnectionConsumer createConnectionConsumer(Queue queue, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { @@ -1272,11 +1272,11 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon * create a connection consumer due to some internal error * or invalid arguments for sessionPool and * messageSelector. - * @throws javax.jms.InvalidDestinationException if an invalid destination + * @throws jakarta.jms.InvalidDestinationException if an invalid destination * is specified. - * @throws javax.jms.InvalidSelectorException if the message selector is + * @throws jakarta.jms.InvalidSelectorException if the message selector is * invalid. - * @see javax.jms.ConnectionConsumer + * @see jakarta.jms.ConnectionConsumer * @since 1.1 */ @Override diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java index 44f63a60aa..b630edc09a 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java @@ -19,12 +19,12 @@ package org.apache.activemq; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.ConnectionConsumer; -import javax.jms.IllegalStateException; -import javax.jms.JMSException; -import javax.jms.ServerSession; -import javax.jms.ServerSessionPool; -import javax.jms.Session; +import jakarta.jms.ConnectionConsumer; +import jakarta.jms.IllegalStateException; +import jakarta.jms.JMSException; +import jakarta.jms.ServerSession; +import jakarta.jms.ServerSessionPool; +import jakarta.jms.Session; import org.apache.activemq.command.ConsumerInfo; import org.apache.activemq.command.MessageDispatch; @@ -45,11 +45,11 @@ import org.apache.activemq.command.MessageDispatch; * minimizes resource use at the expense of some serialization of message * processing. * - * @see javax.jms.Connection#createConnectionConsumer - * @see javax.jms.Connection#createDurableConnectionConsumer - * @see javax.jms.QueueConnection#createConnectionConsumer - * @see javax.jms.TopicConnection#createConnectionConsumer - * @see javax.jms.TopicConnection#createDurableConnectionConsumer + * @see jakarta.jms.Connection#createConnectionConsumer + * @see jakarta.jms.Connection#createDurableConnectionConsumer + * @see jakarta.jms.QueueConnection#createConnectionConsumer + * @see jakarta.jms.TopicConnection#createConnectionConsumer + * @see jakarta.jms.TopicConnection#createDurableConnectionConsumer */ public class ActiveMQConnectionConsumer implements ConnectionConsumer, ActiveMQDispatcher { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java index 2324448bba..4cbeacb5bd 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java @@ -24,15 +24,15 @@ import java.security.PrivilegedAction; import java.util.*; import java.util.concurrent.RejectedExecutionHandler; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.ExceptionListener; -import javax.jms.JMSContext; -import javax.jms.JMSException; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; +import jakarta.jms.Connection; +import jakarta.jms.ConnectionFactory; +import jakarta.jms.ExceptionListener; +import jakarta.jms.JMSContext; +import jakarta.jms.JMSException; +import jakarta.jms.QueueConnection; +import jakarta.jms.QueueConnectionFactory; +import jakarta.jms.TopicConnection; +import jakarta.jms.TopicConnectionFactory; import javax.naming.Context; import org.apache.activemq.blob.BlobTransferPolicy; @@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory; * QueueConnections and TopicConnections. * * - * @see javax.jms.ConnectionFactory + * @see jakarta.jms.ConnectionFactory */ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, StatsCapable, Cloneable { private static final Logger LOG = LoggerFactory.getLogger(ActiveMQConnectionFactory.class); diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java index 1f0f7655c3..0e01e298ed 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java @@ -21,7 +21,7 @@ import java.util.Vector; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.jms.ConnectionMetaData; +import jakarta.jms.ConnectionMetaData; /** * A ConnectionMetaData object provides information describing diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java index 409506d149..b104edb8dc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConsumer.java @@ -16,12 +16,12 @@ */ package org.apache.activemq; -import javax.jms.JMSConsumer; -import javax.jms.JMSException; -import javax.jms.JMSRuntimeException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; +import jakarta.jms.JMSConsumer; +import jakarta.jms.JMSException; +import jakarta.jms.JMSRuntimeException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; import org.apache.activemq.util.JMSExceptionSupport; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java index 4966d09a27..d7d4aa7b85 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQContext.java @@ -20,27 +20,27 @@ import java.io.Serializable; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.BytesMessage; -import javax.jms.ConnectionMetaData; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.IllegalStateRuntimeException; -import javax.jms.JMSConsumer; -import javax.jms.JMSContext; -import javax.jms.JMSException; -import javax.jms.JMSProducer; -import javax.jms.JMSRuntimeException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; +import jakarta.jms.BytesMessage; +import jakarta.jms.ConnectionMetaData; +import jakarta.jms.Destination; +import jakarta.jms.ExceptionListener; +import jakarta.jms.IllegalStateRuntimeException; +import jakarta.jms.JMSConsumer; +import jakarta.jms.JMSContext; +import jakarta.jms.JMSException; +import jakarta.jms.JMSProducer; +import jakarta.jms.JMSRuntimeException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.Session; +import jakarta.jms.StreamMessage; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; import org.apache.activemq.util.JMSExceptionSupport; @@ -53,7 +53,7 @@ import org.apache.activemq.util.JMSExceptionSupport; * single-threaded context for sending and receiving messages. * * - * @see javax.jms.JMSContext + * @see jakarta.jms.JMSContext */ public class ActiveMQContext implements JMSContext { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java index 464f63a8fa..1a67558266 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageAuditNoSync.java @@ -18,8 +18,8 @@ package org.apache.activemq; import java.io.Serializable; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.command.MessageId; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java index f8ba61d41d..298ce38ddc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java @@ -30,13 +30,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.TransactionRolledBackException; import org.apache.activemq.blob.BlobDownloader; import org.apache.activemq.command.ActiveMQBlobMessage; @@ -96,10 +96,10 @@ import org.slf4j.LoggerFactory; * throw an exception. * * - * @see javax.jms.MessageConsumer - * @see javax.jms.QueueReceiver - * @see javax.jms.TopicSubscriber - * @see javax.jms.Session + * @see jakarta.jms.MessageConsumer + * @see jakarta.jms.QueueReceiver + * @see jakarta.jms.TopicSubscriber + * @see jakarta.jms.Session */ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsCapable, ActiveMQDispatcher { @@ -415,7 +415,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC * set * @throws JMSException if the JMS provider fails to get the message * listener due to some internal error. - * @see javax.jms.MessageConsumer#setMessageListener(javax.jms.MessageListener) + * @see jakarta.jms.MessageConsumer#setMessageListener(jakarta.jms.MessageListener) */ @Override public MessageListener getMessageListener() throws JMSException { @@ -436,7 +436,7 @@ public class ActiveMQMessageConsumer implements MessageAvailableConsumer, StatsC * @param listener the listener to which the messages are to be delivered * @throws JMSException if the JMS provider fails to receive the next * message due to some internal error. - * @see javax.jms.MessageConsumer#getMessageListener + * @see jakarta.jms.MessageConsumer#getMessageListener */ @Override public void setMessageListener(MessageListener listener) throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java index 9e9ebd4334..185ebffd41 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java @@ -20,12 +20,12 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.CompletionListener; -import javax.jms.Destination; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.CompletionListener; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.Message; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ProducerAck; @@ -67,9 +67,9 @@ import org.slf4j.LoggerFactory; * JMS API does not define the accuracy provided. * * - * @see javax.jms.TopicPublisher - * @see javax.jms.QueueSender - * @see javax.jms.Session#createProducer + * @see jakarta.jms.TopicPublisher + * @see jakarta.jms.QueueSender + * @see jakarta.jms.Session#createProducer */ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport implements StatsCapable, Disposable { @@ -216,7 +216,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl * specified. * @throws InvalidDestinationException if a client uses this method with an * invalid destination. - * @see javax.jms.Session#createProducer + * @see jakarta.jms.Session#createProducer * @since 1.1 */ @Override @@ -234,7 +234,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl * specified. * @throws InvalidDestinationException if a client uses this method with an * invalid destination. - * @see javax.jms.Session#createProducer + * @see jakarta.jms.Session#createProducer * @since 2.0 */ @Override diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java index accc7e5a4d..5816d70e30 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java @@ -18,14 +18,14 @@ package org.apache.activemq; import java.util.Set; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.IllegalStateException; -import javax.jms.IllegalStateRuntimeException; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageFormatRuntimeException; -import javax.jms.MessageProducer; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateException; +import jakarta.jms.IllegalStateRuntimeException; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageFormatRuntimeException; +import jakarta.jms.MessageProducer; /** * A useful base class for implementing a {@link MessageProducer} @@ -63,7 +63,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Gets the delivery delay value for this MessageProducer. * * @return the delivery delay for this messageProducer - * @throws javax.jms.JMSException if the JMS provider fails to determine if deliver delay is + * @throws jakarta.jms.JMSException if the JMS provider fails to determine if deliver delay is * disabled due to some internal error. */ @Override @@ -87,7 +87,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Message IDs are enabled by default. * * @param disableMessageID indicates if message IDs are disabled - * @throws javax.jms.JMSException if the JMS provider fails to close the producer due to + * @throws jakarta.jms.JMSException if the JMS provider fails to close the producer due to * some internal error. */ public void setDisableMessageID(boolean disableMessageID) throws JMSException { @@ -99,7 +99,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Gets an indication of whether message IDs are disabled. * * @return an indication of whether message IDs are disabled - * @throws javax.jms.JMSException if the JMS provider fails to determine if message IDs are + * @throws jakarta.jms.JMSException if the JMS provider fails to determine if message IDs are * disabled due to some internal error. */ public boolean getDisableMessageID() throws JMSException { @@ -123,7 +123,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Message timestamps are enabled by default. * * @param disableMessageTimestamp indicates if message timestamps are disabled - * @throws javax.jms.JMSException if the JMS provider fails to close the producer due to + * @throws jakarta.jms.JMSException if the JMS provider fails to close the producer due to * some internal error. */ public void setDisableMessageTimestamp(boolean disableMessageTimestamp) throws JMSException { @@ -135,7 +135,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Gets an indication of whether message timestamps are disabled. * * @return an indication of whether message timestamps are disabled - * @throws javax.jms.JMSException if the JMS provider fails to close the producer due to + * @throws jakarta.jms.JMSException if the JMS provider fails to close the producer due to * some internal error. */ public boolean getDisableMessageTimestamp() throws JMSException { @@ -151,16 +151,16 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * @param newDeliveryMode the message delivery mode for this message producer; legal * values are DeliveryMode.NON_PERSISTENT and * DeliveryMode.PERSISTENT - * @throws javax.jms.JMSException if the JMS provider fails to set the delivery mode due to + * @throws jakarta.jms.JMSException if the JMS provider fails to set the delivery mode due to * some internal error. - * @see javax.jms.MessageProducer#getDeliveryMode - * @see javax.jms.DeliveryMode#NON_PERSISTENT - * @see javax.jms.DeliveryMode#PERSISTENT - * @see javax.jms.Message#DEFAULT_DELIVERY_MODE + * @see jakarta.jms.MessageProducer#getDeliveryMode + * @see jakarta.jms.DeliveryMode#NON_PERSISTENT + * @see jakarta.jms.DeliveryMode#PERSISTENT + * @see jakarta.jms.Message#DEFAULT_DELIVERY_MODE */ public void setDeliveryMode(int newDeliveryMode) throws JMSException { if (newDeliveryMode != DeliveryMode.PERSISTENT && newDeliveryMode != DeliveryMode.NON_PERSISTENT) { - throw new javax.jms.IllegalStateException("unknown delivery mode: " + newDeliveryMode); + throw new jakarta.jms.IllegalStateException("unknown delivery mode: " + newDeliveryMode); } checkClosed(); this.defaultDeliveryMode = newDeliveryMode; @@ -170,7 +170,7 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Gets the producer's default delivery mode. * * @return the message delivery mode for this message producer - * @throws javax.jms.JMSException if the JMS provider fails to close the producer due to + * @throws jakarta.jms.JMSException if the JMS provider fails to close the producer due to * some internal error. */ public int getDeliveryMode() throws JMSException { @@ -188,10 +188,10 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * * @param newDefaultPriority the message priority for this message producer; must be a * value between 0 and 9 - * @throws javax.jms.JMSException if the JMS provider fails to set the delivery mode due to + * @throws jakarta.jms.JMSException if the JMS provider fails to set the delivery mode due to * some internal error. - * @see javax.jms.MessageProducer#getPriority - * @see javax.jms.Message#DEFAULT_PRIORITY + * @see jakarta.jms.MessageProducer#getPriority + * @see jakarta.jms.Message#DEFAULT_PRIORITY */ public void setPriority(int newDefaultPriority) throws JMSException { if (newDefaultPriority < 0 || newDefaultPriority > 9) { @@ -205,9 +205,9 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Gets the producer's default priority. * * @return the message priority for this message producer - * @throws javax.jms.JMSException if the JMS provider fails to close the producer due to + * @throws jakarta.jms.JMSException if the JMS provider fails to close the producer due to * some internal error. - * @see javax.jms.MessageProducer#setPriority + * @see jakarta.jms.MessageProducer#setPriority */ public int getPriority() throws JMSException { checkClosed(); @@ -221,10 +221,10 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * Time to live is set to zero by default. * * @param timeToLive the message time to live in milliseconds; zero is unlimited - * @throws javax.jms.JMSException if the JMS provider fails to set the time to live due to + * @throws jakarta.jms.JMSException if the JMS provider fails to set the time to live due to * some internal error. - * @see javax.jms.MessageProducer#getTimeToLive - * @see javax.jms.Message#DEFAULT_TIME_TO_LIVE + * @see jakarta.jms.MessageProducer#getTimeToLive + * @see jakarta.jms.Message#DEFAULT_TIME_TO_LIVE */ public void setTimeToLive(long timeToLive) throws JMSException { if (timeToLive < 0L) { @@ -239,9 +239,9 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * that a produced message should be retained by the message system. * * @return the message time to live in milliseconds; zero is unlimited - * @throws javax.jms.JMSException if the JMS provider fails to get the time to live due to + * @throws jakarta.jms.JMSException if the JMS provider fails to get the time to live due to * some internal error. - * @see javax.jms.MessageProducer#setTimeToLive + * @see jakarta.jms.MessageProducer#setTimeToLive */ public long getTimeToLive() throws JMSException { checkClosed(); @@ -253,17 +253,17 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * delivery mode, priority, and time to live. * * @param message the message to send - * @throws javax.jms.JMSException if the JMS provider fails to send the message due to some + * @throws jakarta.jms.JMSException if the JMS provider fails to send the message due to some * internal error. - * @throws javax.jms.MessageFormatException if an invalid message is specified. - * @throws javax.jms.InvalidDestinationException if a client uses this method with a + * @throws jakarta.jms.MessageFormatException if an invalid message is specified. + * @throws jakarta.jms.InvalidDestinationException if a client uses this method with a * MessageProducer with an invalid destination. * @throws UnsupportedOperationException * if a client uses this method with a * MessageProducer that did not specify a * destination at creation time. - * @see javax.jms.Session#createProducer - * @see javax.jms.MessageProducer + * @see jakarta.jms.Session#createProducer + * @see jakarta.jms.MessageProducer * @since 1.1 */ public void send(Message message) throws JMSException { @@ -282,16 +282,16 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * @param deliveryMode the delivery mode to use * @param priority the priority for this message * @param timeToLive the message's lifetime (in milliseconds) - * @throws javax.jms.JMSException if the JMS provider fails to send the message due to some + * @throws jakarta.jms.JMSException if the JMS provider fails to send the message due to some * internal error. - * @throws javax.jms.MessageFormatException if an invalid message is specified. - * @throws javax.jms.InvalidDestinationException if a client uses this method with a + * @throws jakarta.jms.MessageFormatException if an invalid message is specified. + * @throws jakarta.jms.InvalidDestinationException if a client uses this method with a * MessageProducer with an invalid destination. * @throws UnsupportedOperationException * if a client uses this method with a * MessageProducer that did not specify a * destination at creation time. - * @see javax.jms.Session#createProducer + * @see jakarta.jms.Session#createProducer * @since 1.1 */ public void send(Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { @@ -314,16 +314,16 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, * * @param destination the destination to send this message to * @param message the message to send - * @throws javax.jms.JMSException if the JMS provider fails to send the message due to some + * @throws jakarta.jms.JMSException if the JMS provider fails to send the message due to some * internal error. - * @throws javax.jms.MessageFormatException if an invalid message is specified. - * @throws javax.jms.InvalidDestinationException if a client uses this method with an invalid destination. + * @throws jakarta.jms.MessageFormatException if an invalid message is specified. + * @throws jakarta.jms.InvalidDestinationException if a client uses this method with an invalid destination. * @throws UnsupportedOperationException * if a client uses this method with a * MessageProducer that specified a destination at * creation time. - * @see javax.jms.Session#createProducer - * @see javax.jms.MessageProducer + * @see jakarta.jms.Session#createProducer + * @see jakarta.jms.MessageProducer */ public void send(Destination destination, Message message) throws JMSException { this.send(destination, diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java index f456b5f9aa..e309761941 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java @@ -21,15 +21,15 @@ import java.lang.reflect.Modifier; import java.net.MalformedURLException; import java.util.Enumeration; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageEOFException; -import javax.jms.ObjectMessage; -import javax.jms.StreamMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageEOFException; +import jakarta.jms.ObjectMessage; +import jakarta.jms.StreamMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.blob.BlobDownloader; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java index 2596bf2aac..dc7311981e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQProducer.java @@ -22,18 +22,18 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import javax.jms.BytesMessage; -import javax.jms.CompletionListener; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.IllegalStateRuntimeException; -import javax.jms.JMSException; -import javax.jms.JMSProducer; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageFormatRuntimeException; -import javax.jms.ObjectMessage; -import javax.jms.TextMessage; +import jakarta.jms.BytesMessage; +import jakarta.jms.CompletionListener; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateRuntimeException; +import jakarta.jms.JMSException; +import jakarta.jms.JMSProducer; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageFormatRuntimeException; +import jakarta.jms.ObjectMessage; +import jakarta.jms.TextMessage; import org.apache.activemq.util.JMSExceptionSupport; import org.apache.activemq.util.TypeConversionSupport; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java index f7c96a13f9..a92ba5e8de 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java @@ -19,8 +19,8 @@ package org.apache.activemq; import java.util.Enumeration; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jms.*; -import javax.jms.IllegalStateException; +import jakarta.jms.*; +import jakarta.jms.IllegalStateException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ConsumerId; @@ -46,10 +46,10 @@ import org.apache.activemq.selector.SelectorParser; * * or a QueueSession. * - * @see javax.jms.Session#createBrowser - * @see javax.jms.QueueSession#createBrowser - * @see javax.jms.QueueBrowser - * @see javax.jms.QueueReceiver + * @see jakarta.jms.Session#createBrowser + * @see jakarta.jms.QueueSession#createBrowser + * @see jakarta.jms.QueueBrowser + * @see jakarta.jms.QueueReceiver */ public class ActiveMQQueueBrowser implements QueueBrowser, Enumeration { @@ -183,7 +183,7 @@ public class ActiveMQQueueBrowser implements QueueBrowser, Enumeration { } try { - javax.jms.Message answer = consumer.receiveNoWait(); + jakarta.jms.Message answer = consumer.receiveNoWait(); if (answer != null) { return answer; } diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java index 1f6d4761db..7dd075cced 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java @@ -16,9 +16,9 @@ */ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.QueueReceiver; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; +import jakarta.jms.QueueReceiver; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ConsumerId; @@ -45,11 +45,11 @@ import org.apache.activemq.command.ConsumerId; * * is provided to support existing code. * - * @see javax.jms.Session#createConsumer(javax.jms.Destination, String) - * @see javax.jms.Session#createConsumer(javax.jms.Destination) - * @see javax.jms.QueueSession#createReceiver(Queue, String) - * @see javax.jms.QueueSession#createReceiver(Queue) - * @see javax.jms.MessageConsumer + * @see jakarta.jms.Session#createConsumer(jakarta.jms.Destination, String) + * @see jakarta.jms.Session#createConsumer(jakarta.jms.Destination) + * @see jakarta.jms.QueueSession#createReceiver(Queue, String) + * @see jakarta.jms.QueueSession#createReceiver(Queue) + * @see jakarta.jms.MessageConsumer */ public class ActiveMQQueueReceiver extends ActiveMQMessageConsumer implements QueueReceiver { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java index 6451ab77c6..e46288d17e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSender.java @@ -17,10 +17,10 @@ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Queue; -import javax.jms.QueueSender; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Queue; +import jakarta.jms.QueueSender; import org.apache.activemq.command.ActiveMQDestination; @@ -66,8 +66,8 @@ import org.apache.activemq.command.ActiveMQDestination; * object is recommended when creating new code. The QueueSender * is provided to support existing code. * - * @see javax.jms.MessageProducer - * @see javax.jms.QueueSession#createSender(Queue) + * @see jakarta.jms.MessageProducer + * @see jakarta.jms.QueueSession#createSender(Queue) */ public class ActiveMQQueueSender extends ActiveMQMessageProducer implements QueueSender { @@ -102,9 +102,9 @@ public class ActiveMQQueueSender extends ActiveMQMessageProducer implements Queu * @param message the message to send * @throws JMSException if the JMS provider fails to send the message due to * some internal error. - * @see javax.jms.MessageProducer#getDeliveryMode() - * @see javax.jms.MessageProducer#getTimeToLive() - * @see javax.jms.MessageProducer#getPriority() + * @see jakarta.jms.MessageProducer#getDeliveryMode() + * @see jakarta.jms.MessageProducer#getTimeToLive() + * @see jakarta.jms.MessageProducer#getPriority() */ public void send(Queue queue, Message message) throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java index 700317ad45..b2f7cd93e1 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java @@ -18,28 +18,28 @@ package org.apache.activemq; import java.io.Serializable; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.QueueReceiver; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.StreamMessage; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicSubscriber; +import jakarta.jms.BytesMessage; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.QueueReceiver; +import jakarta.jms.QueueSender; +import jakarta.jms.QueueSession; +import jakarta.jms.StreamMessage; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; +import jakarta.jms.TopicSubscriber; /** * A QueueSession implementation that throws IllegalStateExceptions when Topic diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java index 66f7347ed6..766005f287 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java @@ -30,33 +30,33 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.InvalidSelectorException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.QueueReceiver; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.StreamMessage; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.BytesMessage; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.InvalidSelectorException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.QueueReceiver; +import jakarta.jms.QueueSender; +import jakarta.jms.QueueSession; +import jakarta.jms.Session; +import jakarta.jms.StreamMessage; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; +import jakarta.jms.TopicPublisher; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; +import jakarta.jms.TransactionRolledBackException; import org.apache.activemq.blob.BlobDownloader; import org.apache.activemq.blob.BlobTransferPolicy; @@ -180,10 +180,10 @@ import org.slf4j.LoggerFactory; * integrating the JMS API into their application server products. * * - * @see javax.jms.Session - * @see javax.jms.QueueSession - * @see javax.jms.TopicSession - * @see javax.jms.XASession + * @see jakarta.jms.Session + * @see jakarta.jms.QueueSession + * @see jakarta.jms.TopicSession + * @see jakarta.jms.XASession */ public class ActiveMQSession implements Session, QueueSession, TopicSession, StatsCapable, ActiveMQDispatcher { @@ -553,7 +553,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * acknowledgement mode for the session. If the session is * transacted, returns SESSION_TRANSACTED. * @throws JMSException - * @see javax.jms.Connection#createSession(boolean,int) + * @see jakarta.jms.Connection#createSession(boolean,int) * @since 1.1 exception JMSException if there is some internal error. */ @Override @@ -570,14 +570,14 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * due to some internal error. * @throws TransactionRolledBackException if the transaction is rolled back * due to some internal error during commit. - * @throws javax.jms.IllegalStateException if the method is not called by a + * @throws jakarta.jms.IllegalStateException if the method is not called by a * transacted session. */ @Override public void commit() throws JMSException { checkClosed(); if (!getTransacted()) { - throw new javax.jms.IllegalStateException("Not a transacted session"); + throw new jakarta.jms.IllegalStateException("Not a transacted session"); } if (LOG.isDebugEnabled()) { LOG.debug(getSessionId() + " Transaction Commit :" + transactionContext.getTransactionId()); @@ -591,14 +591,14 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * * @throws JMSException if the JMS provider fails to roll back the * transaction due to some internal error. - * @throws javax.jms.IllegalStateException if the method is not called by a + * @throws jakarta.jms.IllegalStateException if the method is not called by a * transacted session. */ @Override public void rollback() throws JMSException { checkClosed(); if (!getTransacted()) { - throw new javax.jms.IllegalStateException("Not a transacted session"); + throw new jakarta.jms.IllegalStateException("Not a transacted session"); } if (LOG.isDebugEnabled()) { LOG.debug(getSessionId() + " Transaction Rollback, txid:" + transactionContext.getTransactionId()); @@ -828,9 +828,9 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * @return the message listener associated with this session * @throws JMSException if the JMS provider fails to get the message * listener due to an internal error. - * @see javax.jms.Session#setMessageListener(javax.jms.MessageListener) - * @see javax.jms.ServerSessionPool - * @see javax.jms.ServerSession + * @see jakarta.jms.Session#setMessageListener(jakarta.jms.MessageListener) + * @see jakarta.jms.ServerSessionPool + * @see jakarta.jms.ServerSession */ @Override public MessageListener getMessageListener() throws JMSException { @@ -855,9 +855,9 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * @param listener the message listener to associate with this session * @throws JMSException if the JMS provider fails to set the message * listener due to an internal error. - * @see javax.jms.Session#getMessageListener() - * @see javax.jms.ServerSessionPool - * @see javax.jms.ServerSession + * @see jakarta.jms.Session#getMessageListener() + * @see jakarta.jms.ServerSessionPool + * @see jakarta.jms.ServerSession */ @Override public void setMessageListener(MessageListener listener) throws JMSException { @@ -878,7 +878,7 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * Optional operation, intended to be used only by Application Servers, not * by ordinary JMS clients. * - * @see javax.jms.ServerSession + * @see jakarta.jms.ServerSession */ @Override public void run() { @@ -1813,9 +1813,9 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta * * @throws JMSException if the JMS provider fails to acknowledge the * messages due to some internal error. - * @throws javax.jms.IllegalStateException if this method is called on a + * @throws jakarta.jms.IllegalStateException if this method is called on a * closed session. - * @see javax.jms.Session#CLIENT_ACKNOWLEDGE + * @see jakarta.jms.Session#CLIENT_ACKNOWLEDGE */ public void acknowledge() throws JMSException { for (Iterator iter = consumers.iterator(); iter.hasNext();) { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java index 357815561c..1088a29bc5 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java @@ -18,7 +18,7 @@ package org.apache.activemq; import java.util.List; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ConsumerId; import org.apache.activemq.command.MessageDispatch; import org.apache.activemq.thread.Task; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * A utility class used by the Session for dispatching messages asynchronously * to consumers * - * @see javax.jms.Session + * @see jakarta.jms.Session */ public class ActiveMQSessionExecutor implements Task { private static final Logger LOG = LoggerFactory.getLogger(ActiveMQSessionExecutor.class); diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java index c7ba748851..7a6417bd89 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSslConnectionFactory.java @@ -29,7 +29,7 @@ import java.net.URL; import java.security.KeyStore; import java.security.SecureRandom; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import javax.net.ssl.KeyManager; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.TrustManager; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java index 393290963e..a15d7cb9bf 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java @@ -17,10 +17,10 @@ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Topic; -import javax.jms.TopicPublisher; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.Topic; +import jakarta.jms.TopicPublisher; import org.apache.activemq.command.ActiveMQDestination; @@ -114,9 +114,9 @@ public class ActiveMQTopicPublisher extends ActiveMQMessageProducer implements * @throws java.lang.UnsupportedOperationException * if a client uses this method with a TopicPublisher * that did not specify a topic at creation time. - * @see javax.jms.MessageProducer#getDeliveryMode() - * @see javax.jms.MessageProducer#getTimeToLive() - * @see javax.jms.MessageProducer#getPriority() + * @see jakarta.jms.MessageProducer#getDeliveryMode() + * @see jakarta.jms.MessageProducer#getTimeToLive() + * @see jakarta.jms.MessageProducer#getPriority() */ public void publish(Message message) throws JMSException { @@ -162,9 +162,9 @@ public class ActiveMQTopicPublisher extends ActiveMQMessageProducer implements * some internal error. * @throws MessageFormatException if an invalid message is specified. * @throws InvalidDestinationException if a client uses this method with an invalid topic. - * @see javax.jms.MessageProducer#getDeliveryMode() - * @see javax.jms.MessageProducer#getTimeToLive() - * @see javax.jms.MessageProducer#getPriority() + * @see jakarta.jms.MessageProducer#getDeliveryMode() + * @see jakarta.jms.MessageProducer#getTimeToLive() + * @see jakarta.jms.MessageProducer#getPriority() */ public void publish(Topic topic, Message message) throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java index a6a8cd0028..9e37426315 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java @@ -18,27 +18,27 @@ package org.apache.activemq; import java.io.Serializable; -import javax.jms.BytesMessage; -import javax.jms.Destination; -import javax.jms.IllegalStateException; -import javax.jms.InvalidDestinationException; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.MessageProducer; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueBrowser; -import javax.jms.StreamMessage; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.TextMessage; -import javax.jms.Topic; -import javax.jms.TopicPublisher; -import javax.jms.TopicSession; -import javax.jms.TopicSubscriber; +import jakarta.jms.BytesMessage; +import jakarta.jms.Destination; +import jakarta.jms.IllegalStateException; +import jakarta.jms.InvalidDestinationException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.MessageProducer; +import jakarta.jms.ObjectMessage; +import jakarta.jms.Queue; +import jakarta.jms.QueueBrowser; +import jakarta.jms.StreamMessage; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.TextMessage; +import jakarta.jms.Topic; +import jakarta.jms.TopicPublisher; +import jakarta.jms.TopicSession; +import jakarta.jms.TopicSubscriber; /** * A TopicSession implementation that throws IllegalStateExceptions when Queue diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java index 79630712cc..aa4a1cfaa4 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java @@ -17,9 +17,9 @@ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Topic; -import javax.jms.TopicSubscriber; +import jakarta.jms.JMSException; +import jakarta.jms.Topic; +import jakarta.jms.TopicSubscriber; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ConsumerId; @@ -88,12 +88,12 @@ import org.apache.activemq.command.ConsumerId; * use of Session.CreateDurableSubscriber is recommended. The * TopicSubscriber is provided to support existing code. * - * @see javax.jms.Session#createConsumer - * @see javax.jms.Session#createDurableSubscriber - * @see javax.jms.TopicSession - * @see javax.jms.TopicSession#createSubscriber - * @see javax.jms.TopicSubscriber - * @see javax.jms.MessageConsumer + * @see jakarta.jms.Session#createConsumer + * @see jakarta.jms.Session#createDurableSubscriber + * @see jakarta.jms.TopicSession + * @see jakarta.jms.TopicSession#createSubscriber + * @see jakarta.jms.TopicSubscriber + * @see jakarta.jms.MessageConsumer */ public class ActiveMQTopicSubscriber extends ActiveMQMessageConsumer implements diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java index 20b376d661..ca3b5c8560 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnection.java @@ -16,14 +16,14 @@ */ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Session; -import javax.jms.XAConnection; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueSession; -import javax.jms.XASession; -import javax.jms.XATopicConnection; -import javax.jms.XATopicSession; +import jakarta.jms.JMSException; +import jakarta.jms.Session; +import jakarta.jms.XAConnection; +import jakarta.jms.XAQueueConnection; +import jakarta.jms.XAQueueSession; +import jakarta.jms.XASession; +import jakarta.jms.XATopicConnection; +import jakarta.jms.XATopicSession; import org.apache.activemq.management.JMSStatsImpl; import org.apache.activemq.transport.Transport; @@ -40,13 +40,13 @@ import org.apache.activemq.util.IdGenerator; * than use these XA interfaces directly. * * - * @see javax.jms.Connection - * @see javax.jms.ConnectionFactory - * @see javax.jms.QueueConnection - * @see javax.jms.TopicConnection - * @see javax.jms.TopicConnectionFactory - * @see javax.jms.QueueConnection - * @see javax.jms.QueueConnectionFactory + * @see jakarta.jms.Connection + * @see jakarta.jms.ConnectionFactory + * @see jakarta.jms.QueueConnection + * @see jakarta.jms.TopicConnection + * @see jakarta.jms.TopicConnectionFactory + * @see jakarta.jms.QueueConnection + * @see jakarta.jms.QueueConnectionFactory */ public class ActiveMQXAConnection extends ActiveMQConnection implements XATopicConnection, XAQueueConnection, XAConnection { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java index 3a96b1efe3..61bf024fc6 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java @@ -19,14 +19,14 @@ package org.apache.activemq; import java.net.URI; import java.util.Properties; -import javax.jms.JMSException; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XAJMSContext; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XATopicConnection; -import javax.jms.XATopicConnectionFactory; +import jakarta.jms.JMSException; +import jakarta.jms.XAConnection; +import jakarta.jms.XAConnectionFactory; +import jakarta.jms.XAJMSContext; +import jakarta.jms.XAQueueConnection; +import jakarta.jms.XAQueueConnectionFactory; +import jakarta.jms.XATopicConnection; +import jakarta.jms.XATopicConnectionFactory; import org.apache.activemq.management.JMSStatsImpl; import org.apache.activemq.transport.Transport; diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java index 6c928833de..be1ec4005c 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASession.java @@ -17,13 +17,13 @@ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.QueueSession; -import javax.jms.Session; -import javax.jms.TopicSession; -import javax.jms.TransactionInProgressException; -import javax.jms.XAQueueSession; -import javax.jms.XATopicSession; +import jakarta.jms.JMSException; +import jakarta.jms.QueueSession; +import jakarta.jms.Session; +import jakarta.jms.TopicSession; +import jakarta.jms.TransactionInProgressException; +import jakarta.jms.XAQueueSession; +import jakarta.jms.XATopicSession; import javax.transaction.xa.XAResource; import org.apache.activemq.command.SessionId; @@ -57,10 +57,10 @@ import org.apache.activemq.command.SessionId; * than use these XA interfaces directly. * * - * @see javax.jms.Session - * @see javax.jms.QueueSession - * @see javax.jms.TopicSession - * @see javax.jms.XASession + * @see jakarta.jms.Session + * @see jakarta.jms.QueueSession + * @see jakarta.jms.TopicSession + * @see jakarta.jms.XASession */ public class ActiveMQXASession extends ActiveMQSession implements QueueSession, TopicSession, XAQueueSession, XATopicSession { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java index aa5fa6c8df..e399faaf20 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java @@ -19,14 +19,14 @@ package org.apache.activemq; import java.net.URI; import java.util.Properties; -import javax.jms.JMSException; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XAJMSContext; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XATopicConnection; -import javax.jms.XATopicConnectionFactory; +import jakarta.jms.JMSException; +import jakarta.jms.XAConnection; +import jakarta.jms.XAConnectionFactory; +import jakarta.jms.XAJMSContext; +import jakarta.jms.XAQueueConnection; +import jakarta.jms.XAQueueConnectionFactory; +import jakarta.jms.XATopicConnection; +import jakarta.jms.XATopicConnectionFactory; import org.apache.activemq.management.JMSStatsImpl; import org.apache.activemq.transport.Transport; diff --git a/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java index 1e65ffb06b..b6af5ce745 100644 --- a/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/AdvisoryConsumer.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.advisory.AdvisorySupport; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java b/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java index 98a960593d..bac918716e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java +++ b/activemq-client/src/main/java/org/apache/activemq/AlreadyClosedException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An exception which is closed if you try to access a resource which has already diff --git a/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java b/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java index 72242b259f..6150b44244 100644 --- a/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java +++ b/activemq-client/src/main/java/org/apache/activemq/AsyncCallback.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.ExceptionListener; +import jakarta.jms.ExceptionListener; /** *

diff --git a/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java index 127453d6cf..7ad16ae5c3 100644 --- a/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/BlobMessage.java @@ -21,7 +21,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * Represents a message which has a typically out of band Binary Large Object diff --git a/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java b/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java index 3acb0acbb6..440977325d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java +++ b/activemq-client/src/main/java/org/apache/activemq/ClientInternalExceptionListener.java @@ -18,7 +18,7 @@ package org.apache.activemq; /** - * An exception listener similar to the standard javax.jms.ExceptionListener + * An exception listener similar to the standard jakarta.jms.ExceptionListener * which can be used by client code to be notified of exceptions thrown by container components * (e.g. an EJB container in case of Message Driven Beans) during asynchronous processing of a message. *

@@ -38,4 +38,4 @@ public interface ClientInternalExceptionListener * @param exception the exception describing the problem */ void onException(Throwable exception); -} \ No newline at end of file +} diff --git a/activemq-client/src/main/java/org/apache/activemq/Closeable.java b/activemq-client/src/main/java/org/apache/activemq/Closeable.java index 79215d0242..d80b64fd5b 100644 --- a/activemq-client/src/main/java/org/apache/activemq/Closeable.java +++ b/activemq-client/src/main/java/org/apache/activemq/Closeable.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * Provides a uniform interface that can be used to close all the JMS obejcts diff --git a/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java b/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java index 194e8a4244..5fde75d1fc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java +++ b/activemq-client/src/main/java/org/apache/activemq/ConfigurationException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An exception thrown when a service is not correctly configured diff --git a/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java index bfac15b948..4956cbde1f 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java +++ b/activemq-client/src/main/java/org/apache/activemq/ConnectionClosedException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.IllegalStateException; +import jakarta.jms.IllegalStateException; /** * An exception thrown when attempt is made to use a connection when the connection has been closed. diff --git a/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java b/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java index 94e8873956..7b0e48e4b7 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java +++ b/activemq-client/src/main/java/org/apache/activemq/ConnectionFailedException.java @@ -18,7 +18,7 @@ package org.apache.activemq; import java.io.IOException; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An exception thrown when the a connection failure is detected (peer might diff --git a/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java b/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java index 8a3b291324..940c511314 100644 --- a/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java +++ b/activemq-client/src/main/java/org/apache/activemq/CustomDestination.java @@ -16,14 +16,14 @@ */ package org.apache.activemq; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.QueueReceiver; -import javax.jms.QueueSender; -import javax.jms.TopicPublisher; -import javax.jms.TopicSubscriber; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.QueueReceiver; +import jakarta.jms.QueueSender; +import jakarta.jms.TopicPublisher; +import jakarta.jms.TopicSubscriber; /** * Represents a hook to allow the support of custom destinations diff --git a/activemq-client/src/main/java/org/apache/activemq/DestinationDoesNotExistException.java b/activemq-client/src/main/java/org/apache/activemq/DestinationDoesNotExistException.java index 180cf03f7c..9f50b2adab 100644 --- a/activemq-client/src/main/java/org/apache/activemq/DestinationDoesNotExistException.java +++ b/activemq-client/src/main/java/org/apache/activemq/DestinationDoesNotExistException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An exception thrown on a send if a destination does not exist. diff --git a/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java b/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java index d7a8a348bc..40c4b5f8f4 100644 --- a/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java +++ b/activemq-client/src/main/java/org/apache/activemq/EnhancedConnection.java @@ -17,9 +17,9 @@ */ package org.apache.activemq; -import javax.jms.TopicConnection; -import javax.jms.QueueConnection; -import javax.jms.JMSException; +import jakarta.jms.TopicConnection; +import jakarta.jms.QueueConnection; +import jakarta.jms.JMSException; import org.apache.activemq.advisory.DestinationSource; diff --git a/activemq-client/src/main/java/org/apache/activemq/Message.java b/activemq-client/src/main/java/org/apache/activemq/Message.java index e9d2358ecd..f08fd7dd0c 100644 --- a/activemq-client/src/main/java/org/apache/activemq/Message.java +++ b/activemq-client/src/main/java/org/apache/activemq/Message.java @@ -21,7 +21,7 @@ package org.apache.activemq; * * */ -public interface Message extends javax.jms.Message { +public interface Message extends jakarta.jms.Message { /** * Returns the MIME type of this mesage. This can be used in selectors to filter on diff --git a/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java index 4e76b7127a..76c430f8f3 100644 --- a/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java +++ b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableConsumer.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.MessageConsumer; +import jakarta.jms.MessageConsumer; /** * An extended JMS interface that adds the ability to be notified when a diff --git a/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java index 7bf9ee2974..61c01db903 100644 --- a/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java +++ b/activemq-client/src/main/java/org/apache/activemq/MessageAvailableListener.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.MessageConsumer; +import jakarta.jms.MessageConsumer; /** * A listener which is notified if a message is available for processing via the diff --git a/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java index d0354f3272..4fcea85964 100644 --- a/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java +++ b/activemq-client/src/main/java/org/apache/activemq/MessageDispatchChannel.java @@ -17,7 +17,7 @@ package org.apache.activemq; import java.util.List; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.MessageDispatch; public interface MessageDispatchChannel { diff --git a/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java index cf7e024ed0..a7110a70e8 100644 --- a/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java +++ b/activemq-client/src/main/java/org/apache/activemq/MessageTransformer.java @@ -16,11 +16,11 @@ */ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; /** * A plugin strategy for transforming a message before it is sent by the JMS client or before it is diff --git a/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java b/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java index f1f998dbe6..2cdcba1792 100644 --- a/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/MessageTransformerSupport.java @@ -16,8 +16,8 @@ */ package org.apache.activemq; -import javax.jms.JMSException; -import javax.jms.Message; +import jakarta.jms.JMSException; +import jakarta.jms.Message; /** * A useful base class for message transformers. diff --git a/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java b/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java index 0d0a493f7d..b079a60095 100644 --- a/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java +++ b/activemq-client/src/main/java/org/apache/activemq/NotStartedException.java @@ -16,7 +16,7 @@ */ package org.apache.activemq; -import javax.jms.IllegalStateException; +import jakarta.jms.IllegalStateException; /** * An exception thrown when an operation is invoked on a service diff --git a/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java b/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java index e1bbe45a41..4cc00817a2 100644 --- a/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java +++ b/activemq-client/src/main/java/org/apache/activemq/SimplePriorityMessageDispatchChannel.java @@ -258,7 +258,7 @@ public class SimplePriorityMessageDispatchChannel implements MessageDispatchChan } protected int getPriority(MessageDispatch message) { - int priority = javax.jms.Message.DEFAULT_PRIORITY; + int priority = jakarta.jms.Message.DEFAULT_PRIORITY; if (message.getMessage() != null) { priority = Math.max(message.getMessage().getPriority(), 0); priority = Math.min(priority, 9); diff --git a/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java index 9815a387db..652eeba3b1 100644 --- a/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java +++ b/activemq-client/src/main/java/org/apache/activemq/TransactionContext.java @@ -21,9 +21,9 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; -import javax.jms.JMSException; -import javax.jms.TransactionInProgressException; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.JMSException; +import jakarta.jms.TransactionInProgressException; +import jakarta.jms.TransactionRolledBackException; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; @@ -56,10 +56,10 @@ import org.slf4j.LoggerFactory; * JMS provider may choose to implement this functionality from scratch.

* * - * @see javax.jms.Session - * @see javax.jms.QueueSession - * @see javax.jms.TopicSession - * @see javax.jms.XASession + * @see jakarta.jms.Session + * @see jakarta.jms.QueueSession + * @see jakarta.jms.TopicSession + * @see jakarta.jms.XASession */ public class TransactionContext implements XAResource { @@ -229,7 +229,7 @@ public class TransactionContext implements XAResource { /** * Start a local transaction. - * @throws javax.jms.JMSException on internal error + * @throws jakarta.jms.JMSException on internal error */ public void begin() throws JMSException { @@ -261,7 +261,7 @@ public class TransactionContext implements XAResource { * * @throws JMSException if the JMS provider fails to roll back the * transaction due to some internal error. - * @throws javax.jms.IllegalStateException if the method is not called by a + * @throws jakarta.jms.IllegalStateException if the method is not called by a * transacted session. */ public void rollback() throws JMSException { @@ -297,7 +297,7 @@ public class TransactionContext implements XAResource { * * @throws JMSException if the JMS provider fails to commit the transaction * due to some internal error. - * @throws javax.jms.IllegalStateException if the method is not called by a + * @throws jakarta.jms.IllegalStateException if the method is not called by a * transacted session. */ public void commit() throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java b/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java index a3a468e589..9d1b2ad3db 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java @@ -18,8 +18,8 @@ package org.apache.activemq.advisory; import java.util.ArrayList; -import javax.jms.Destination; -import javax.jms.JMSException; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQMessageTransformation; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java index dcf6ddfa8a..96ba506427 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java @@ -18,7 +18,7 @@ package org.apache.activemq.advisory; import java.util.EventObject; -import javax.jms.Destination; +import jakarta.jms.Destination; import org.apache.activemq.command.ConsumerId; diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java index 40831bc01a..6713a1084d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java @@ -19,12 +19,12 @@ package org.apache.activemq.advisory; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; import org.apache.activemq.ActiveMQMessageConsumer; import org.apache.activemq.Service; diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java index 3d11fcab97..81c67705a9 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/DestinationSource.java @@ -20,12 +20,12 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.atomic.AtomicBoolean; -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.ActiveMQMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java index 29c41a7fbe..c25a51a54a 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEvent.java @@ -18,7 +18,7 @@ package org.apache.activemq.advisory; import java.util.EventObject; -import javax.jms.Destination; +import jakarta.jms.Destination; import org.apache.activemq.command.ProducerId; diff --git a/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java index 0a9a2f0f16..63864e9535 100644 --- a/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java +++ b/activemq-client/src/main/java/org/apache/activemq/advisory/ProducerEventSource.java @@ -19,13 +19,13 @@ package org.apache.activemq.advisory; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.jms.Connection; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageListener; -import javax.jms.Session; +import jakarta.jms.Connection; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageListener; +import jakarta.jms.Session; import org.apache.activemq.Service; import org.apache.activemq.command.ActiveMQDestination; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java index b33e9a8fde..890e865bf0 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloadStrategy.java @@ -18,7 +18,7 @@ package org.apache.activemq.blob; import java.io.IOException; import java.io.InputStream; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; /** diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java index 5f638603d5..5854a38170 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/BlobDownloader.java @@ -18,7 +18,7 @@ package org.apache.activemq.blob; import java.io.IOException; import java.io.InputStream; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java index dbf1ffc643..86a70515d7 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploadStrategy.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java index 05933d3880..0c9bd28108 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/BlobUploader.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java index 23ba1ae861..51feec59d4 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobDownloadStrategy.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; /** diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java index 4f97979ab0..abb9023971 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultBlobUploadStrategy.java @@ -24,7 +24,7 @@ import java.io.OutputStream; import java.net.HttpURLConnection; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java index bb8fb0e6ba..7cb67b7775 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/DefaultStrategy.java @@ -19,7 +19,7 @@ package org.apache.activemq.blob; import java.net.MalformedURLException; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java b/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java index 66b764776c..5930155715 100644 --- a/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java +++ b/activemq-client/src/main/java/org/apache/activemq/blob/FileSystemBlobStrategy.java @@ -25,7 +25,7 @@ import java.net.MalformedURLException; import java.net.URISyntaxException; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java b/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java index bfab2eb78d..05a05dc775 100644 --- a/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java +++ b/activemq-client/src/main/java/org/apache/activemq/broker/scheduler/CronParser.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import javax.jms.MessageFormatException; +import jakarta.jms.MessageFormatException; public class CronParser { diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java index bc7a2ecafb..3beaa376b2 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBlobMessage.java @@ -21,7 +21,7 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.BlobMessage; import org.apache.activemq.blob.BlobDownloader; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java index 2800050b62..e5f6ada2cc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQBytesMessage.java @@ -26,12 +26,12 @@ import java.util.Arrays; import java.util.zip.Deflater; import java.util.zip.Inflater; -import javax.jms.BytesMessage; -import javax.jms.JMSException; -import javax.jms.MessageEOFException; -import javax.jms.MessageFormatException; -import javax.jms.MessageNotReadableException; -import javax.jms.MessageNotWriteableException; +import jakarta.jms.BytesMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MessageEOFException; +import jakarta.jms.MessageFormatException; +import jakarta.jms.MessageNotReadableException; +import jakarta.jms.MessageNotWriteableException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.util.ByteArrayInputStream; @@ -84,12 +84,12 @@ import org.apache.activemq.util.JMSExceptionSupport; * MessageNotWriteableException is thrown. * * @openwire:marshaller code=24 - * @see javax.jms.Session#createBytesMessage() - * @see javax.jms.MapMessage - * @see javax.jms.Message - * @see javax.jms.ObjectMessage - * @see javax.jms.StreamMessage - * @see javax.jms.TextMessage + * @see jakarta.jms.Session#createBytesMessage() + * @see jakarta.jms.MapMessage + * @see jakarta.jms.Message + * @see jakarta.jms.ObjectMessage + * @see jakarta.jms.StreamMessage + * @see jakarta.jms.TextMessage */ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessage { diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java index c63fd1e5bc..957ca9f3e6 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQDestination.java @@ -30,12 +30,12 @@ import java.util.Properties; import java.util.Set; import java.util.StringTokenizer; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.TemporaryQueue; -import javax.jms.TemporaryTopic; -import javax.jms.Topic; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; +import jakarta.jms.TemporaryQueue; +import jakarta.jms.TemporaryTopic; +import jakarta.jms.Topic; import org.apache.activemq.filter.AnyDestination; import org.apache.activemq.filter.DestinationFilter; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java index 5619e87e8c..8384c34736 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMapMessage.java @@ -30,10 +30,10 @@ import java.util.Map; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; -import javax.jms.JMSException; -import javax.jms.MapMessage; -import javax.jms.MessageFormatException; -import javax.jms.MessageNotWriteableException; +import jakarta.jms.JMSException; +import jakarta.jms.MapMessage; +import jakarta.jms.MessageFormatException; +import jakarta.jms.MessageNotWriteableException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.util.ByteArrayInputStream; @@ -91,12 +91,12 @@ import org.fusesource.hawtbuf.UTF8Buffer; * as a char must throw a NullPointerException. * * @openwire:marshaller code="25" - * @see javax.jms.Session#createMapMessage() - * @see javax.jms.BytesMessage - * @see javax.jms.Message - * @see javax.jms.ObjectMessage - * @see javax.jms.StreamMessage - * @see javax.jms.TextMessage + * @see jakarta.jms.Session#createMapMessage() + * @see jakarta.jms.BytesMessage + * @see jakarta.jms.Message + * @see jakarta.jms.ObjectMessage + * @see jakarta.jms.StreamMessage + * @see jakarta.jms.TextMessage */ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage { diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java index 49144b6a86..cfc03b70c5 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java @@ -24,11 +24,11 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import javax.jms.DeliveryMode; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.MessageFormatException; -import javax.jms.MessageNotWriteableException; +import jakarta.jms.DeliveryMode; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.MessageFormatException; +import jakarta.jms.MessageNotWriteableException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.ScheduledMessage; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java index 41b98b511c..79cbf4c0d5 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQObjectMessage.java @@ -29,8 +29,8 @@ import java.util.List; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; -import javax.jms.JMSException; -import javax.jms.ObjectMessage; +import jakarta.jms.JMSException; +import jakarta.jms.ObjectMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.util.ByteArrayInputStream; @@ -57,13 +57,13 @@ import org.apache.activemq.wireformat.WireFormat; * written to. * * @openwire:marshaller code="26" - * @see javax.jms.Session#createObjectMessage() - * @see javax.jms.Session#createObjectMessage(Serializable) - * @see javax.jms.BytesMessage - * @see javax.jms.MapMessage - * @see javax.jms.Message - * @see javax.jms.StreamMessage - * @see javax.jms.TextMessage + * @see jakarta.jms.Session#createObjectMessage() + * @see jakarta.jms.Session#createObjectMessage(Serializable) + * @see jakarta.jms.BytesMessage + * @see jakarta.jms.MapMessage + * @see jakarta.jms.Message + * @see jakarta.jms.StreamMessage + * @see jakarta.jms.TextMessage */ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMessage, TransientInitializer { @@ -169,8 +169,8 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess * @param newObject the message's data * @throws JMSException if the JMS provider fails to set the object due to * some internal error. - * @throws javax.jms.MessageFormatException if object serialization fails. - * @throws javax.jms.MessageNotWriteableException if the message is in + * @throws jakarta.jms.MessageFormatException if object serialization fails. + * @throws jakarta.jms.MessageNotWriteableException if the message is in * read-only mode. */ diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java index 331450102b..1438578547 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQQueue.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.command; -import javax.jms.JMSException; -import javax.jms.Queue; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; /** * diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java index db66944349..03c3183030 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQStreamMessage.java @@ -27,12 +27,12 @@ import java.io.OutputStream; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; -import javax.jms.JMSException; -import javax.jms.MessageEOFException; -import javax.jms.MessageFormatException; -import javax.jms.MessageNotReadableException; -import javax.jms.MessageNotWriteableException; -import javax.jms.StreamMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MessageEOFException; +import jakarta.jms.MessageFormatException; +import jakarta.jms.MessageNotReadableException; +import jakarta.jms.MessageNotWriteableException; +import jakarta.jms.StreamMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.util.ByteArrayInputStream; @@ -102,12 +102,12 @@ import org.apache.activemq.util.MarshallingSupport; * as a char must throw a NullPointerException. * * @openwire:marshaller code="27" - * @see javax.jms.Session#createStreamMessage() - * @see javax.jms.BytesMessage - * @see javax.jms.MapMessage - * @see javax.jms.Message - * @see javax.jms.ObjectMessage - * @see javax.jms.TextMessage + * @see jakarta.jms.Session#createStreamMessage() + * @see jakarta.jms.BytesMessage + * @see jakarta.jms.MapMessage + * @see jakarta.jms.Message + * @see jakarta.jms.ObjectMessage + * @see jakarta.jms.TextMessage */ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMessage { diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java index 85fb951082..b16a85b5d9 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.command; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java index 0f90a4bb08..0c99138da9 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.command; -import javax.jms.JMSException; -import javax.jms.TemporaryQueue; +import jakarta.jms.JMSException; +import jakarta.jms.TemporaryQueue; /** * @org.apache.xbean.XBean element="tempQueue" description="An ActiveMQ Temporary Queue Destination" diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java index 0d1a4931c7..052b0d7710 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.command; -import javax.jms.JMSException; -import javax.jms.TemporaryTopic; +import jakarta.jms.JMSException; +import jakarta.jms.TemporaryTopic; /** * @org.apache.xbean.XBean element="tempTopic" description="An ActiveMQ Temporary Topic Destination" diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java index 5b57c99355..f0a529af9d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTextMessage.java @@ -25,9 +25,9 @@ import java.util.HashMap; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; -import javax.jms.JMSException; -import javax.jms.MessageNotWriteableException; -import javax.jms.TextMessage; +import jakarta.jms.JMSException; +import jakarta.jms.MessageNotWriteableException; +import jakarta.jms.TextMessage; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.util.ByteArrayInputStream; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java index 8ba51648d2..8d00ffb0dc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQTopic.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.command; -import javax.jms.JMSException; -import javax.jms.Topic; +import jakarta.jms.JMSException; +import jakarta.jms.Topic; /** * @org.apache.xbean.XBean element="topic" description="An ActiveMQ Topic diff --git a/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java index fa34be458c..c151b0d1ef 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.command; -import javax.jms.Destination; -import javax.jms.JMSException; -import javax.jms.Queue; -import javax.jms.Topic; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; +import jakarta.jms.Queue; +import jakarta.jms.Topic; import java.lang.reflect.Method; public class DefaultUnresolvedDestinationTransformer implements UnresolvedDestinationTransformer { diff --git a/activemq-client/src/main/java/org/apache/activemq/command/Message.java b/activemq-client/src/main/java/org/apache/activemq/command/Message.java index e74e1f39a4..88e9787cb5 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/Message.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.zip.DeflaterOutputStream; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.ActiveMQConnection; import org.apache.activemq.advisory.AdvisorySupport; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java b/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java index 5bd80b0740..1ec0c52914 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/NetworkBridgeFilter.java @@ -23,7 +23,7 @@ import org.apache.activemq.util.JMSExceptionSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import java.io.IOException; import java.util.Arrays; diff --git a/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java b/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java index 8f3f16e4de..89b3653607 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java @@ -16,8 +16,8 @@ */ package org.apache.activemq.command; -import javax.jms.Destination; -import javax.jms.JMSException; +import jakarta.jms.Destination; +import jakarta.jms.JMSException; public interface UnresolvedDestinationTransformer { diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java index f155664f93..83ca2cb5df 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.filter; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An expression which performs an operation on two expression values diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java index 42ca8ce199..62909d2e29 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanExpression.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.filter; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java index dcd310228a..b7d6b4453d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java @@ -52,7 +52,7 @@ public class BooleanFunctionCallExpr extends FunctionCallExpression implements B * @return the boolean evaluation of the function call expression. */ - public boolean matches(MessageEvaluationContext message_ctx) throws javax.jms.JMSException { + public boolean matches(MessageEvaluationContext message_ctx) throws jakarta.jms.JMSException { Boolean result; result = (Boolean) evaluate(message_ctx); diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java index fb1284c12d..b55a238545 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/ComparisonExpression.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; import java.util.regex.Pattern; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * A filter performing a comparison of two objects diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java index 47c1a5e0a5..6c86eac00c 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/ConstantExpression.java @@ -18,7 +18,7 @@ package org.apache.activemq.filter; import java.math.BigDecimal; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * Represents a constant expression diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java index fc1587c9a5..8e9d0599b1 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationFilter.java @@ -19,7 +19,7 @@ package org.apache.activemq.filter; import java.io.IOException; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.util.JMSExceptionSupport; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java index 82a1e4d6e4..ffc9f2f7e3 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/DestinationPath.java @@ -20,7 +20,7 @@ package org.apache.activemq.filter; import java.util.ArrayList; import java.util.List; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java b/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java index b4afe39c75..1a6f81cc2e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/Expression.java @@ -17,7 +17,7 @@ package org.apache.activemq.filter; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java index ec4590fcd1..047ce5e95e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java @@ -190,7 +190,7 @@ public class FunctionCallExpression implements Expression { */ public Object evaluate(MessageEvaluationContext message_ctx) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { return this.filterFunc.evaluate(this, message_ctx); } diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java index 0652431cbe..cf835b5bef 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/LogicExpression.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.filter; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import java.util.ArrayList; import java.util.List; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java b/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java index 1bc041b66d..813d5dd36b 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java @@ -23,7 +23,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * A MultiExpressionEvaluator is used to evaluate multiple expressions in single diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java index deba0a3f21..7fe2b60037 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/NoLocalExpression.java @@ -18,7 +18,7 @@ package org.apache.activemq.filter; import java.io.IOException; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.util.JMSExceptionSupport; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java index 730a1b1df5..789445ebfc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java index e4638406c5..2448adf0a7 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/UnaryExpression.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * An expression which performs an operation on two expression values diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java index 84fd167841..5576ff6c04 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/XPathExpression.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java b/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java index 5f18cbf2a5..fa57f22209 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/XQueryExpression.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.filter; -import javax.jms.JMSException; +import jakarta.jms.JMSException; /** * Used to evaluate an XQuery Expression in a JMS selector. diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/FilterFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/FilterFunction.java index c7f81fbe5f..5bf87ae516 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/FilterFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/FilterFunction.java @@ -55,6 +55,6 @@ public interface FilterFunction { * @param message - the context within which to evaluate the call. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws javax.jms.JMSException; + throws jakarta.jms.JMSException; } diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/inListFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/inListFunction.java index 7fa38abd3e..79c42613d5 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/inListFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/inListFunction.java @@ -72,7 +72,7 @@ public class inListFunction implements FilterFunction { */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { java.util.List arr; int cur; Object cand; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/makeListFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/makeListFunction.java index 974cb8f15d..a5b63dc868 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/makeListFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/makeListFunction.java @@ -63,7 +63,7 @@ public class makeListFunction implements FilterFunction { */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { java.util.ArrayList ele_arr; int num_arg; int cur; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java index 757d776140..82122280fe 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java @@ -73,7 +73,7 @@ public class regexMatchFunction implements FilterFunction { */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { Object reg; Object cand; String reg_str; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/replaceFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/replaceFunction.java index 503c8b60db..7d04566a69 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/replaceFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/replaceFunction.java @@ -67,7 +67,7 @@ public class replaceFunction implements FilterFunction { */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { String src; String match_regex; String repl_lit; diff --git a/activemq-client/src/main/java/org/apache/activemq/filter/function/splitFunction.java b/activemq-client/src/main/java/org/apache/activemq/filter/function/splitFunction.java index c87105ed1c..a466ba8865 100644 --- a/activemq-client/src/main/java/org/apache/activemq/filter/function/splitFunction.java +++ b/activemq-client/src/main/java/org/apache/activemq/filter/function/splitFunction.java @@ -64,7 +64,7 @@ public class splitFunction implements FilterFunction { */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws javax.jms.JMSException { + throws jakarta.jms.JMSException { String src; String split_pat; String[] result; diff --git a/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java index 34c42d69e7..ecea7f3220 100644 --- a/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/jndi/ActiveMQInitialContextFactory.java @@ -26,8 +26,8 @@ import java.util.Properties; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; -import javax.jms.Queue; -import javax.jms.Topic; +import jakarta.jms.Queue; +import jakarta.jms.Topic; import javax.naming.Context; import javax.naming.NamingException; import javax.naming.spi.InitialContextFactory; @@ -39,7 +39,7 @@ import org.apache.activemq.command.ActiveMQTopic; /** * A factory of the ActiveMQ InitialContext which contains - * {@link javax.jms.ConnectionFactory} instances as well as a child context called + * {@link jakarta.jms.ConnectionFactory} instances as well as a child context called * destinations which contain all of the current active destinations, in * child context depending on the QoS such as transient or durable and queue or * topic. diff --git a/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java index a428462833..85e2f99977 100644 --- a/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java +++ b/activemq-client/src/main/java/org/apache/activemq/management/JMSConsumerStatsImpl.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.management; -import javax.jms.Destination; +import jakarta.jms.Destination; import org.apache.activemq.util.IndentPrinter; diff --git a/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java index e0aa0c862c..4c54f0839d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java +++ b/activemq-client/src/main/java/org/apache/activemq/management/JMSEndpointStatsImpl.java @@ -16,10 +16,10 @@ */ package org.apache.activemq.management; -import javax.jms.Destination; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; +import jakarta.jms.Destination; +import jakarta.jms.MessageConsumer; +import jakarta.jms.MessageProducer; +import jakarta.jms.Session; import org.apache.activemq.util.IndentPrinter; import org.slf4j.Logger; diff --git a/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java b/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java index 497940f115..d3c589a27c 100644 --- a/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java +++ b/activemq-client/src/main/java/org/apache/activemq/management/JMSProducerStatsImpl.java @@ -16,7 +16,7 @@ */ package org.apache.activemq.management; -import javax.jms.Destination; +import jakarta.jms.Destination; import org.apache.activemq.util.IndentPrinter; diff --git a/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java index d79df89f19..9a9a9e742e 100644 --- a/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java +++ b/activemq-client/src/main/java/org/apache/activemq/state/ConnectionStateTracker.java @@ -25,7 +25,7 @@ import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import javax.jms.TransactionRolledBackException; +import jakarta.jms.TransactionRolledBackException; import javax.transaction.xa.XAResource; import org.apache.activemq.command.Command; diff --git a/activemq-client/src/main/java/org/apache/activemq/util/ConsumerThread.java b/activemq-client/src/main/java/org/apache/activemq/util/ConsumerThread.java index 18dd20a748..a49ff6f5a4 100644 --- a/activemq-client/src/main/java/org/apache/activemq/util/ConsumerThread.java +++ b/activemq-client/src/main/java/org/apache/activemq/util/ConsumerThread.java @@ -19,7 +19,7 @@ package org.apache.activemq.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.*; +import jakarta.jms.*; import java.util.concurrent.CountDownLatch; public class ConsumerThread extends Thread { diff --git a/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java b/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java index 41711cacff..e8f03eff2c 100644 --- a/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java @@ -16,21 +16,21 @@ */ package org.apache.activemq.util; -import javax.jms.IllegalStateRuntimeException; -import javax.jms.InvalidClientIDRuntimeException; -import javax.jms.InvalidDestinationRuntimeException; -import javax.jms.InvalidSelectorRuntimeException; -import javax.jms.JMSException; -import javax.jms.JMSRuntimeException; -import javax.jms.JMSSecurityException; -import javax.jms.JMSSecurityRuntimeException; -import javax.jms.MessageEOFException; -import javax.jms.MessageFormatException; -import javax.jms.MessageFormatRuntimeException; -import javax.jms.MessageNotWriteableRuntimeException; -import javax.jms.ResourceAllocationRuntimeException; -import javax.jms.TransactionInProgressRuntimeException; -import javax.jms.TransactionRolledBackRuntimeException; +import jakarta.jms.IllegalStateRuntimeException; +import jakarta.jms.InvalidClientIDRuntimeException; +import jakarta.jms.InvalidDestinationRuntimeException; +import jakarta.jms.InvalidSelectorRuntimeException; +import jakarta.jms.JMSException; +import jakarta.jms.JMSRuntimeException; +import jakarta.jms.JMSSecurityException; +import jakarta.jms.JMSSecurityRuntimeException; +import jakarta.jms.MessageEOFException; +import jakarta.jms.MessageFormatException; +import jakarta.jms.MessageFormatRuntimeException; +import jakarta.jms.MessageNotWriteableRuntimeException; +import jakarta.jms.ResourceAllocationRuntimeException; +import jakarta.jms.TransactionInProgressRuntimeException; +import jakarta.jms.TransactionRolledBackRuntimeException; import org.apache.activemq.MaxFrameSizeExceededException; @@ -118,34 +118,34 @@ public final class JMSExceptionSupport { } public static JMSRuntimeException convertToJMSRuntimeException(JMSException e) { - if (e instanceof javax.jms.IllegalStateException) { + if (e instanceof jakarta.jms.IllegalStateException) { return new IllegalStateRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.InvalidClientIDException) { + if (e instanceof jakarta.jms.InvalidClientIDException) { return new InvalidClientIDRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.InvalidDestinationException) { + if (e instanceof jakarta.jms.InvalidDestinationException) { return new InvalidDestinationRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.InvalidSelectorException) { + if (e instanceof jakarta.jms.InvalidSelectorException) { return new InvalidSelectorRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.JMSSecurityException) { + if (e instanceof jakarta.jms.JMSSecurityException) { return new JMSSecurityRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.MessageFormatException) { + if (e instanceof jakarta.jms.MessageFormatException) { return new MessageFormatRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.MessageNotWriteableException) { + if (e instanceof jakarta.jms.MessageNotWriteableException) { return new MessageNotWriteableRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.ResourceAllocationException) { + if (e instanceof jakarta.jms.ResourceAllocationException) { return new ResourceAllocationRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.TransactionInProgressException) { + if (e instanceof jakarta.jms.TransactionInProgressException) { return new TransactionInProgressRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof javax.jms.TransactionRolledBackException) { + if (e instanceof jakarta.jms.TransactionRolledBackException) { return new TransactionRolledBackRuntimeException(e.getMessage(), e.getErrorCode(), e); } return new JMSRuntimeException(e.getMessage(), e.getErrorCode(), e); diff --git a/activemq-client/src/main/java/org/apache/activemq/util/ProducerThread.java b/activemq-client/src/main/java/org/apache/activemq/util/ProducerThread.java index 00422e96f4..da032320f4 100644 --- a/activemq-client/src/main/java/org/apache/activemq/util/ProducerThread.java +++ b/activemq-client/src/main/java/org/apache/activemq/util/ProducerThread.java @@ -19,7 +19,7 @@ package org.apache.activemq.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.*; +import jakarta.jms.*; import java.io.*; import java.net.URL; import java.util.concurrent.CountDownLatch; diff --git a/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java b/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java index 8b90183e85..2ca1e6436c 100644 --- a/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/ActiveMQSslConnectionFactoryTest.java @@ -128,10 +128,10 @@ public class ActiveMQSslConnectionFactoryTest { activeMQSslConnectionFactory.setTrustStore(name); activeMQSslConnectionFactory.setTrustStorePassword(TRUST_STORE_PASSWORD); - javax.jms.Connection connection = activeMQSslConnectionFactory.createConnection(); + jakarta.jms.Connection connection = activeMQSslConnectionFactory.createConnection(); connection.start(); connection.stop(); - } catch (javax.jms.JMSException e) { + } catch (jakarta.jms.JMSException e) { e.getCause().printStackTrace(); throw e.getCause(); } diff --git a/activemq-client/src/test/java/org/apache/activemq/blob/DownloadStrategyTest.java b/activemq-client/src/test/java/org/apache/activemq/blob/DownloadStrategyTest.java index ed90b54eb3..c70122e35c 100644 --- a/activemq-client/src/test/java/org/apache/activemq/blob/DownloadStrategyTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/blob/DownloadStrategyTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.net.URL; -import javax.jms.JMSException; +import jakarta.jms.JMSException; import org.apache.activemq.command.ActiveMQBlobMessage; import org.junit.Test; diff --git a/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java index 6e5eb69b27..91419071e0 100644 --- a/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/broker/scheduler/CronParserTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.jms.MessageFormatException; +import jakarta.jms.MessageFormatException; import java.time.Instant; import java.time.LocalDateTime; import java.time.OffsetDateTime; diff --git a/activemq-client/src/test/java/org/apache/activemq/command/ScheduledValuesTest.java b/activemq-client/src/test/java/org/apache/activemq/command/ScheduledValuesTest.java index f917ec0e80..b862e26c3d 100644 --- a/activemq-client/src/test/java/org/apache/activemq/command/ScheduledValuesTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/command/ScheduledValuesTest.java @@ -19,7 +19,7 @@ package org.apache.activemq.command; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import javax.jms.MessageFormatException; +import jakarta.jms.MessageFormatException; import org.apache.activemq.ScheduledMessage; import org.junit.Test; diff --git a/activemq-client/src/test/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshallerTest.java b/activemq-client/src/test/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshallerTest.java index cc2640d1eb..8fa9f0e2a4 100644 --- a/activemq-client/src/test/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshallerTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/openwire/v1/BaseDataStreamMarshallerTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; -import javax.jms.MessageFormatException; +import jakarta.jms.MessageFormatException; import org.junit.Test; diff --git a/activemq-client/src/test/java/org/apache/activemq/openwire/v10/BaseDataStreamMarshallerTest.java b/activemq-client/src/test/java/org/apache/activemq/openwire/v10/BaseDataStreamMarshallerTest.java index 6aebe272bb..20a1623e1f 100644 --- a/activemq-client/src/test/java/org/apache/activemq/openwire/v10/BaseDataStreamMarshallerTest.java +++ b/activemq-client/src/test/java/org/apache/activemq/openwire/v10/BaseDataStreamMarshallerTest.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; -import javax.jms.MessageFormatException; +import jakarta.jms.MessageFormatException; import org.junit.Test;