Switch to the Jakarta JMS API

Author: veithen

modules/metadata/src/org/apache/axis2/jaxws/description/xml/handler/MessageDestinationRefType.java

@@ -56,7 +56,7 @@
  * Examples:
  * <p/>
  * <message-destination-ref> <message-destination-ref-name>jms/StockQueue
- * </message-destination-ref-name> <message-destination-type>javax.jms.Queue
+ * </message-destination-ref-name> <message-destination-type>jakarta.jms.Queue
  * </message-destination-type> <message-destination-usage>Consumes </message-destination-usage>
  * <message-destination-link>CorporateStocks </message-destination-link> </message-destination-ref>
  * <p/>

modules/metadata/src/org/apache/axis2/jaxws/description/xml/handler/MessageDestinationTypeType.java

@@ -38,7 +38,7 @@
  * <p/>
  * Example:
  * <p/>
- * <message-destination-type>javax.jms.Queue </message-destination-type>
+ * <message-destination-type>jakarta.jms.Queue </message-destination-type>
  * <p/>
  * <p/>
  * <p/>

modules/metadata/src/org/apache/axis2/jaxws/description/xml/handler/ResourceEnvRefType.java

@@ -56,7 +56,7 @@
  * Example:
  * <p/>
  * <resource-env-ref> <resource-env-ref-name>jms/StockQueue </resource-env-ref-name>
- * <resource-env-ref-type>javax.jms.Queue </resource-env-ref-type> </resource-env-ref>
+ * <resource-env-ref-type>jakarta.jms.Queue </resource-env-ref-type> </resource-env-ref>
  * <p/>
  * <p/>
  * <p/>

modules/transport/base/src/main/java/org/apache/axis2/format/TextMessageBuilder.java

@@ -37,7 +37,7 @@
  * except if the content of the message is available as a string anyway.
  * <p>
  * This interface is currently used by the JMS transport to process
- * {@link javax.jms.TextMessage} instances.
+ * {@link jakarta.jms.TextMessage} instances.
  */
 public interface TextMessageBuilder extends Builder {
     public OMElement processDocument(Reader reader, String contentType,

modules/transport/jms/pom.xml

@@ -43,10 +43,6 @@
         <tag>HEAD</tag>
     </scm>
 
-    <properties>
-        <jms-1.1-spec.version>1.1.1</jms-1.1-spec.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.axis2</groupId>
@@ -74,9 +70,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jms_1.1_spec</artifactId>
-            <version>${jms-1.1-spec.version}</version>
+            <groupId>jakarta.jms</groupId>
+            <artifactId>jakarta.jms-api</artifactId>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConnectionFactory.java

@@ -21,12 +21,12 @@
 import org.apache.axis2.description.ParameterIncludeImpl;
 import org.apache.axis2.AxisFault;
 
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
+import jakarta.jms.Connection;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.Session;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSConstants.java

@@ -220,8 +220,8 @@ public class JMSConstants {
     public static final String JMS_MESSAGE_ID = "JMS_MESSAGE_ID";
     /**
      * A MessageContext property or client Option indicating the JMS delivery mode as an Integer or String
-     * Value 1 - javax.jms.DeliveryMode.NON_PERSISTENT
-     * Value 2 - javax.jms.DeliveryMode.PERSISTENT
+     * Value 1 - jakarta.jms.DeliveryMode.NON_PERSISTENT
+     * Value 2 - jakarta.jms.DeliveryMode.PERSISTENT
      */
     public static final String JMS_DELIVERY_MODE = "JMS_DELIVERY_MODE";
     /**
@@ -251,7 +251,7 @@ public class JMSConstants {
      */
     public static final String JMS_TIMESTAMP = "JMS_TIMESTAMP";
     /**
-     * A MessageContext property indicating the JMS type String returned by {@link javax.jms.Message.getJMSType()}
+     * A MessageContext property indicating the JMS type String returned by {@link jakarta.jms.Message.getJMSType()}
      */
     public static final String JMS_TYPE = "JMS_TYPE";
     /**

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSEndpoint.java

@@ -37,8 +37,8 @@
 import java.util.Set;
 import java.util.HashSet;
 
-import javax.jms.BytesMessage;
-import javax.jms.TextMessage;
+import jakarta.jms.BytesMessage;
+import jakarta.jms.TextMessage;
 import javax.naming.Context;
 
 /**

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageReceiver.java

@@ -24,11 +24,11 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.TextMessage;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.TextMessage;
 import javax.transaction.UserTransaction;
 
 /**

modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSMessageSender.java

@@ -24,15 +24,15 @@
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.transport.base.BaseConstants;
 
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.QueueSender;
-import javax.jms.Session;
-import javax.jms.TopicPublisher;
+import jakarta.jms.Connection;
+import jakarta.jms.DeliveryMode;
+import jakarta.jms.Destination;
+import jakarta.jms.JMSException;
+import jakarta.jms.Message;
+import jakarta.jms.MessageProducer;
+import jakarta.jms.QueueSender;
+import jakarta.jms.Session;
+import jakarta.jms.TopicPublisher;
 import javax.transaction.UserTransaction;
 
 /**