diff --git a/activemq-filters/pom.xml b/activemq-filters/pom.xml index 0178002e..78e6fef7 100644 --- a/activemq-filters/pom.xml +++ b/activemq-filters/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 pulsar-jms-activemq-filters @@ -69,7 +69,7 @@ org.apache.maven.plugins maven-shade-plugin - + diff --git a/activemq-filters/src/main/java/org/apache/activemq/Message.java b/activemq-filters/src/main/java/org/apache/activemq/Message.java index c088d330..b6696618 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/Message.java +++ b/activemq-filters/src/main/java/org/apache/activemq/Message.java @@ -16,7 +16,7 @@ package org.apache.activemq; /** Represents the JMS extension methods in Apache ActiveMQ */ -public interface Message extends jakarta.jms.Message { +public interface Message extends javax.jms.Message { /** * Returns the MIME type of this mesage. This can be used in selectors to filter on the MIME types diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java index c4bbc620..d2345dec 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQDestination.java @@ -15,12 +15,6 @@ */ package org.apache.activemq.command; -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 java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; @@ -34,6 +28,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 org.apache.activemq.filter.AnyDestination; import org.apache.activemq.filter.DestinationFilter; import org.apache.activemq.jndi.JNDIBaseStorable; diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java index 9f2f897a..294a1264 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQMessage.java @@ -15,17 +15,17 @@ */ package org.apache.activemq.command; -import jakarta.jms.DeliveryMode; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageNotWriteableException; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Enumeration; import java.util.HashMap; 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 org.apache.activemq.ScheduledMessage; import org.apache.activemq.filter.PropertyExpression; import org.apache.activemq.util.Callback; diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java index 2c2aeb73..aa921f66 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQQueue.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; +import javax.jms.JMSException; +import javax.jms.Queue; /** element="queue" description="An ActiveMQ Queue Destination" */ public class ActiveMQQueue extends ActiveMQDestination implements Queue { diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java index 3442d38b..8677f658 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempDestination.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; +import javax.jms.JMSException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java index 7890e196..1ec9b049 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempQueue.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; -import jakarta.jms.TemporaryQueue; +import javax.jms.JMSException; +import javax.jms.TemporaryQueue; /** element="tempQueue" description="An ActiveMQ Temporary Queue Destination" */ public class ActiveMQTempQueue extends ActiveMQTempDestination implements TemporaryQueue { diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java index 6c950ede..a550e4eb 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTempTopic.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; -import jakarta.jms.TemporaryTopic; +import javax.jms.JMSException; +import javax.jms.TemporaryTopic; /** element="tempTopic" description="An ActiveMQ Temporary Topic Destination" */ public class ActiveMQTempTopic extends ActiveMQTempDestination implements TemporaryTopic { diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java index a1acc835..5837dcaf 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/ActiveMQTopic.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; -import jakarta.jms.Topic; +import javax.jms.JMSException; +import javax.jms.Topic; /** element="topic" description="An ActiveMQ Topic Destination" code="101" */ public class ActiveMQTopic extends ActiveMQDestination implements Topic { diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java b/activemq-filters/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java index 0b431dc1..847c19a7 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/DefaultUnresolvedDestinationTransformer.java @@ -15,11 +15,11 @@ */ package org.apache.activemq.command; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; -import jakarta.jms.Topic; import java.lang.reflect.Method; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.Topic; public class DefaultUnresolvedDestinationTransformer implements UnresolvedDestinationTransformer { diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/Message.java b/activemq-filters/src/main/java/org/apache/activemq/command/Message.java index ce4fcccf..dc7171ce 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/Message.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/Message.java @@ -15,7 +15,6 @@ */ package org.apache.activemq.command; -import jakarta.jms.JMSException; import java.beans.Transient; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -27,6 +26,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; import java.util.zip.DeflaterOutputStream; +import javax.jms.JMSException; import org.apache.activemq.broker.region.MessageReference; import org.apache.activemq.usage.MemoryUsage; import org.apache.activemq.util.ByteArrayInputStream; diff --git a/activemq-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java b/activemq-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java index 95369df0..34a1c4f7 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java +++ b/activemq-filters/src/main/java/org/apache/activemq/command/UnresolvedDestinationTransformer.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.command; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; +import javax.jms.Destination; +import javax.jms.JMSException; public interface UnresolvedDestinationTransformer { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java index 4575dea3..193aedb7 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/ArithmeticExpression.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; +import javax.jms.JMSException; /** An expression which performs an operation on two expression values */ public abstract class ArithmeticExpression extends BinaryExpression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java index abaf99a3..7f2aa30a 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanExpression.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; +import javax.jms.JMSException; /** A BooleanExpression is an expression that always produces a Boolean result. */ public interface BooleanExpression extends Expression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java index 14b57051..85da2b95 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/BooleanFunctionCallExpr.java @@ -48,7 +48,7 @@ public BooleanFunctionCallExpr(String func_name, List args) * @param message_ctx - message context against which the expression will be evaluated. * @return the boolean evaluation of the function call expression. */ - public boolean matches(MessageEvaluationContext message_ctx) throws jakarta.jms.JMSException { + public boolean matches(MessageEvaluationContext message_ctx) throws javax.jms.JMSException { Boolean result; result = (Boolean) evaluate(message_ctx); diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java index f2220ac5..51c865d7 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/ComparisonExpression.java @@ -15,11 +15,11 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.regex.Pattern; +import javax.jms.JMSException; /** A filter performing a comparison of two objects */ public abstract class ComparisonExpression extends BinaryExpression implements BooleanExpression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java index 814732c3..7dae9c5d 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/ConstantExpression.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.math.BigDecimal; +import javax.jms.JMSException; /** Represents a constant expression */ public class ConstantExpression implements Expression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java index ac4eacd0..f4c42386 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationFilter.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.io.IOException; +import javax.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.util.JMSExceptionSupport; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java index 64011203..b809f658 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/DestinationPath.java @@ -15,9 +15,9 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.util.ArrayList; import java.util.List; +import javax.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java index e695ee30..2a434568 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/Expression.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; +import javax.jms.JMSException; /** Represents an expression */ public interface Expression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java index d8e6c6cb..07abfe44 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/FunctionCallExpression.java @@ -169,7 +169,7 @@ public Expression getArgument(int which) { * * @see Expression#evaluate */ - public Object evaluate(MessageEvaluationContext message_ctx) throws jakarta.jms.JMSException { + public Object evaluate(MessageEvaluationContext message_ctx) throws javax.jms.JMSException { return this.filterFunc.evaluate(this, message_ctx); } diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java index 893df62d..c7a1d60e 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/LogicExpression.java @@ -15,9 +15,9 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.util.ArrayList; import java.util.List; +import javax.jms.JMSException; /** A sequence of expressions, to be combined with OR or AND conjunctions. */ public abstract class LogicExpression implements BooleanExpression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java b/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java index f1be2183..1a004858 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/MultiExpressionEvaluator.java @@ -15,13 +15,13 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import javax.jms.JMSException; /** * A MultiExpressionEvaluator is used to evaluate multiple expressions in single method call. diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java index ef8ea74f..befffb00 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/NoLocalExpression.java @@ -15,8 +15,8 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.io.IOException; +import javax.jms.JMSException; import org.apache.activemq.util.JMSExceptionSupport; public class NoLocalExpression implements BooleanExpression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java index 96baad05..e3ae3828 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/PropertyExpression.java @@ -15,11 +15,11 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.io.IOException; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import javax.jms.JMSException; import org.apache.activemq.command.ActiveMQDestination; import org.apache.activemq.command.Message; import org.apache.activemq.command.TransactionId; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java index b951f91c..de552861 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/UnaryExpression.java @@ -15,12 +15,12 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.math.BigDecimal; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import javax.jms.JMSException; /** An expression which performs an operation on two expression values */ public abstract class UnaryExpression implements Expression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java index e892336f..aea0c3a6 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/XPathExpression.java @@ -15,7 +15,6 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -23,6 +22,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.jms.JMSException; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java b/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java index 349adb18..005cf245 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/XQueryExpression.java @@ -15,7 +15,7 @@ */ package org.apache.activemq.filter; -import jakarta.jms.JMSException; +import javax.jms.JMSException; /** Used to evaluate an XQuery Expression in a JMS selector. */ public final class XQueryExpression implements BooleanExpression { diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java index b21505d5..cd92eec3 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/FilterFunction.java @@ -53,5 +53,5 @@ public interface FilterFunction { * @param message - the context within which to evaluate the call. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws jakarta.jms.JMSException; + throws javax.jms.JMSException; } diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java index 1c2f53e3..1f51b43a 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/inListFunction.java @@ -63,7 +63,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) { * @return Boolean - the result of the evaluation. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws jakarta.jms.JMSException { + throws javax.jms.JMSException { java.util.List arr; int cur; Object cand; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java index cbfcd89c..d6dfa7aa 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/makeListFunction.java @@ -55,7 +55,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) { * @return java.util.List - the result of the evaluation. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws jakarta.jms.JMSException { + throws javax.jms.JMSException { java.util.ArrayList ele_arr; int num_arg; int cur; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java index 76cd6cc7..51fb1b8a 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/regexMatchFunction.java @@ -67,7 +67,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) { * @return true - if the value matches the regular expression; false - otherwise. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message) - throws jakarta.jms.JMSException { + throws javax.jms.JMSException { Object reg; Object cand; String reg_str; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java index 85391082..c9995f7e 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/replaceFunction.java @@ -58,7 +58,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) { * @return String - the result of the replacement. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws jakarta.jms.JMSException { + throws javax.jms.JMSException { String src; String match_regex; String repl_lit; diff --git a/activemq-filters/src/main/java/org/apache/activemq/filter/function/splitFunction.java b/activemq-filters/src/main/java/org/apache/activemq/filter/function/splitFunction.java index 9272651d..abfcb4b3 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/filter/function/splitFunction.java +++ b/activemq-filters/src/main/java/org/apache/activemq/filter/function/splitFunction.java @@ -58,7 +58,7 @@ public boolean returnsBoolean(FunctionCallExpression expr) { * @return List - a list of Strings resulting from the split. */ public Object evaluate(FunctionCallExpression expr, MessageEvaluationContext message_ctx) - throws jakarta.jms.JMSException { + throws javax.jms.JMSException { String src; String split_pat; String[] result; diff --git a/activemq-filters/src/main/java/org/apache/activemq/selector/SelectorParser.java b/activemq-filters/src/main/java/org/apache/activemq/selector/SelectorParser.java index 647eda2a..8fe6e99c 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/selector/SelectorParser.java +++ b/activemq-filters/src/main/java/org/apache/activemq/selector/SelectorParser.java @@ -31,7 +31,6 @@ */ package org.apache.activemq.selector; -import jakarta.jms.InvalidSelectorException; import java.io.InputStream; import java.io.Reader; import java.io.StringReader; @@ -39,6 +38,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Map; +import javax.jms.InvalidSelectorException; import org.apache.activemq.filter.ArithmeticExpression; import org.apache.activemq.filter.BooleanExpression; import org.apache.activemq.filter.ComparisonExpression; diff --git a/activemq-filters/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java b/activemq-filters/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java index 23a49ee4..4cc4388e 100644 --- a/activemq-filters/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java +++ b/activemq-filters/src/main/java/org/apache/activemq/util/JMSExceptionSupport.java @@ -15,21 +15,21 @@ */ package org.apache.activemq.util; -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 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 org.apache.activemq.MaxFrameSizeExceededException; public final class JMSExceptionSupport { @@ -115,16 +115,16 @@ public static MessageFormatException createMessageFormatException(Exception caus } public static JMSRuntimeException convertToJMSRuntimeException(JMSException e) { - if (e instanceof jakarta.jms.IllegalStateException) { + if (e instanceof javax.jms.IllegalStateException) { return new IllegalStateRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.InvalidClientIDException) { + if (e instanceof javax.jms.InvalidClientIDException) { return new InvalidClientIDRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.InvalidDestinationException) { + if (e instanceof javax.jms.InvalidDestinationException) { return new InvalidDestinationRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.InvalidSelectorException) { + if (e instanceof javax.jms.InvalidSelectorException) { return new InvalidSelectorRuntimeException(e.getMessage(), e.getErrorCode(), e); } if (e instanceof JMSSecurityException) { @@ -133,16 +133,16 @@ public static JMSRuntimeException convertToJMSRuntimeException(JMSException e) { if (e instanceof MessageFormatException) { return new MessageFormatRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.MessageNotWriteableException) { + if (e instanceof javax.jms.MessageNotWriteableException) { return new MessageNotWriteableRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.ResourceAllocationException) { + if (e instanceof javax.jms.ResourceAllocationException) { return new ResourceAllocationRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.TransactionInProgressException) { + if (e instanceof javax.jms.TransactionInProgressException) { return new TransactionInProgressRuntimeException(e.getMessage(), e.getErrorCode(), e); } - if (e instanceof jakarta.jms.TransactionRolledBackException) { + if (e instanceof javax.jms.TransactionRolledBackException) { return new TransactionRolledBackRuntimeException(e.getMessage(), e.getErrorCode(), e); } return new JMSRuntimeException(e.getMessage(), e.getErrorCode(), e); diff --git a/examples/payara-micro/pom.xml b/examples/payara-micro/pom.xml index 4980a9ac..9cd53aab 100644 --- a/examples/payara-micro/pom.xml +++ b/examples/payara-micro/pom.xml @@ -24,7 +24,7 @@ com.datastax.oss pulsar-jms-parent - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../../pom.xml @@ -32,9 +32,9 @@ - jakarta.platform - jakarta.jakartaee-api - 9.1.0 + javax + javaee-api + 8.0 provided diff --git a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromQueue.java b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromQueue.java index 81348ed0..6952eba1 100644 --- a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromQueue.java +++ b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromQueue.java @@ -18,19 +18,16 @@ import static com.datastax.oss.pulsar.examples.ReceiveMessageFromTopic.countQueue; import static com.datastax.oss.pulsar.examples.ReceiveMessageFromTopic.countTopic; -import jakarta.ejb.ActivationConfigProperty; -import jakarta.ejb.MessageDriven; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.jms.Message; +import javax.jms.MessageListener; @MessageDriven( name = "testmdbqueue", activationConfig = { @ActivationConfigProperty(propertyName = "resourceAdapter", propertyValue = "pulsarra"), - @ActivationConfigProperty( - propertyName = "destinationType", - propertyValue = "jakarta.jms.Queue" - ), + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty( propertyName = "destination", propertyValue = "${MPCONFIG=queue.name}" diff --git a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromTopic.java b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromTopic.java index 8d6400bb..b64bd6cc 100644 --- a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromTopic.java +++ b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/ReceiveMessageFromTopic.java @@ -15,20 +15,17 @@ */ package com.datastax.oss.pulsar.examples; -import jakarta.ejb.ActivationConfigProperty; -import jakarta.ejb.MessageDriven; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; import java.util.concurrent.atomic.AtomicInteger; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.jms.Message; +import javax.jms.MessageListener; @MessageDriven( name = "testmdbtopic", activationConfig = { @ActivationConfigProperty(propertyName = "resourceAdapter", propertyValue = "pulsarra"), - @ActivationConfigProperty( - propertyName = "destinationType", - propertyValue = "jakarta.jms.Topic" - ), + @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Topic"), @ActivationConfigProperty(propertyName = "subscriptionType", propertyValue = "Durable"), @ActivationConfigProperty(propertyName = "subscriptionName", propertyValue = "mysub"), @ActivationConfigProperty(propertyName = "subscriptionMode", propertyValue = "Shared"), diff --git a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/SendJMSMessage.java b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/SendJMSMessage.java index 0554e1f4..6594d85a 100644 --- a/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/SendJMSMessage.java +++ b/examples/payara-micro/src/main/java/com/datastax/oss/pulsar/examples/SendJMSMessage.java @@ -15,15 +15,15 @@ */ package com.datastax.oss.pulsar.examples; -import jakarta.annotation.Resource; -import jakarta.ejb.Schedule; -import jakarta.ejb.Stateless; -import jakarta.jms.*; -import jakarta.resource.AdministeredObjectDefinition; -import jakarta.resource.AdministeredObjectDefinitions; -import jakarta.resource.ConnectionFactoryDefinition; import java.util.logging.Level; import java.util.logging.Logger; +import javax.annotation.Resource; +import javax.ejb.Schedule; +import javax.ejb.Stateless; +import javax.jms.*; +import javax.resource.AdministeredObjectDefinition; +import javax.resource.AdministeredObjectDefinitions; +import javax.resource.ConnectionFactoryDefinition; /** * An example Timer Bean to send messages to an Pulsar broker @@ -33,21 +33,21 @@ @Stateless @ConnectionFactoryDefinition( name = "java:app/jms/SendJMS", - interfaceName = "jakarta.jms.ConnectionFactory", + interfaceName = "javax.jms.ConnectionFactory", resourceAdapter = "pulsarra", properties = {"configuration=${MPCONFIG=pulsar.config}"} ) @AdministeredObjectDefinitions({ @AdministeredObjectDefinition( resourceAdapter = "pulsarra", - interfaceName = "jakarta.jms.Queue", + interfaceName = "javax.jms.Queue", className = "com.datastax.oss.pulsar.jms.PulsarQueue", name = "java:app/jms/MyQueue", properties = {"Name=${MPCONFIG=queue.name}"} ), @AdministeredObjectDefinition( resourceAdapter = "pulsarra", - interfaceName = "jakarta.jms.Topic", + interfaceName = "javax.jms.Topic", className = "com.datastax.oss.pulsar.jms.PulsarTopic", name = "java:app/jms/MyTopic", properties = {"Name=${MPCONFIG=topic.name}"} diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml index a1c67d3e..06a6aa50 100644 --- a/examples/spring/pom.xml +++ b/examples/spring/pom.xml @@ -21,7 +21,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../../pom.xml pulsar-jms-spring-example @@ -29,16 +29,13 @@ Demo project for Spring Boot and Pulsar JMS 1.8 - 17 - 17 - 17 org.springframework.boot spring-boot-dependencies - 3.3.1 + 2.7.18 pom import @@ -67,23 +64,13 @@ 1.18.30 provided - - org.slf4j - slf4j-api - 2.0.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.18.0 - org.springframework.boot spring-boot-maven-plugin - 3.3.1 + 2.7.18 diff --git a/examples/spring/src/main/java/examples/PulsarJMSConfiguration.java b/examples/spring/src/main/java/examples/PulsarJMSConfiguration.java index c425bd81..0f75130c 100644 --- a/examples/spring/src/main/java/examples/PulsarJMSConfiguration.java +++ b/examples/spring/src/main/java/examples/PulsarJMSConfiguration.java @@ -16,9 +16,9 @@ package examples; import com.datastax.oss.pulsar.jms.PulsarConnectionFactory; -import jakarta.jms.ConnectionFactory; import java.util.HashMap; import java.util.Map; +import javax.jms.ConnectionFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer; import org.springframework.context.annotation.Bean; diff --git a/pom.xml b/pom.xml index 6cb00240..537c2507 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ com.datastax.oss pulsar-jms-parent pom - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT DataStax Starlight for JMS Implementation of the Java Messaging Service Client API around Apache Pulsar Java Client https://github.com/datastax/pulsar-jms @@ -55,7 +55,7 @@ 11 11 11 - 3.0.0 + 2.0.3 org.apache.pulsar 4.0.7 2.12.4 diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml index a4142af3..e0e02b40 100644 --- a/pulsar-client-shaded/pom.xml +++ b/pulsar-client-shaded/pom.xml @@ -21,7 +21,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT pulsar-client-jms Pulsar Client Java @@ -112,7 +112,7 @@ - + @@ -480,8 +480,8 @@ - - + + true diff --git a/pulsar-jms-admin-api/pom.xml b/pulsar-jms-admin-api/pom.xml index 0f31330e..3381f242 100644 --- a/pulsar-jms-admin-api/pom.xml +++ b/pulsar-jms-admin-api/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pulsar-jms-admin-api/src/main/java/com/datastax/oss/pulsar/jms/api/JMSAdmin.java b/pulsar-jms-admin-api/src/main/java/com/datastax/oss/pulsar/jms/api/JMSAdmin.java index b2d12881..9823dc3d 100644 --- a/pulsar-jms-admin-api/src/main/java/com/datastax/oss/pulsar/jms/api/JMSAdmin.java +++ b/pulsar-jms-admin-api/src/main/java/com/datastax/oss/pulsar/jms/api/JMSAdmin.java @@ -15,11 +15,11 @@ */ package com.datastax.oss.pulsar.jms.api; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.Topic; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.Topic; /** * Admin API for JMS features. This is meant to be like an extension of the PulsarAdmin Java API. diff --git a/pulsar-jms-admin-ext/pom.xml b/pulsar-jms-admin-ext/pom.xml index 6c97e69b..e602ca3d 100644 --- a/pulsar-jms-admin-ext/pom.xml +++ b/pulsar-jms-admin-ext/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/BaseCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/BaseCommand.java index 2d7baf75..fb5bc56f 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/BaseCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/BaseCommand.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import jakarta.jms.JMSException; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -31,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.jms.JMSException; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.admin.cli.extensions.CommandExecutionContext; import org.apache.pulsar.admin.cli.extensions.CustomCommand; diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateQueueCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateQueueCommand.java index 3dc5edb2..fe7b81ba 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateQueueCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateQueueCommand.java @@ -16,9 +16,9 @@ package com.datastax.oss.pulsar.jms.cli; import com.datastax.oss.pulsar.jms.PulsarDestination; -import jakarta.jms.Queue; import java.util.Arrays; import java.util.List; +import javax.jms.Queue; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.admin.cli.extensions.ParameterDescriptor; import org.apache.pulsar.admin.cli.extensions.ParameterType; diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateSubscriptionCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateSubscriptionCommand.java index a387be0e..ea1d4a3a 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateSubscriptionCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateSubscriptionCommand.java @@ -16,7 +16,7 @@ package com.datastax.oss.pulsar.jms.cli; import com.datastax.oss.pulsar.jms.PulsarDestination; -import jakarta.jms.Topic; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateTopicCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateTopicCommand.java index 006e3b88..0b63e48d 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateTopicCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/CreateTopicCommand.java @@ -15,10 +15,10 @@ */ package com.datastax.oss.pulsar.jms.cli; -import jakarta.jms.Destination; -import jakarta.jms.Topic; import java.util.Arrays; import java.util.List; +import javax.jms.Destination; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.admin.cli.extensions.ParameterDescriptor; import org.apache.pulsar.admin.cli.extensions.ParameterType; diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateQueueCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateQueueCommand.java index 72a671cf..6f2b4014 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateQueueCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateQueueCommand.java @@ -16,8 +16,8 @@ package com.datastax.oss.pulsar.jms.cli; import com.datastax.oss.pulsar.jms.api.JMSAdmin; -import jakarta.jms.Destination; -import jakarta.jms.Queue; +import javax.jms.Destination; +import javax.jms.Queue; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateSubscriptionCommand.java b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateSubscriptionCommand.java index 693fd198..1d3849db 100644 --- a/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateSubscriptionCommand.java +++ b/pulsar-jms-admin-ext/src/main/java/com/datastax/oss/pulsar/jms/cli/UpdateSubscriptionCommand.java @@ -16,8 +16,8 @@ package com.datastax.oss.pulsar.jms.cli; import com.datastax.oss.pulsar.jms.api.JMSAdmin; -import jakarta.jms.Destination; -import jakarta.jms.Topic; +import javax.jms.Destination; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/pulsar-jms-all/pom.xml b/pulsar-jms-all/pom.xml index 5243e966..1c03d34d 100644 --- a/pulsar-jms-all/pom.xml +++ b/pulsar-jms-all/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 pulsar-jms-all diff --git a/pulsar-jms-cli/pom.xml b/pulsar-jms-cli/pom.xml index 05f50cd4..9322673f 100644 --- a/pulsar-jms-cli/pom.xml +++ b/pulsar-jms-cli/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/pulsar-jms-cli/src/main/java/com/datastax/oss/pulsar/jms/cli/Main.java b/pulsar-jms-cli/src/main/java/com/datastax/oss/pulsar/jms/cli/Main.java index c07d7d7a..be02d678 100644 --- a/pulsar-jms-cli/src/main/java/com/datastax/oss/pulsar/jms/cli/Main.java +++ b/pulsar-jms-cli/src/main/java/com/datastax/oss/pulsar/jms/cli/Main.java @@ -23,15 +23,6 @@ import com.datastax.oss.pulsar.jms.Utils; import com.datastax.oss.pulsar.jms.selectors.SelectorSupport; import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.jms.BytesMessage; -import jakarta.jms.Destination; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSProducer; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; -import jakarta.jms.Queue; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.io.File; import java.nio.charset.StandardCharsets; import java.util.ArrayList; @@ -43,6 +34,15 @@ import java.util.concurrent.CountDownLatch; import java.util.function.Function; import java.util.stream.Collectors; +import javax.jms.BytesMessage; +import javax.jms.Destination; +import javax.jms.JMSContext; +import javax.jms.JMSProducer; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.TextMessage; +import javax.jms.Topic; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.MessageId; diff --git a/pulsar-jms-filters-common/pom.xml b/pulsar-jms-filters-common/pom.xml index 25c3d382..83c479fd 100644 --- a/pulsar-jms-filters-common/pom.xml +++ b/pulsar-jms-filters-common/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 pulsar-jms-filters-common diff --git a/pulsar-jms-filters-common/src/main/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupport.java b/pulsar-jms-filters-common/src/main/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupport.java index e6aa633f..97486ac2 100644 --- a/pulsar-jms-filters-common/src/main/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupport.java +++ b/pulsar-jms-filters-common/src/main/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupport.java @@ -15,15 +15,15 @@ */ package com.datastax.oss.pulsar.jms.selectors; -import jakarta.jms.DeliveryMode; -import jakarta.jms.Destination; -import jakarta.jms.InvalidSelectorException; -import jakarta.jms.JMSException; -import jakarta.jms.Message; import java.util.Enumeration; import java.util.HashMap; import java.util.Map; import java.util.function.Function; +import javax.jms.DeliveryMode; +import javax.jms.Destination; +import javax.jms.InvalidSelectorException; +import javax.jms.JMSException; +import javax.jms.Message; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.activemq.command.ActiveMQDestination; diff --git a/pulsar-jms-filters-common/src/test/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupportTest.java b/pulsar-jms-filters-common/src/test/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupportTest.java index 05431516..65937254 100644 --- a/pulsar-jms-filters-common/src/test/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupportTest.java +++ b/pulsar-jms-filters-common/src/test/java/com/datastax/oss/pulsar/jms/selectors/SelectorSupportTest.java @@ -17,11 +17,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import jakarta.jms.DeliveryMode; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; +import javax.jms.DeliveryMode; import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQTopic; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms-filters/pom.xml b/pulsar-jms-filters/pom.xml index 16c99972..595d7295 100644 --- a/pulsar-jms-filters/pom.xml +++ b/pulsar-jms-filters/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 pulsar-jms-filters diff --git a/pulsar-jms-filters/src/main/java/com/datastax/oss/pulsar/jms/selectors/JMSFilter.java b/pulsar-jms-filters/src/main/java/com/datastax/oss/pulsar/jms/selectors/JMSFilter.java index 50b1a9ae..607c2acd 100644 --- a/pulsar-jms-filters/src/main/java/com/datastax/oss/pulsar/jms/selectors/JMSFilter.java +++ b/pulsar-jms-filters/src/main/java/com/datastax/oss/pulsar/jms/selectors/JMSFilter.java @@ -19,8 +19,6 @@ import io.netty.buffer.ByteBuf; import io.prometheus.client.CollectorRegistry; import io.prometheus.client.Histogram; -import jakarta.jms.JMSException; -import jakarta.jms.Message; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Base64; @@ -30,6 +28,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; +import javax.jms.JMSException; +import javax.jms.Message; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.activemq.command.ActiveMQQueue; diff --git a/pulsar-jms-integration-tests/pom.xml b/pulsar-jms-integration-tests/pom.xml index 165f61e9..e77c5252 100644 --- a/pulsar-jms-integration-tests/pom.xml +++ b/pulsar-jms-integration-tests/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 @@ -96,8 +96,8 @@ copy filters - - + + diff --git a/pulsar-jms-integration-tests/src/test/java/com/datastax/oss/pulsar/jms/tests/DockerTest.java b/pulsar-jms-integration-tests/src/test/java/com/datastax/oss/pulsar/jms/tests/DockerTest.java index e7cf3a3b..5a163d6f 100644 --- a/pulsar-jms-integration-tests/src/test/java/com/datastax/oss/pulsar/jms/tests/DockerTest.java +++ b/pulsar-jms-integration-tests/src/test/java/com/datastax/oss/pulsar/jms/tests/DockerTest.java @@ -33,13 +33,13 @@ import java.nio.file.Path; import java.util.HashMap; import java.util.Map; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateException; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.Session; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.IllegalStateException; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/pulsar-jms/pom.xml b/pulsar-jms/pom.xml index 9be2db31..a0e14cb0 100644 --- a/pulsar-jms/pom.xml +++ b/pulsar-jms/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 pulsar-jms @@ -173,10 +173,10 @@ copy filters - - - - + + + + diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/CompletableFutureCompletionListener.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/CompletableFutureCompletionListener.java index c4a51f5e..faa099fa 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/CompletableFutureCompletionListener.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/CompletableFutureCompletionListener.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.CompletionListener; -import jakarta.jms.Message; import java.util.concurrent.CompletableFuture; +import javax.jms.CompletionListener; +import javax.jms.Message; /** Utility class to convert a CompletionListener into a CompletableFuture. */ public class CompletableFutureCompletionListener extends CompletableFuture diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnection.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnection.java index cd83bc3c..9ed65c20 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnection.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnection.java @@ -15,27 +15,6 @@ */ package com.datastax.oss.pulsar.jms; -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.InvalidClientIDException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.InvalidSelectorException; -import jakarta.jms.JMSException; -import jakarta.jms.MessageConsumer; -import jakarta.jms.Queue; -import jakarta.jms.QueueConnection; -import jakarta.jms.QueueSession; -import jakarta.jms.ServerSessionPool; -import jakarta.jms.Session; -import jakarta.jms.TemporaryQueue; -import jakarta.jms.TemporaryTopic; -import jakarta.jms.Topic; -import jakarta.jms.TopicConnection; -import jakarta.jms.TopicSession; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -43,6 +22,27 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantReadWriteLock; +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.InvalidClientIDException; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidSelectorException; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueSession; +import javax.jms.ServerSessionPool; +import javax.jms.Session; +import javax.jms.TemporaryQueue; +import javax.jms.TemporaryTopic; +import javax.jms.Topic; +import javax.jms.TopicConnection; +import javax.jms.TopicSession; import lombok.extern.slf4j.Slf4j; @Slf4j @@ -519,7 +519,7 @@ public void start() throws JMSException { * completing, they must have the full services of the connection available to them. * *

However if the {@code stop} method is called from a message listener on its own connection, - * then it will either fail and throw a {@code jakarta.jms.IllegalStateException}, or it will + * then it will either fail and throw a {@code javax.jms.IllegalStateException}, or it will * succeed and stop the connection, blocking until all other message listeners that may have been * running have returned. * @@ -583,7 +583,7 @@ private void checkNotInSessionMessageListener() throws JMSException { * have returned, and that all pending receives have returned. * *

However if the close method is called from a message listener on its own connection, then it - * will either fail and throw a {@code jakarta.jms.IllegalStateException}, or it will succeed and + * will either fail and throw a {@code javax.jms.IllegalStateException}, or it will succeed and * close the connection, blocking until all other message listeners that may have been running * have returned, and all pending receive calls have completed. If close succeeds and the * acknowledge mode of the session is set to {@code AUTO_ACKNOWLEDGE}, the current message will diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionConsumer.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionConsumer.java index 1db0a3b7..4a68d1c3 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionConsumer.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionConsumer.java @@ -15,15 +15,15 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.ConnectionConsumer; -import jakarta.jms.IllegalStateException; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.ServerSession; -import jakarta.jms.ServerSessionPool; import java.util.List; import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicBoolean; +import javax.jms.ConnectionConsumer; +import javax.jms.IllegalStateException; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.ServerSession; +import javax.jms.ServerSessionPool; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionFactory.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionFactory.java index 7d73b2d6..1525dd70 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionFactory.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionFactory.java @@ -25,22 +25,6 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.RemovalListener; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jakarta.jms.ConnectionFactory; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateException; -import jakarta.jms.InvalidClientIDException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSException; -import jakarta.jms.JMSRuntimeException; -import jakarta.jms.JMSSecurityException; -import jakarta.jms.JMSSecurityRuntimeException; -import jakarta.jms.Queue; -import jakarta.jms.QueueConnection; -import jakarta.jms.QueueConnectionFactory; -import jakarta.jms.Topic; -import jakarta.jms.TopicConnection; -import jakarta.jms.TopicConnectionFactory; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -72,6 +56,22 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Stream; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.IllegalStateException; +import javax.jms.InvalidClientIDException; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.JMSSecurityException; +import javax.jms.JMSSecurityRuntimeException; +import javax.jms.Queue; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.Topic; +import javax.jms.TopicConnection; +import javax.jms.TopicConnectionFactory; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; @@ -500,7 +500,7 @@ private synchronized void ensureInitialized(String connectUsername, String conne if (authPluginClassName.equals(AuthenticationToken.class.getName())) { authParamsString = connectPassword; } else { - throw new jakarta.jms.IllegalStateRuntimeException( + throw new javax.jms.IllegalStateRuntimeException( "With jms.useCredentialsFromConnect:true " + "only JWT (AuthenticationToken) authentication is currently supported"); } @@ -688,9 +688,9 @@ public synchronized PulsarClient getPulsarClient() { return pulsarClient; } - public synchronized PulsarAdmin getPulsarAdmin() throws jakarta.jms.IllegalStateException { + public synchronized PulsarAdmin getPulsarAdmin() throws javax.jms.IllegalStateException { if (!usePulsarAdmin) { - throw new jakarta.jms.IllegalStateException( + throw new javax.jms.IllegalStateException( "jms.usePulsarAdmin is set to false, this feature is not available"); } return pulsarAdmin; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionMetadata.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionMetadata.java index 72db5ca4..fccb4384 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionMetadata.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarConnectionMetadata.java @@ -15,12 +15,12 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.ConnectionMetaData; -import jakarta.jms.JMSException; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; +import javax.jms.ConnectionMetaData; +import javax.jms.JMSException; import org.apache.pulsar.PulsarVersion; class PulsarConnectionMetadata implements ConnectionMetaData { @@ -37,7 +37,7 @@ class PulsarConnectionMetadata implements ConnectionMetaData { */ @Override public String getJMSVersion() throws JMSException { - return "3.0"; + return "2.0"; } /** @@ -49,7 +49,7 @@ public String getJMSVersion() throws JMSException { */ @Override public int getJMSMajorVersion() throws JMSException { - return 3; + return 2; } /** diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarDestination.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarDestination.java index 2d7a4745..6c286b9e 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarDestination.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarDestination.java @@ -15,12 +15,12 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.Destination; -import jakarta.jms.InvalidDestinationException; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +import javax.jms.Destination; +import javax.jms.InvalidDestinationException; public abstract class PulsarDestination implements Destination { protected String topicName; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSAdminImpl.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSAdminImpl.java index 68d411f6..078841b4 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSAdminImpl.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSAdminImpl.java @@ -18,12 +18,6 @@ import com.datastax.oss.pulsar.jms.api.JMSAdmin; import com.datastax.oss.pulsar.jms.api.JMSDestinationMetadata; import com.datastax.oss.pulsar.jms.selectors.SelectorSupport; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; -import jakarta.jms.Topic; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -31,6 +25,12 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; +import javax.jms.Destination; +import javax.jms.IllegalStateException; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConstants.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConstants.java index e32f1f0c..1257bcd7 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConstants.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConstants.java @@ -15,7 +15,7 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.Message; +import javax.jms.Message; public final class PulsarJMSConstants { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConsumer.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConsumer.java index 92e33846..d67f596b 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConsumer.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSConsumer.java @@ -15,10 +15,10 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSRuntimeException; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; +import javax.jms.JMSConsumer; +import javax.jms.JMSRuntimeException; +import javax.jms.Message; +import javax.jms.MessageListener; public class PulsarJMSConsumer implements JMSConsumer { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSContext.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSContext.java index d79f7b5c..830bcd87 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSContext.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSContext.java @@ -15,35 +15,35 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.BytesMessage; -import jakarta.jms.Connection; -import jakarta.jms.ConnectionFactory; -import jakarta.jms.ConnectionMetaData; -import jakarta.jms.Destination; -import jakarta.jms.ExceptionListener; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.InvalidClientIDRuntimeException; -import jakarta.jms.InvalidDestinationRuntimeException; -import jakarta.jms.InvalidSelectorRuntimeException; -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 jakarta.jms.TransactionRolledBackRuntimeException; import java.io.Serializable; import java.util.Map; +import javax.jms.BytesMessage; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.ConnectionMetaData; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.InvalidClientIDRuntimeException; +import javax.jms.InvalidDestinationRuntimeException; +import javax.jms.InvalidSelectorRuntimeException; +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 javax.jms.TransactionRolledBackRuntimeException; public class PulsarJMSContext implements JMSContext { private final PulsarConnection connection; @@ -347,7 +347,7 @@ public void start() { * *

However if the stop method is called from a message listener on its own {@code JMSContext}, * or any other {@code JMSContext} that uses the same connection, then it will either fail and - * throw a {@code jakarta.jms.IllegalStateRuntimeException}, or it will succeed and stop the + * throw a {@code javax.jms.IllegalStateRuntimeException}, or it will succeed and stop the * connection, blocking until all other message listeners that may have been running have * returned. * @@ -448,9 +448,9 @@ public boolean getAutoStart() { * provider. * *

However if the close method is called from a message listener on its own {@code JMSContext}, - * then it will either fail and throw a {@code jakarta.jms.IllegalStateRuntimeException}, or it - * will succeed and close the {@code JMSContext}. If {@code close} succeeds and the session mode - * of the {@code JMSContext} is set to {@code AUTO_ACKNOWLEDGE}, the current message will still be + * then it will either fail and throw a {@code javax.jms.IllegalStateRuntimeException}, or it will + * succeed and close the {@code JMSContext}. If {@code close} succeeds and the session mode of the + * {@code JMSContext} is set to {@code AUTO_ACKNOWLEDGE}, the current message will still be * acknowledged automatically when the onMessage call completes. * *

Since two alternative behaviors are permitted in this case, applications should avoid diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSProducer.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSProducer.java index 746be193..ad63ed8e 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSProducer.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarJMSProducer.java @@ -16,24 +16,24 @@ package com.datastax.oss.pulsar.jms; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jakarta.jms.CompletionListener; -import jakarta.jms.DeliveryMode; -import jakarta.jms.Destination; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.InvalidDestinationRuntimeException; -import jakarta.jms.JMSException; -import jakarta.jms.JMSProducer; -import jakarta.jms.JMSRuntimeException; -import jakarta.jms.Message; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageFormatRuntimeException; -import jakarta.jms.MessageNotWriteableRuntimeException; import java.io.Serializable; import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; +import javax.jms.CompletionListener; +import javax.jms.DeliveryMode; +import javax.jms.Destination; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidDestinationRuntimeException; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.JMSRuntimeException; +import javax.jms.Message; +import javax.jms.MessageFormatException; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageNotWriteableRuntimeException; public class PulsarJMSProducer implements JMSProducer { private final PulsarJMSContext parent; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessage.java index 7c191a71..b28b0f43 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessage.java @@ -24,19 +24,6 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jakarta.jms.CompletionListener; -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.MessageEOFException; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageNotReadableException; -import jakarta.jms.MessageNotWriteableException; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; import java.io.EOFException; import java.io.Serializable; import java.nio.charset.StandardCharsets; @@ -51,6 +38,19 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; +import javax.jms.CompletionListener; +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.MessageEOFException; +import javax.jms.MessageFormatException; +import javax.jms.MessageNotReadableException; +import javax.jms.MessageNotWriteableException; +import javax.jms.MessageProducer; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.apache.avro.generic.GenericArray; import org.apache.avro.generic.GenericRecord; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageConsumer.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageConsumer.java index 74a0f7d6..15529bc2 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageConsumer.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageConsumer.java @@ -16,19 +16,6 @@ package com.datastax.oss.pulsar.jms; import com.datastax.oss.pulsar.jms.selectors.SelectorSupport; -import jakarta.jms.IllegalStateException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageListener; -import jakarta.jms.Queue; -import jakarta.jms.QueueReceiver; -import jakarta.jms.Session; -import jakarta.jms.Topic; -import jakarta.jms.TopicSubscriber; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -38,6 +25,19 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; +import javax.jms.IllegalStateException; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSConsumer; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageFormatException; +import javax.jms.MessageListener; +import javax.jms.Queue; +import javax.jms.QueueReceiver; +import javax.jms.Session; +import javax.jms.Topic; +import javax.jms.TopicSubscriber; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.PulsarClientException; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageProducer.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageProducer.java index 8f6cff79..d359c238 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageProducer.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarMessageProducer.java @@ -21,31 +21,31 @@ import com.datastax.oss.pulsar.jms.messages.PulsarSimpleMessage; import com.datastax.oss.pulsar.jms.messages.PulsarStreamMessage; import com.datastax.oss.pulsar.jms.messages.PulsarTextMessage; -import jakarta.jms.BytesMessage; -import jakarta.jms.CompletionListener; -import jakarta.jms.DeliveryMode; -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.MessageEOFException; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageProducer; -import jakarta.jms.ObjectMessage; -import jakarta.jms.Queue; -import jakarta.jms.QueueSender; -import jakarta.jms.Session; -import jakarta.jms.StreamMessage; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; -import jakarta.jms.TopicPublisher; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.DeliveryMode; +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.MessageEOFException; +import javax.jms.MessageFormatException; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.QueueSender; +import javax.jms.Session; +import javax.jms.StreamMessage; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.TopicPublisher; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.api.TypedMessageBuilder; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueue.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueue.java index 0aaaf825..2aad6219 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueue.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueue.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; +import javax.jms.Queue; /** Represents a JMS Queue destination. In Pulsar there is no difference between Queue and Topic. */ public final class PulsarQueue extends PulsarDestination implements Queue { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueueBrowser.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueueBrowser.java index 1035fd48..2a427415 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueueBrowser.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarQueueBrowser.java @@ -16,9 +16,6 @@ package com.datastax.oss.pulsar.jms; import com.datastax.oss.pulsar.jms.selectors.SelectorSupport; -import jakarta.jms.JMSException; -import jakarta.jms.Queue; -import jakarta.jms.QueueBrowser; import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; @@ -27,6 +24,9 @@ import java.util.NoSuchElementException; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; +import javax.jms.JMSException; +import javax.jms.Queue; +import javax.jms.QueueBrowser; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.Reader; import org.apache.pulsar.client.api.SubscriptionMode; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarSession.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarSession.java index e8dd0904..d93d67d1 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarSession.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarSession.java @@ -22,35 +22,6 @@ import com.datastax.oss.pulsar.jms.messages.PulsarStreamMessage; import com.datastax.oss.pulsar.jms.messages.PulsarTextMessage; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.InvalidSelectorException; -import jakarta.jms.JMSException; -import jakarta.jms.JMSRuntimeException; -import jakarta.jms.MapMessage; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageListener; -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.ServerSession; -import jakarta.jms.ServerSessionPool; -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 java.io.Serializable; import java.util.ArrayList; import java.util.HashMap; @@ -72,6 +43,35 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.IllegalStateException; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidSelectorException; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +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.ServerSession; +import javax.jms.ServerSessionPool; +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 lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerInterceptor; @@ -183,7 +183,7 @@ private synchronized ScheduledExecutorService getThreadPool() { /** * Build a new Sessopm that shares the same Connection, as {@link - * jakarta.jms.JMSContext#createContext(int)}. But you can override some configuration settings, + * javax.jms.JMSContext#createContext(int)}. But you can override some configuration settings, * like "consumerConfig" * * @param sessionMode @@ -693,7 +693,7 @@ private void rollbackInternal() throws JMSException { * session is closed. * *

However if the close method is called from a message listener on its own {@code Session}, - * then it will either fail and throw a {@code jakarta.jms.IllegalStateException}, or it will + * then it will either fail and throw a {@code javax.jms.IllegalStateException}, or it will * succeed and close the {@code Session}, blocking until any pending receive call in progress has * completed. If close succeeds and the acknowledge mode of the {@code Session} is set to {@code * AUTO_ACKNOWLEDGE}, the current message will still be acknowledged automatically when the {@code diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryDestination.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryDestination.java index 4c4321b6..9015c75a 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryDestination.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryDestination.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.IllegalStateException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; +import javax.jms.IllegalStateException; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryQueue.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryQueue.java index f1c0cf95..fb62be0e 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryQueue.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryQueue.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; -import jakarta.jms.TemporaryQueue; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; +import javax.jms.TemporaryQueue; class PulsarTemporaryQueue extends PulsarTemporaryDestination implements TemporaryQueue { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryTopic.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryTopic.java index 13a3b1f6..38e8afa6 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryTopic.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTemporaryTopic.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; -import jakarta.jms.TemporaryTopic; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; +import javax.jms.TemporaryTopic; class PulsarTemporaryTopic extends PulsarTemporaryDestination implements TemporaryTopic { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTopic.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTopic.java index 014fc616..65b8b593 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTopic.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/PulsarTopic.java @@ -15,9 +15,9 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.JMSException; -import jakarta.jms.Topic; +import javax.jms.InvalidDestinationException; +import javax.jms.JMSException; +import javax.jms.Topic; /** Represents a JMS Topic destination. In Pulsar there is no difference between Queue and Topic. */ public final class PulsarTopic extends PulsarDestination implements Topic { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/TopicDiscoveryUtils.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/TopicDiscoveryUtils.java index 3a1c2998..5d7beab0 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/TopicDiscoveryUtils.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/TopicDiscoveryUtils.java @@ -15,13 +15,13 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.JMSException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.regex.Pattern; import java.util.stream.Collectors; +import javax.jms.JMSException; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.impl.LookupService; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java index 30834db6..9ebdbf45 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/Utils.java @@ -15,24 +15,6 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.IllegalStateException; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.InvalidClientIDException; -import jakarta.jms.InvalidClientIDRuntimeException; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.InvalidDestinationRuntimeException; -import jakarta.jms.InvalidSelectorException; -import jakarta.jms.InvalidSelectorRuntimeException; -import jakarta.jms.JMSException; -import jakarta.jms.JMSRuntimeException; -import jakarta.jms.JMSSecurityException; -import jakarta.jms.JMSSecurityRuntimeException; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageFormatRuntimeException; -import jakarta.jms.MessageNotWriteableException; -import jakarta.jms.MessageNotWriteableRuntimeException; -import jakarta.jms.TransactionRolledBackException; -import jakarta.jms.TransactionRolledBackRuntimeException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.HashMap; @@ -45,6 +27,24 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.function.BooleanSupplier; import java.util.stream.Collectors; +import javax.jms.IllegalStateException; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.InvalidClientIDException; +import javax.jms.InvalidClientIDRuntimeException; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidDestinationRuntimeException; +import javax.jms.InvalidSelectorException; +import javax.jms.InvalidSelectorRuntimeException; +import javax.jms.JMSException; +import javax.jms.JMSRuntimeException; +import javax.jms.JMSSecurityException; +import javax.jms.JMSSecurityRuntimeException; +import javax.jms.MessageFormatException; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageNotWriteableException; +import javax.jms.MessageNotWriteableRuntimeException; +import javax.jms.TransactionRolledBackException; +import javax.jms.TransactionRolledBackRuntimeException; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.client.api.MessageIdAdv; diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarBytesMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarBytesMessage.java index cfbb0792..60532652 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarBytesMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarBytesMessage.java @@ -18,17 +18,17 @@ import com.datastax.oss.pulsar.jms.PulsarMessage; import com.datastax.oss.pulsar.jms.Utils; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -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 java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.EOFException; +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 org.apache.pulsar.client.api.TypedMessageBuilder; public final class PulsarBytesMessage extends PulsarMessage implements BytesMessage { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarMapMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarMapMessage.java index 2833a0a4..e8da31dc 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarMapMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarMapMessage.java @@ -18,10 +18,6 @@ import com.datastax.oss.pulsar.jms.PulsarMessage; import com.datastax.oss.pulsar.jms.Utils; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import jakarta.jms.JMSException; -import jakarta.jms.MapMessage; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageNotWriteableException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; @@ -30,6 +26,10 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; +import javax.jms.JMSException; +import javax.jms.MapMessage; +import javax.jms.MessageFormatException; +import javax.jms.MessageNotWriteableException; import org.apache.pulsar.client.api.TypedMessageBuilder; @SuppressFBWarnings({"EI_EXPOSE_REP2", "EI_EXPOSE_REP"}) diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarObjectMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarObjectMessage.java index e63c25d6..d5ec5e39 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarObjectMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarObjectMessage.java @@ -17,15 +17,15 @@ import com.datastax.oss.pulsar.jms.PulsarMessage; import com.datastax.oss.pulsar.jms.Utils; -import jakarta.jms.JMSException; -import jakarta.jms.MessageFormatException; -import jakarta.jms.MessageNotWriteableException; -import jakarta.jms.ObjectMessage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import javax.jms.JMSException; +import javax.jms.MessageFormatException; +import javax.jms.MessageNotWriteableException; +import javax.jms.ObjectMessage; import org.apache.pulsar.client.api.TypedMessageBuilder; public final class PulsarObjectMessage extends PulsarMessage implements ObjectMessage { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarSimpleMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarSimpleMessage.java index 080422e8..24b87769 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarSimpleMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarSimpleMessage.java @@ -16,7 +16,7 @@ package com.datastax.oss.pulsar.jms.messages; import com.datastax.oss.pulsar.jms.PulsarMessage; -import jakarta.jms.JMSException; +import javax.jms.JMSException; import org.apache.pulsar.client.api.TypedMessageBuilder; public final class PulsarSimpleMessage extends PulsarMessage { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarStreamMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarStreamMessage.java index e09bf2f1..552ba881 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarStreamMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarStreamMessage.java @@ -18,18 +18,18 @@ import com.datastax.oss.pulsar.jms.PulsarMessage; import com.datastax.oss.pulsar.jms.Utils; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -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 java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.EOFException; import java.io.IOException; +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 org.apache.pulsar.client.api.TypedMessageBuilder; public final class PulsarStreamMessage extends PulsarMessage implements StreamMessage { diff --git a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarTextMessage.java b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarTextMessage.java index d79e53c6..3d57b1bf 100644 --- a/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarTextMessage.java +++ b/pulsar-jms/src/main/java/com/datastax/oss/pulsar/jms/messages/PulsarTextMessage.java @@ -17,10 +17,10 @@ import com.datastax.oss.pulsar.jms.PulsarMessage; import com.datastax.oss.pulsar.jms.Utils; -import jakarta.jms.JMSException; -import jakarta.jms.MessageNotWriteableException; -import jakarta.jms.TextMessage; import java.nio.charset.StandardCharsets; +import javax.jms.JMSException; +import javax.jms.MessageNotWriteableException; +import javax.jms.TextMessage; import org.apache.pulsar.client.api.TypedMessageBuilder; public final class PulsarTextMessage extends PulsarMessage implements TextMessage { diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/AcknowledgementModeTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/AcknowledgementModeTest.java index 90b13b76..679038df 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/AcknowledgementModeTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/AcknowledgementModeTest.java @@ -21,20 +21,20 @@ import static org.junit.jupiter.api.Assertions.fail; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageFormatRuntimeException; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageFormatRuntimeException; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.impl.BatchMessageIdImpl; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/BasicServerSideFilterTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/BasicServerSideFilterTest.java index c7f04f34..c9ad168e 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/BasicServerSideFilterTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/BasicServerSideFilterTest.java @@ -22,16 +22,16 @@ import static org.mockito.Mockito.*; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.MessageConsumer; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdmin; import org.apache.pulsar.client.admin.PulsarAdminException; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ClientIDTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ClientIDTest.java index 0861686d..0d1349e4 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ClientIDTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ClientIDTest.java @@ -17,12 +17,12 @@ import static org.junit.jupiter.api.Assertions.fail; -import jakarta.jms.Connection; -import jakarta.jms.InvalidClientIDException; -import jakarta.jms.InvalidClientIDRuntimeException; -import jakarta.jms.JMSContext; import java.util.HashMap; import java.util.Map; +import javax.jms.Connection; +import javax.jms.InvalidClientIDException; +import javax.jms.InvalidClientIDRuntimeException; +import javax.jms.JMSContext; import org.junit.jupiter.api.Test; public class ClientIDTest { diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConfigurationTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConfigurationTest.java index ac396888..5597ced0 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConfigurationTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConfigurationTest.java @@ -19,14 +19,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Producer; import org.apache.pulsar.client.impl.MessageImpl; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionConsumerTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionConsumerTest.java index 7c93a818..cc48df7b 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionConsumerTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionConsumerTest.java @@ -23,18 +23,6 @@ import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.ConnectionConsumer; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; -import jakarta.jms.MessageProducer; -import jakarta.jms.ServerSession; -import jakarta.jms.ServerSessionPool; -import jakarta.jms.Session; -import jakarta.jms.Topic; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -47,6 +35,18 @@ import java.util.concurrent.Executors; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.ConnectionConsumer; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.ServerSession; +import javax.jms.ServerSessionPool; +import javax.jms.Session; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.policies.data.TopicStats; import org.apache.pulsar.common.util.FutureUtil; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionPausedTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionPausedTest.java index 0dc77374..52b81319 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionPausedTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ConnectionPausedTest.java @@ -19,13 +19,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; @@ -34,6 +27,13 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Stream; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.awaitility.Awaitility; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/DeadLetterQueueTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/DeadLetterQueueTest.java index 62311e79..27c89f4a 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/DeadLetterQueueTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/DeadLetterQueueTest.java @@ -20,14 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.Topic; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; @@ -39,6 +31,14 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.IntStream; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.impl.BatchMessageIdImpl; import org.apache.pulsar.client.impl.TopicMessageIdImpl; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSAdminTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSAdminTest.java index 8b2d4172..12e4d21f 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSAdminTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSAdminTest.java @@ -26,15 +26,15 @@ import com.datastax.oss.pulsar.jms.api.JMSDestinationMetadata; import com.datastax.oss.pulsar.jms.messages.PulsarTextMessage; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.Topic; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import javax.jms.InvalidDestinationException; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.Topic; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSMessageHeaderTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSMessageHeaderTest.java index 8309ce44..f0b0970c 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSMessageHeaderTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSMessageHeaderTest.java @@ -20,14 +20,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Destination; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSProducer; -import jakarta.jms.TextMessage; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; +import javax.jms.Destination; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSProducer; +import javax.jms.TextMessage; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSPublishFiltersBase.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSPublishFiltersBase.java index f84ea32c..7d5c08dd 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSPublishFiltersBase.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JMSPublishFiltersBase.java @@ -19,16 +19,16 @@ import static org.junit.jupiter.api.Assertions.assertNull; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.SubscriptionType; import org.apache.pulsar.common.policies.data.PartitionedTopicStats; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JNDITest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JNDITest.java index cbf04618..ce03622c 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JNDITest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/JNDITest.java @@ -26,15 +26,15 @@ import com.datastax.oss.pulsar.jms.jndi.PulsarContext; import com.datastax.oss.pulsar.jms.jndi.PulsarInitialContextFactory; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.util.HashMap; import java.util.Map; import java.util.Properties; import java.util.UUID; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; import javax.naming.CompositeName; import javax.naming.CompoundName; import javax.naming.Context; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/MessageListenerTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/MessageListenerTest.java index 96202571..471a3b1e 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/MessageListenerTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/MessageListenerTest.java @@ -24,20 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.IllegalStateException; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSProducer; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageListener; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.util.List; import java.util.Map; import java.util.UUID; @@ -46,6 +32,20 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.IllegalStateException; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSProducer; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoAutoCreateSubscriptionTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoAutoCreateSubscriptionTest.java index e0d9e051..1da0c8af 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoAutoCreateSubscriptionTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoAutoCreateSubscriptionTest.java @@ -19,14 +19,14 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.JMSException; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; import java.util.Map; import java.util.UUID; +import javax.jms.Connection; +import javax.jms.JMSException; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.common.policies.data.TopicStats; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoLocalTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoLocalTest.java index bd058b49..0fc474b2 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoLocalTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/NoLocalTest.java @@ -21,18 +21,18 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.JMSContext; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.stream.Stream; +import javax.jms.Connection; +import javax.jms.JMSContext; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.SubscriptionType; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/OverrideConsumerConfigurationTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/OverrideConsumerConfigurationTest.java index e387833b..d9e24a3b 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/OverrideConsumerConfigurationTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/OverrideConsumerConfigurationTest.java @@ -21,17 +21,17 @@ import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.Topic; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PriorityTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PriorityTest.java index eccd601d..fa7414ec 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PriorityTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PriorityTest.java @@ -22,7 +22,6 @@ import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.*; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Enumeration; @@ -36,6 +35,7 @@ import java.util.function.Consumer; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.jms.*; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.impl.ConsumerBase; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ProducerCacheTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ProducerCacheTest.java index c9bbf3bc..3215bddd 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ProducerCacheTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/ProducerCacheTest.java @@ -18,12 +18,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.JMSException; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TemporaryQueue; import java.util.Map; +import javax.jms.Connection; +import javax.jms.JMSException; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TemporaryQueue; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.admin.PulsarAdminException; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarDestinationTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarDestinationTest.java index 2be8cdf3..5d94ee9d 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarDestinationTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarDestinationTest.java @@ -21,10 +21,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import jakarta.jms.InvalidDestinationException; -import jakarta.jms.InvalidDestinationRuntimeException; import java.util.List; import java.util.function.BiConsumer; +import javax.jms.InvalidDestinationException; +import javax.jms.InvalidDestinationRuntimeException; import org.junit.jupiter.api.Test; public class PulsarDestinationTest { diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarInteropTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarInteropTest.java index a8b25eff..6df112d7 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarInteropTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/PulsarInteropTest.java @@ -19,22 +19,22 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.BytesMessage; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.MapMessage; -import jakarta.jms.MessageProducer; -import jakarta.jms.ObjectMessage; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; +import javax.jms.BytesMessage; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.MapMessage; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Session; +import javax.jms.TextMessage; import lombok.Data; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Message; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueryStringTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueryStringTest.java index c81378dd..1e6a1857 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueryStringTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueryStringTest.java @@ -20,11 +20,11 @@ import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.MessageConsumer; -import jakarta.jms.Queue; -import jakarta.jms.Session; import java.util.Map; import java.util.UUID; +import javax.jms.MessageConsumer; +import javax.jms.Queue; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueueTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueueTest.java index 1e2eb6dc..3b7bacc3 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueueTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/QueueTest.java @@ -23,20 +23,20 @@ import static org.junit.jupiter.api.Assertions.fail; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.QueueBrowser; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; import java.util.ArrayList; import java.util.Enumeration; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import java.util.UUID; +import javax.jms.Connection; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.TextMessage; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.common.policies.data.TopicStats; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java index ad394456..84b2cae9 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SelectorsTestsBase.java @@ -25,13 +25,6 @@ import com.datastax.oss.pulsar.jms.messages.PulsarTextMessage; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.CompletionListener; -import jakarta.jms.Message; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.QueueBrowser; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -41,6 +34,13 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.TimeUnit; +import javax.jms.CompletionListener; +import javax.jms.Message; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.pulsar.client.api.*; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SerializableConnectionFactoryTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SerializableConnectionFactoryTest.java index 1f799f85..fef0afd2 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SerializableConnectionFactoryTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SerializableConnectionFactoryTest.java @@ -18,17 +18,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.ConnectionFactory; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.Map; +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleMessageListener.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleMessageListener.java index d4aa9c39..79bf05d2 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleMessageListener.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleMessageListener.java @@ -15,10 +15,10 @@ */ package com.datastax.oss.pulsar.jms; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import javax.jms.Message; +import javax.jms.MessageListener; import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleTest.java index 29f804fc..5c78311a 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/SimpleTest.java @@ -25,25 +25,6 @@ import com.datastax.oss.pulsar.jms.messages.PulsarSimpleMessage; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.BytesMessage; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.DeliveryMode; -import jakarta.jms.Destination; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSProducer; -import jakarta.jms.JMSSecurityException; -import jakarta.jms.JMSSecurityRuntimeException; -import jakarta.jms.MapMessage; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.ObjectMessage; -import jakarta.jms.Queue; -import jakarta.jms.Session; -import jakarta.jms.StreamMessage; -import jakarta.jms.TextMessage; import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.EOFException; @@ -55,6 +36,25 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import javax.jms.BytesMessage; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.DeliveryMode; +import javax.jms.Destination; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSProducer; +import javax.jms.JMSSecurityException; +import javax.jms.JMSSecurityRuntimeException; +import javax.jms.MapMessage; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.ObjectMessage; +import javax.jms.Queue; +import javax.jms.Session; +import javax.jms.StreamMessage; +import javax.jms.TextMessage; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsNonAdminTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsNonAdminTest.java index 34bf69ab..87965adc 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsNonAdminTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsNonAdminTest.java @@ -19,14 +19,14 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; import java.util.Map; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsTest.java index f6d460d1..d0d1c181 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TemporaryDestinationsTest.java @@ -20,17 +20,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.Session; import java.util.List; import java.util.Map; import java.util.UUID; import java.util.function.Function; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.Session; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TimeToLiveTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TimeToLiveTest.java index ed6dff7f..3627457e 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TimeToLiveTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TimeToLiveTest.java @@ -20,16 +20,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.DeliveryMode; -import jakarta.jms.Message; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.HashMap; import java.util.Map; import java.util.UUID; import java.util.stream.Stream; +import javax.jms.DeliveryMode; +import javax.jms.Message; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.SubscriptionType; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TopicTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TopicTest.java index 258e52aa..0e973d09 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TopicTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TopicTest.java @@ -25,20 +25,6 @@ import com.datastax.oss.pulsar.jms.messages.PulsarTextMessage; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.IllegalStateException; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSException; -import jakarta.jms.JMSProducer; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; -import jakarta.jms.TopicSubscriber; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -46,6 +32,20 @@ import java.util.UUID; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.IllegalStateException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.JMSProducer; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; +import javax.jms.TopicSubscriber; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.PulsarClientException; import org.apache.pulsar.client.api.SubscriptionType; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TransactionsTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TransactionsTest.java index c3eab6a8..48782b66 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TransactionsTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/TransactionsTest.java @@ -22,21 +22,6 @@ import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.CompletionListener; -import jakarta.jms.Connection; -import jakarta.jms.Destination; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageListener; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.QueueBrowser; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; @@ -48,6 +33,21 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; +import javax.jms.CompletionListener; +import javax.jms.Connection; +import javax.jms.Destination; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageListener; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.impl.BatchMessageIdImpl; import org.awaitility.Awaitility; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/UnsubscribeTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/UnsubscribeTest.java index f37d3dbd..e3a11769 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/UnsubscribeTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/UnsubscribeTest.java @@ -19,14 +19,14 @@ import static org.junit.jupiter.api.Assertions.assertNull; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; -import jakarta.jms.Connection; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.util.Map; import java.util.UUID; +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/VirtualDestinationsConsumerTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/VirtualDestinationsConsumerTest.java index 97ee7f62..4037eeeb 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/VirtualDestinationsConsumerTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/VirtualDestinationsConsumerTest.java @@ -23,14 +23,6 @@ import com.datastax.oss.pulsar.jms.selectors.SelectorSupport; import com.datastax.oss.pulsar.jms.utils.PulsarContainerExtension; import com.google.common.collect.ImmutableMap; -import jakarta.jms.Connection; -import jakarta.jms.MessageConsumer; -import jakarta.jms.MessageProducer; -import jakarta.jms.Queue; -import jakarta.jms.QueueBrowser; -import jakarta.jms.Session; -import jakarta.jms.TextMessage; -import jakarta.jms.Topic; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Enumeration; @@ -42,6 +34,14 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.Stream; +import javax.jms.Connection; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Queue; +import javax.jms.QueueBrowser; +import javax.jms.Session; +import javax.jms.TextMessage; +import javax.jms.Topic; import lombok.extern.slf4j.Slf4j; import org.apache.pulsar.client.api.MessageId; import org.apache.pulsar.client.api.SubscriptionType; diff --git a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/messages/PulsarBufferedMessageTest.java b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/messages/PulsarBufferedMessageTest.java index c6f18b8d..73c74a17 100644 --- a/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/messages/PulsarBufferedMessageTest.java +++ b/pulsar-jms/src/test/java/com/datastax/oss/pulsar/jms/messages/PulsarBufferedMessageTest.java @@ -20,11 +20,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -import jakarta.jms.BytesMessage; -import jakarta.jms.JMSException; -import jakarta.jms.MessageEOFException; -import jakarta.jms.StreamMessage; import java.nio.charset.StandardCharsets; +import javax.jms.BytesMessage; +import javax.jms.JMSException; +import javax.jms.MessageEOFException; +import javax.jms.StreamMessage; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/resource-adapter-tests/pom.xml b/resource-adapter-tests/pom.xml index eaf29f9e..69f32c33 100644 --- a/resource-adapter-tests/pom.xml +++ b/resource-adapter-tests/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 @@ -30,8 +30,8 @@ org.apache.tomee - jakartaee-api - 9.1.0 + javaee-api + 8.0-5 provided @@ -68,12 +68,6 @@ 1.16.1 test - - jakarta.inject - jakarta.inject-api - 2.0.1 - compile - diff --git a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/JMSListener.java b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/JMSListener.java index 5dfb64bd..6de86394 100644 --- a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/JMSListener.java +++ b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/JMSListener.java @@ -15,12 +15,12 @@ */ package com.datastax.oss.pulsar.jms.tests; -import jakarta.ejb.ActivationConfigProperty; -import jakarta.ejb.MessageDriven; -import jakarta.enterprise.event.Event; -import jakarta.inject.Inject; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.enterprise.event.Event; +import javax.inject.Inject; +import javax.jms.Message; +import javax.jms.MessageListener; @MessageDriven( activationConfig = { diff --git a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/ReceivedMessages.java b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/ReceivedMessages.java index 42939a19..30cd4396 100644 --- a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/ReceivedMessages.java +++ b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/ReceivedMessages.java @@ -15,10 +15,10 @@ */ package com.datastax.oss.pulsar.jms.tests; -import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.event.Observes; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.event.Observes; @ApplicationScoped public class ReceivedMessages { diff --git a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/SendJMSMessage.java b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/SendJMSMessage.java index 2fd63f1b..916baff1 100644 --- a/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/SendJMSMessage.java +++ b/resource-adapter-tests/src/main/java/com/datastax/oss/pulsar/jms/tests/SendJMSMessage.java @@ -15,13 +15,13 @@ */ package com.datastax.oss.pulsar.jms.tests; -import jakarta.annotation.Resource; -import jakarta.ejb.Schedule; -import jakarta.ejb.Stateless; -import jakarta.jms.ConnectionFactory; -import jakarta.jms.JMSContext; -import jakarta.jms.Queue; import java.util.Date; +import javax.annotation.Resource; +import javax.ejb.Schedule; +import javax.ejb.Stateless; +import javax.jms.ConnectionFactory; +import javax.jms.JMSContext; +import javax.jms.Queue; // import jakarta.resource.AdministeredObjectDefinition; // import jakarta.resource.ConnectionFactoryDefinition; @@ -29,10 +29,10 @@ @Stateless public class SendJMSMessage { - @Resource(name = "pulsar-jakarta.jms.ConnectionFactory") + @Resource(name = "pulsar-javax.jms.ConnectionFactory") ConnectionFactory factory; - @Resource(name = "pulsar-jakarta.jms.Queue") + @Resource(name = "pulsar-javax.jms.Queue") private Queue queue; @Schedule( diff --git a/resource-adapter-tests/src/main/resources/system.properties b/resource-adapter-tests/src/main/resources/system.properties index 675e5c04..7804553a 100644 --- a/resource-adapter-tests/src/main/resources/system.properties +++ b/resource-adapter-tests/src/main/resources/system.properties @@ -24,4 +24,4 @@ ra = new://Deployments?jar=/usr/local/tomee/rars/pulsarra.rar pulsarRA.Configuration = {"brokerServiceUrl":"pulsar://pulsar:6650","webServiceUrl":"http://pulsar:8080"} # configure the queue -pulsar-jakarta.jms.Queue.Name = the-queue \ No newline at end of file +pulsar-javax.jms.Queue.Name = the-queue \ No newline at end of file diff --git a/resource-adapter/pom.xml b/resource-adapter/pom.xml index 29bafa1a..88f5849d 100644 --- a/resource-adapter/pom.xml +++ b/resource-adapter/pom.xml @@ -20,7 +20,7 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT ../pom.xml 4.0.0 diff --git a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java index 5d815840..1a56777c 100644 --- a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java +++ b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpec.java @@ -115,20 +115,20 @@ public void validate() throws InvalidPropertyException { boolean isTopic; switch (destinationType) { case "queue": - case "jakarta.jms.Queue": + case "javax.jms.Queue": case "Queue": isTopic = false; break; case "topic": case "Topic": - case "jakarta.jms.Topic": + case "javax.jms.Topic": isTopic = true; break; default: throw new InvalidPropertyException( "Invalid destinationType '" + destinationType - + "', only 'queue','topic','jakarta.jms.Queue','jakarta.jms.Topic'"); + + "', only 'queue','topic','javax.jms.Queue','javax.jms.Topic'"); } if (destination == null || destination.isEmpty()) { throw new InvalidPropertyException( diff --git a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpoint.java b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpoint.java index 942cdc54..91145388 100644 --- a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpoint.java +++ b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpoint.java @@ -22,13 +22,6 @@ import com.datastax.oss.pulsar.jms.PulsarQueue; import com.datastax.oss.pulsar.jms.PulsarTopic; import com.google.common.collect.ImmutableMap; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.JMSContext; -import jakarta.jms.JMSException; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; -import jakarta.jms.Topic; import jakarta.resource.spi.ActivationSpec; import jakarta.resource.spi.endpoint.MessageEndpoint; import jakarta.resource.spi.endpoint.MessageEndpointFactory; @@ -37,6 +30,13 @@ import java.util.Hashtable; import java.util.List; import java.util.Map; +import javax.jms.Destination; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSContext; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Topic; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.transaction.xa.XAException; diff --git a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java index aa2e227b..69f50c83 100644 --- a/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java +++ b/resource-adapter/src/main/java/com/datastax/oss/pulsar/jms/rar/PulsarResourceAdapter.java @@ -16,7 +16,6 @@ package com.datastax.oss.pulsar.jms.rar; import com.datastax.oss.pulsar.jms.PulsarConnectionFactory; -import jakarta.jms.JMSException; import jakarta.resource.ResourceException; import jakarta.resource.spi.ActivationSpec; import jakarta.resource.spi.BootstrapContext; @@ -28,6 +27,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; +import javax.jms.JMSException; import javax.transaction.xa.XAResource; import lombok.extern.slf4j.Slf4j; diff --git a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java index 1eb6fcd6..ad0293a0 100644 --- a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java +++ b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarActivationSpecTest.java @@ -34,8 +34,8 @@ public void testDestinationType() throws Exception { validateDestinationType("topic", false); validateDestinationType("Queue", false); validateDestinationType("Topic", false); - validateDestinationType("jakarta.jms.Queue", false); - validateDestinationType("jakarta.jms.Topic", false); + validateDestinationType("javax.jms.Queue", false); + validateDestinationType("javax.jms.Topic", false); validateDestinationType("", true); validateDestinationType(null, true); diff --git a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpointTest.java b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpointTest.java index db7bd869..7bb4275f 100644 --- a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpointTest.java +++ b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/PulsarMessageEndpointTest.java @@ -33,13 +33,6 @@ import com.datastax.oss.pulsar.jms.PulsarConnectionFactory; import com.datastax.oss.pulsar.jms.PulsarJMSContext; import com.datastax.oss.pulsar.jms.PulsarMessage; -import jakarta.jms.Destination; -import jakarta.jms.IllegalStateRuntimeException; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; -import jakarta.jms.Message; -import jakarta.jms.MessageListener; -import jakarta.jms.Topic; import jakarta.resource.ResourceException; import jakarta.resource.spi.endpoint.MessageEndpoint; import jakarta.resource.spi.endpoint.MessageEndpointFactory; @@ -50,6 +43,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; +import javax.jms.Destination; +import javax.jms.IllegalStateRuntimeException; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; +import javax.jms.Message; +import javax.jms.MessageListener; +import javax.jms.Topic; import javax.transaction.xa.XAResource; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/ResourceAdapterTest.java b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/ResourceAdapterTest.java index ca3c00da..09855fd0 100644 --- a/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/ResourceAdapterTest.java +++ b/resource-adapter/src/test/java/com/datastax/oss/pulsar/jms/rar/ResourceAdapterTest.java @@ -27,11 +27,11 @@ import com.datastax.oss.pulsar.jms.PulsarConnectionFactory; import com.datastax.oss.pulsar.jms.PulsarJMSContext; -import jakarta.jms.Destination; -import jakarta.jms.JMSConsumer; -import jakarta.jms.JMSContext; import jakarta.resource.spi.UnavailableException; import jakarta.resource.spi.endpoint.MessageEndpointFactory; +import javax.jms.Destination; +import javax.jms.JMSConsumer; +import javax.jms.JMSContext; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; diff --git a/tck-executor/jakarta-messaging-tck-3.0.1.zip b/tck-executor/jakarta-messaging-tck-2.0.0.zip similarity index 54% rename from tck-executor/jakarta-messaging-tck-3.0.1.zip rename to tck-executor/jakarta-messaging-tck-2.0.0.zip index d082cc8f..b3aa0742 100644 Binary files a/tck-executor/jakarta-messaging-tck-3.0.1.zip and b/tck-executor/jakarta-messaging-tck-2.0.0.zip differ diff --git a/tck-executor/pom.xml b/tck-executor/pom.xml index 89a7282a..5214aa7d 100644 --- a/tck-executor/pom.xml +++ b/tck-executor/pom.xml @@ -20,12 +20,13 @@ pulsar-jms-parent com.datastax.oss - 9.0.0-SNAPSHOT + 8.0.1-SNAPSHOT 4.0.0 tck-executor jar JMS 2.0 TCK Executor + Executor for JMS 2.0 TCK tests ${project.build.directory} diff --git a/tck-executor/run_from_maven.sh b/tck-executor/run_from_maven.sh index 0040585b..29669a84 100755 --- a/tck-executor/run_from_maven.sh +++ b/tck-executor/run_from_maven.sh @@ -7,7 +7,7 @@ HERE=$(realpath "$HERE") CONFIGURATION_FILE=${1:-ts.jte} echo "CONFIGURATION_FILE is $CONFIGURATION_FILE" -unzip -o $HERE/jakarta-messaging-tck-3.0.1.zip -d $HERE/target +unzip -o $HERE/jakarta-messaging-tck-2.0.0.zip -d $HERE/target TS_HOME=target/messaging-tck diff --git a/tck-executor/run_tck_group.sh b/tck-executor/run_tck_group.sh index 6389610f..6dabf0e4 100755 --- a/tck-executor/run_tck_group.sh +++ b/tck-executor/run_tck_group.sh @@ -12,7 +12,7 @@ echo "CONFIGURATION_FILE is $CONFIGURATION_FILE" echo "TEST_GROUP is $TEST_GROUP" echo "SUBDIR_PATTERN is $SUBDIR_PATTERN" -unzip -o $HERE/jakarta-messaging-tck-3.0.1.zip -d $HERE/target +unzip -o $HERE/jakarta-messaging-tck-2.0.0.zip -d $HERE/target TS_HOME=target/messaging-tck diff --git a/tck-executor/ts.jte b/tck-executor/ts.jte index 8e6066c3..0dc817fb 100644 --- a/tck-executor/ts.jte +++ b/tck-executor/ts.jte @@ -72,19 +72,14 @@ ts.run.classpath=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/sigtest.ja tools.jar=${jdk.home}/lib/tools.jar ############################################################################# -# @jimage.dir: This property specifies the directory where Java 11+ -# modules will be expanded by the jimage tool for use -# in sigTestClasspath # @sigTestClasspath: This property must be set when running signature # tests. This property should be set to a list of # jar files and/or directories which contain your -# Jakarta EE and Java SE classes. Paths must be +# Java EE and Java SE classes. Paths must be # separated by the appropriate path separator -# (';' windows, ':' Unix). +# (';' windows, ':' Unixes). ############################################################################# -jimage.dir=${ts.home}/tmp/jdk-bundles - -sigTestClasspath=${jms.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming +sigTestClasspath=${jms.classes}${pathsep}${JAVA_HOME}/lib/rt.jar ############################################################################ # These properties are used by the harness. "harness.log.port" diff --git a/tck-executor/ts.jtx b/tck-executor/ts.jtx index 57d87a6e..bd3f3cf5 100644 --- a/tck-executor/ts.jtx +++ b/tck-executor/ts.jtx @@ -20,12 +20,12 @@ # Message selectors partially supported: # in these tests it is expected that if you can change the "selector" or "noLocal" there is an implicit "unsubscribe" -# this is currently not possible with FastJMS because those properties are only managed locally in the client +# this is currently not possible with Pulsar JMS because those properties are only managed locally in the client # the broker does not know that the subscription had different configurations for "selector" or "noLocal" com/sun/ts/tests/jms/core/topictests/TopicTests.java#durableSubscriberTopicNoLocalTest2_from_standalone com/sun/ts/tests/jms/core20/jmscontexttopictests/Client.java#durableConsumerTopicNoLocalTest_from_standalone -# These tests requires fails after "Create second shared consumer with same name but different topic" +# These tests fail after "Create second shared consumer with same name but different topic" # it expects that the consumer name is unique across topics using "createSharedConsumer" com/sun/ts/tests/jms/core20/sessiontests/Client.java#jMSExceptionTests_from_standalone com/sun/ts/tests/jms/core20/jmscontexttopictests/Client.java#jMSRuntimeExceptionTests_from_standalone diff --git a/tck-executor/ts.serverSideFilters.jte b/tck-executor/ts.serverSideFilters.jte index 049cebec..99071b65 100644 --- a/tck-executor/ts.serverSideFilters.jte +++ b/tck-executor/ts.serverSideFilters.jte @@ -72,19 +72,14 @@ ts.run.classpath=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/sigtest.ja tools.jar=${jdk.home}/lib/tools.jar ############################################################################# -# @jimage.dir: This property specifies the directory where Java 11+ -# modules will be expanded by the jimage tool for use -# in sigTestClasspath # @sigTestClasspath: This property must be set when running signature # tests. This property should be set to a list of # jar files and/or directories which contain your -# Jakarta EE and Java SE classes. Paths must be +# Java EE and Java SE classes. Paths must be # separated by the appropriate path separator -# (';' windows, ':' Unix). +# (';' windows, ':' Unixes). ############################################################################# -jimage.dir=${ts.home}/tmp/jdk-bundles - -sigTestClasspath=${jms.classes}${pathsep}${jimage.dir}/java.base${pathsep}${jimage.dir}/java.rmi${pathsep}${jimage.dir}/java.sql${pathsep}${jimage.dir}/java.naming +sigTestClasspath=${jms.classes}${pathsep}${JAVA_HOME}/lib/rt.jar ############################################################################ # These properties are used by the harness. "harness.log.port"