diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index 1e623dfe11..ae87b3e846 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -100,7 +100,7 @@ org.apache.activemq.protobuf:activemq-protobuf org.fusesource.hawtbuf:hawtbuf org.jasypt:jasypt - jakarta.jms:jakarta.jms-api + org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jta_1.1_spec org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec org.apache.geronimo.specs:geronimo-annotation_1.0_spec @@ -314,9 +314,9 @@ true - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1.1 sources true diff --git a/activemq-broker/src/test/java/org/apache/activemq/ActiveMQJms2Test.java b/activemq-broker/src/test/java/org/apache/activemq/ActiveMQJms2Test.java deleted file mode 100644 index 51e2614677..0000000000 --- a/activemq-broker/src/test/java/org/apache/activemq/ActiveMQJms2Test.java +++ /dev/null @@ -1,169 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.activemq; - -import javax.jms.Connection; -import javax.jms.JMSException; -import javax.jms.MessageProducer; -import javax.jms.Session; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -public class ActiveMQJms2Test { - - protected static ActiveMQConnectionFactory activemqConnectionFactory = null; - - protected Connection connection = null; - protected Session session = null; - protected MessageProducer messageProducer = null; - - @BeforeClass - public static void setUpClass() { - activemqConnectionFactory = new ActiveMQConnectionFactory("vm://localhost?marshal=false&broker.persistent=false"); - } - - @AfterClass - public static void tearDownClass() { - activemqConnectionFactory = null; - } - - @Before - public void setUp() throws JMSException { - connection = activemqConnectionFactory.createConnection(); - connection.start(); - - session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - - messageProducer = session.createProducer(session.createQueue("AMQ.JMS2.TEST")); - } - - @After - public void tearDown() { - if(messageProducer != null) { - try { messageProducer.close(); } catch (Exception e) { } finally { messageProducer = null; } - } - - if(session != null) { - try { session.close(); } catch (Exception e) { } finally { session = null; } - } - - if(connection != null) { - try { connection.close(); } catch (Exception e) { } finally { connection = null; } - } - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionFactoryCreateContext() { - activemqConnectionFactory.createContext(); - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionFactoryCreateContextSession() { - activemqConnectionFactory.createContext(Session.AUTO_ACKNOWLEDGE); - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionFactoryCreateContextUserPass() { - activemqConnectionFactory.createContext("admin", "admin"); - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionFactoryCreateContextUserPassSession() { - activemqConnectionFactory.createContext("admin", "admin", Session.AUTO_ACKNOWLEDGE); - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionSharedConnectionConsumer() throws JMSException { - connection.createSharedConnectionConsumer(null, null, null, null, 10); - } - - @Test(expected = UnsupportedOperationException.class) - public void testConnectionSharedDurableConnectionConsumer() throws JMSException { - connection.createSharedDurableConnectionConsumer(null, null, null, null, 10); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionAckMode() throws JMSException { - connection.createSession(Session.AUTO_ACKNOWLEDGE); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionDurableConsumer() throws JMSException { - session.createDurableConsumer(null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionDurableConsumerSelectorNoLocal() throws JMSException { - session.createDurableConsumer(null, null, null, true); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionSharedConsumer() throws JMSException { - session.createSharedConsumer(null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionSharedConsumerSelector() throws JMSException { - session.createSharedConsumer(null, null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionSharedDurableConsumer() throws JMSException { - session.createSharedDurableConsumer(null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testSessionSharedDurableConsumerSelector() throws JMSException { - session.createSharedDurableConsumer(null, null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerDeliveryDelayGet() throws JMSException { - messageProducer.getDeliveryDelay(); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerDeliveryDelaySet() throws JMSException { - messageProducer.setDeliveryDelay(1000l); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerSendMessageCompletionListener() throws JMSException { - messageProducer.send(session.createQueue("AMQ.TEST"), null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerSendMessageQoSParamsCompletionListener() throws JMSException { - messageProducer.send(null, 1, 4, 0l, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerSendDestinationMessageCompletionListener() throws JMSException { - messageProducer.send(session.createQueue("AMQ.TEST"), null, null); - } - - @Test(expected = UnsupportedOperationException.class) - public void testProducerSendDestinationMessageQosParamsCompletionListener() throws JMSException { - messageProducer.send(session.createQueue("AMQ.TEST"), null, 1, 4, 0l, null); - } - -} diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index aab0911b9c..a85ff513ea 100644 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -43,8 +43,8 @@ slf4j-api - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.fusesource.hawtbuf diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java index 58d419725d..751a10e35f 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnection.java @@ -306,44 +306,6 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon return stats; } - /** - * Creates a Session object. - * - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @since 2.0 - */ - @Override - public Session createSession() throws JMSException { - throw new UnsupportedOperationException("createSession() is unsupported"); - } - - /** - * Creates a Session object. - * - * @param acknowledgeMode indicates whether the consumer or the client will - * acknowledge any messages it receives; ignored if the - * session is transacted. Legal values are - * Session.AUTO_ACKNOWLEDGE, - * Session.CLIENT_ACKNOWLEDGE, and - * Session.DUPS_OK_ACKNOWLEDGE. - * @return a newly created session - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @see Session#AUTO_ACKNOWLEDGE - * @see Session#CLIENT_ACKNOWLEDGE - * @see Session#DUPS_OK_ACKNOWLEDGE - * @since 2.0 - */ - @Override - public Session createSession(int sessionMode) throws JMSException { - throw new UnsupportedOperationException("createSession(int sessionMode) is unsupported"); - } - /** * Creates a Session object. * @@ -866,32 +828,10 @@ public class ActiveMQConnection implements Connection, TopicConnection, QueueCon return new ActiveMQConnectionConsumer(this, sessionPool, info); } - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, - int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, - int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - // Properties // ------------------------------------------------------------------------- - - /** + + /** * Returns true if this connection has been started * * @return true if this Connection is started diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java index 461dbe1945..2a868ee7fc 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java @@ -27,7 +27,6 @@ import java.util.concurrent.RejectedExecutionHandler; import javax.jms.Connection; import javax.jms.ConnectionFactory; import javax.jms.ExceptionListener; -import javax.jms.JMSContext; import javax.jms.JMSException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; @@ -286,38 +285,6 @@ public class ActiveMQConnectionFactory extends JNDIBaseStorable implements Conne public TopicConnection createTopicConnection(String userName, String password) throws JMSException { return createActiveMQConnection(userName, password); } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext() { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password) { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password, int sessionMode) { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(int sessionMode) { - throw new UnsupportedOperationException("createContext() is not supported"); - } /** * @return the StatsImpl associated with this ConnectionFactory. diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java index 9fd24396e0..2fec295e42 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java @@ -20,7 +20,6 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; -import javax.jms.CompletionListener; import javax.jms.Destination; import javax.jms.IllegalStateException; import javax.jms.InvalidDestinationException; @@ -221,43 +220,7 @@ public class ActiveMQMessageProducer extends ActiveMQMessageProducerSupport impl */ @Override public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive) throws JMSException { - this.send(destination, message, deliveryMode, priority, timeToLive, (AsyncCallback)null); - } - - /** - * - * @param message the message to send - * @param CompletionListener to callback - * @throws JMSException if the JMS provider fails to send the message due to - * some internal error. - * @throws UnsupportedOperationException if an invalid destination is - * specified. - * @throws InvalidDestinationException if a client uses this method with an - * invalid destination. - * @see javax.jms.Session#createProducer - * @since 2.0 - */ - @Override - public void send(Message message, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, CompletionListener) is not supported"); - - } - - @Override - public void send(Message message, int deliveryMode, int priority, long timeToLive, - CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive, - CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); + this.send(destination, message, deliveryMode, priority, timeToLive, null); } public void send(Message message, AsyncCallback onComplete) throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java index b7dd6cf701..1f8ce41d6d 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQMessageProducerSupport.java @@ -42,31 +42,6 @@ public abstract class ActiveMQMessageProducerSupport implements MessageProducer, disableMessageTimestamp = session.connection.isDisableTimeStampsByDefault(); } - /** - * Gets the delivery delay associated with this MessageProducer. - * - * @return this producer's DeliveryDely/ - * @throws JMSException if the JMS provider fails to close the producer due to - * some internal error. - * @since 2.0 - */ - @Override - public void setDeliveryDelay(long deliveryDelay) throws JMSException { - throw new UnsupportedOperationException("setDeliveryDelay() is not supported"); - } - - /** - * Gets the delivery delay value for this MessageProducer. - * - * @return the delivery delay for this messageProducer - * @throws javax.jms.JMSException if the JMS provider fails to determine if deliver delay is - * disabled due to some internal error. - */ - @Override - public long getDeliveryDelay() throws JMSException { - throw new UnsupportedOperationException("getDeliveryDelay() is not supported"); - } - /** * Sets whether message IDs are disabled. *

diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java index 700317ad45..66170e5753 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQQueueSession.java @@ -104,37 +104,6 @@ public class ActiveMQQueueSession implements QueueSession { } return next.createConsumer(destination, messageSelector, noLocal); } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new IllegalStateException("Operation not supported by a QueueSession"); - } @Override public TopicSubscriber createDurableSubscriber(Topic topic, String name) throws JMSException { diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java index 2ba1fe193f..35bddf2852 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQSession.java @@ -1381,38 +1381,8 @@ public class ActiveMQSession implements Session, QueueSession, TopicSession, Sta } return new ActiveMQTopic(topicName); } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName) is not supported"); - } - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName, messageSelector) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name, messageSelector, noLocal) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name, messageSelector) is not supported"); - } - - /** + /** * Creates a durable subscriber to the specified topic. *

* If a client needs to receive all the messages published on a topic, diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java index a6a8cd0028..ea92a71a02 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQTopicSession.java @@ -137,38 +137,7 @@ public class ActiveMQTopicSession implements TopicSession { return next.createConsumer(destination, messageSelector, noLocal); } - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new IllegalStateException("Operation not supported by a TopicSession"); - } - - /** + /** * @param topic * @param name * @return diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java index 3a96b1efe3..c3836856a7 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXAConnectionFactory.java @@ -22,7 +22,6 @@ import java.util.Properties; import javax.jms.JMSException; import javax.jms.XAConnection; import javax.jms.XAConnectionFactory; -import javax.jms.XAJMSContext; import javax.jms.XAQueueConnection; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnection; @@ -80,16 +79,6 @@ public class ActiveMQXAConnectionFactory extends ActiveMQConnectionFactory imple public XATopicConnection createXATopicConnection(String userName, String password) throws JMSException { return (XATopicConnection) createActiveMQConnection(userName, password); } - - @Override - public XAJMSContext createXAContext() { - throw new UnsupportedOperationException("createXAContext() is not supported"); - } - - @Override - public XAJMSContext createXAContext(String userName, String password) { - throw new UnsupportedOperationException("createXAContext(userName, password) is not supported"); - } protected ActiveMQConnection createActiveMQConnection(Transport transport, JMSStatsImpl stats) throws Exception { ActiveMQXAConnection connection = new ActiveMQXAConnection(transport, getClientIdGenerator(), getConnectionIdGenerator(), stats); diff --git a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java index aa5fa6c8df..e6e5726aae 100644 --- a/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java +++ b/activemq-client/src/main/java/org/apache/activemq/ActiveMQXASslConnectionFactory.java @@ -22,7 +22,6 @@ import java.util.Properties; import javax.jms.JMSException; import javax.jms.XAConnection; import javax.jms.XAConnectionFactory; -import javax.jms.XAJMSContext; import javax.jms.XAQueueConnection; import javax.jms.XAQueueConnectionFactory; import javax.jms.XATopicConnection; @@ -74,16 +73,6 @@ public class ActiveMQXASslConnectionFactory extends ActiveMQSslConnectionFactory return (XATopicConnection) createActiveMQConnection(userName, password); } - @Override - public XAJMSContext createXAContext() { - throw new UnsupportedOperationException("createXAContext() is not supported"); - } - - @Override - public XAJMSContext createXAContext(String userName, String password) { - throw new UnsupportedOperationException("createXAContext(userName, password) is not supported"); - } - @Override protected ActiveMQConnection createActiveMQConnection(Transport transport, JMSStatsImpl stats) throws Exception { ActiveMQXAConnection connection = new ActiveMQXAConnection(transport, getClientIdGenerator(), getConnectionIdGenerator(), stats); diff --git a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java index 1dd28eebc9..f0dd802fc9 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/ActiveMQMessage.java @@ -784,25 +784,4 @@ public class ActiveMQMessage extends Message implements org.apache.activemq.Mess //which is already marshalled return true; } - - @Override - public long getJMSDeliveryTime() throws JMSException { - return deliveryTime; - } - - @Override - public void setJMSDeliveryTime(long deliveryTime) throws JMSException { - this.deliveryTime = deliveryTime; - } - - @Override - public T getBody(Class c) throws JMSException { - throw new UnsupportedOperationException("getBody(Class) is not supported"); - } - - @Override - public boolean isBodyAssignableTo(Class c) throws JMSException { - throw new UnsupportedOperationException("isBodyAssignableTo(Class) is not supported"); - } - } diff --git a/activemq-client/src/main/java/org/apache/activemq/command/Message.java b/activemq-client/src/main/java/org/apache/activemq/command/Message.java index e74e1f39a4..cd62e977ed 100644 --- a/activemq-client/src/main/java/org/apache/activemq/command/Message.java +++ b/activemq-client/src/main/java/org/apache/activemq/command/Message.java @@ -62,7 +62,6 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess protected ActiveMQDestination destination; protected TransactionId transactionId; - protected long deliveryTime; protected long expiration; protected long timestamp; protected long arrival; @@ -136,7 +135,6 @@ public abstract class Message extends BaseCommand implements MarshallAware, Mess copy.messageId = messageId != null ? messageId.copy() : null; copy.originalDestination = originalDestination; copy.originalTransactionId = originalTransactionId; - copy.deliveryTime = deliveryTime; copy.expiration = expiration; copy.timestamp = timestamp; copy.correlationId = correlationId; diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index b4bf1c269d..5d1a608d04 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -56,8 +56,8 @@ - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.commons diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml index f89c272637..3291b4a402 100644 --- a/activemq-jms-pool/pom.xml +++ b/activemq-jms-pool/pom.xml @@ -40,8 +40,8 @@ slf4j-api - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.components diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java index 13de1af8dd..038e13c67b 100644 --- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java +++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnection.java @@ -162,44 +162,6 @@ public class PooledConnection implements TopicConnection, QueueConnection, Poole return (TopicSession) createSession(transacted, ackMode); } - /** - * Creates a Session object. - * - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @since 2.0 - */ - @Override - public Session createSession() throws JMSException { - throw new UnsupportedOperationException("createSession() is unsupported"); - } - - /** - * Creates a Session object. - * - * @param acknowledgeMode indicates whether the consumer or the client will - * acknowledge any messages it receives; ignored if the - * session is transacted. Legal values are - * Session.AUTO_ACKNOWLEDGE, - * Session.CLIENT_ACKNOWLEDGE, and - * Session.DUPS_OK_ACKNOWLEDGE. - * @return a newly created session - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @see Session#AUTO_ACKNOWLEDGE - * @see Session#CLIENT_ACKNOWLEDGE - * @see Session#DUPS_OK_ACKNOWLEDGE - * @since 2.0 - */ - @Override - public Session createSession(int sessionMode) throws JMSException { - throw new UnsupportedOperationException("createSession(int sessionMode) is unsupported"); - } - @Override public Session createSession(boolean transacted, int ackMode) throws JMSException { PooledSession result = (PooledSession) pool.createSession(transacted, ackMode); @@ -213,28 +175,6 @@ public class PooledConnection implements TopicConnection, QueueConnection, Poole result.addSessionEventListener(this); return result; } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, - int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, - int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } // Implementation methods // ------------------------------------------------------------------------- diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnectionFactory.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnectionFactory.java index 264303791c..11fbbbb328 100644 --- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnectionFactory.java +++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledConnectionFactory.java @@ -23,7 +23,6 @@ import java.util.concurrent.atomic.AtomicReference; import javax.jms.Connection; import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; import javax.jms.JMSException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; @@ -272,38 +271,6 @@ public class PooledConnectionFactory implements ConnectionFactory, QueueConnecti return newPooledConnection(connection); } - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext() { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password) { - throw new UnsupportedOperationException("createContext(userName, password) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password, int sessionMode) { - throw new UnsupportedOperationException("createContext(userName, password, sessionMode) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(int sessionMode) { - throw new UnsupportedOperationException("createContext(sessionMode) is not supported"); - } - protected Connection newPooledConnection(ConnectionPool connection) { return new PooledConnection(connection); } diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java index 38d9b7f50e..175f74de95 100644 --- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java +++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledProducer.java @@ -16,7 +16,6 @@ */ package org.apache.activemq.jms.pool; -import javax.jms.CompletionListener; import javax.jms.Destination; import javax.jms.InvalidDestinationException; import javax.jms.JMSException; @@ -96,68 +95,6 @@ public class PooledProducer implements MessageProducer { messageProducer.send(destination, message, deliveryMode, priority, timeToLive); } } - - /** - * - * @param message the message to send - * @param CompletionListener to callback - * @throws JMSException if the JMS provider fails to send the message due to - * some internal error. - * @throws UnsupportedOperationException if an invalid destination is - * specified. - * @throws InvalidDestinationException if a client uses this method with an - * invalid destination. - * @see javax.jms.Session#createProducer - * @since 2.0 - */ - @Override - public void send(Message message, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, CompletionListener) is not supported"); - - } - - @Override - public void send(Message message, int deliveryMode, int priority, long timeToLive, - CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, CompletionListener completionListener) - throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive, - CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); - } - - /** - * Gets the delivery delay associated with this MessageProducer. - * - * @return this producer's DeliveryDely/ - * @throws JMSException if the JMS provider fails to close the producer due to - * some internal error. - * @since 2.0 - */ - @Override - public void setDeliveryDelay(long deliveryDelay) throws JMSException { - throw new UnsupportedOperationException("setDeliveryDelay() is not supported"); - } - - /** - * Gets the delivery delay value for this MessageProducer. - * - * @return the delivery delay for this messageProducer - * @throws javax.jms.JMSException if the JMS provider fails to determine if deliver delay is - * disabled due to some internal error. - */ - @Override - public long getDeliveryDelay() throws JMSException { - throw new UnsupportedOperationException("getDeliveryDelay() is not supported"); - } @Override public Destination getDestination() { diff --git a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledSession.java b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledSession.java index 8e436e6434..1e8fd23224 100644 --- a/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledSession.java +++ b/activemq-jms-pool/src/main/java/org/apache/activemq/jms/pool/PooledSession.java @@ -360,36 +360,6 @@ public class PooledSession implements Session, TopicSession, QueueSession, XASes public QueueReceiver createReceiver(Queue queue, String selector) throws JMSException { return addQueueReceiver(((QueueSession) getInternalSession()).createReceiver(queue, selector)); } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName) is not supported"); - } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName, messageSelector) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name, messageSelector, noLocal) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name, messageSelector) is not supported"); - } // Producer related methods // ------------------------------------------------------------------------- diff --git a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java index f531ff4ee3..a4ea122f24 100644 --- a/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java +++ b/activemq-jms-pool/src/test/java/org/apache/activemq/jms/pool/XAConnectionPoolTest.java @@ -39,7 +39,6 @@ import javax.jms.TopicPublisher; import javax.jms.TopicSession; import javax.jms.XAConnection; import javax.jms.XAConnectionFactory; -import javax.jms.XAJMSContext; import javax.naming.spi.ObjectFactory; import javax.transaction.HeuristicMixedException; import javax.transaction.HeuristicRollbackException; @@ -420,16 +419,6 @@ public class XAConnectionPoolTest extends JmsPoolTestSupport { this.connectionFactory = connectionFactory; } - @Override - public XAJMSContext createXAContext() { - throw new UnsupportedOperationException("createXAContext() is not supported"); - } - - @Override - public XAJMSContext createXAContext(String userName, String password) { - throw new UnsupportedOperationException("createXAContext(userName, password) is not supported"); - } - @Override public XAConnection createXAConnection() throws JMSException { return connectionFactory.createXAConnection(); diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 82af8d0ec5..a596858c1e 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -34,12 +34,6 @@ org.apache.activemq activemq-client test - - - jakarta.jms - jakarta.jms-api - - org.apache.activemq diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index c4d087a9bd..721469d331 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -38,11 +38,6 @@ - - org.apache.geronimo.specs - geronimo-jms_2.0_spec - 1.0-alpha-2 - org.ops4j.pax.logging pax-logging-api @@ -93,32 +88,14 @@ org.apache.activemq activemq-log4j-appender - - - jakarta.jms - jakarta.jms-api - - org.apache.activemq activemq-console - - - jakarta.jms - jakarta.jms-api - - org.apache.activemq activemq-pool - - - jakarta.jms - jakarta.jms-api - - diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index 821e055c84..9507cc0720 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -464,9 +464,9 @@ true - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1.1 sources true diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java index 9ffd85b40d..4e30a374cd 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQConnectionFactory.java @@ -20,7 +20,6 @@ import java.io.Serializable; import javax.jms.Connection; import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; import javax.jms.JMSException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; @@ -78,38 +77,6 @@ public class ActiveMQConnectionFactory implements ConnectionFactory, QueueConnec i.setPassword(password); return createConnection(i); } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext() { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password) { - throw new UnsupportedOperationException("createContext(userName, password) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password, int sessionMode) { - throw new UnsupportedOperationException("createContext(userName, password, sessionMode) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(int sessionMode) { - throw new UnsupportedOperationException("createContext(sessionMode) is not supported"); - } /** * @param connectionRequestInfo diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java index de4b24f93c..800e73a630 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxy.java @@ -108,62 +108,4 @@ public class InboundConnectionProxy implements Connection, QueueConnection, Topi protected JMSException createNotSupported(String text) { return new JMSException("Operation: " + text + " is not supported for this proxy JCA ResourceAdapter provider"); } - - /** - * Creates a Session object. - * - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @since 2.0 - */ - @Override - public Session createSession() throws JMSException { - throw new UnsupportedOperationException("createSession() is unsupported"); - } - - /** - * Creates a Session object. - * - * @param acknowledgeMode indicates whether the consumer or the client will - * acknowledge any messages it receives; ignored if the - * session is transacted. Legal values are - * Session.AUTO_ACKNOWLEDGE, - * Session.CLIENT_ACKNOWLEDGE, and - * Session.DUPS_OK_ACKNOWLEDGE. - * @return a newly created session - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @see Session#AUTO_ACKNOWLEDGE - * @see Session#CLIENT_ACKNOWLEDGE - * @see Session#DUPS_OK_ACKNOWLEDGE - * @since 2.0 - */ - @Override - public Session createSession(int sessionMode) throws JMSException { - throw new UnsupportedOperationException("createSession(int sessionMode) is unsupported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } } diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java index 9472bce259..57119ae900 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundConnectionProxyFactory.java @@ -18,7 +18,6 @@ package org.apache.activemq.ra; import javax.jms.Connection; import javax.jms.ConnectionFactory; -import javax.jms.JMSContext; import javax.jms.JMSException; import javax.jms.QueueConnection; import javax.jms.QueueConnectionFactory; @@ -57,36 +56,4 @@ public class InboundConnectionProxyFactory implements ConnectionFactory, QueueCo public TopicConnection createTopicConnection(String userName, String password) throws JMSException { return createTopicConnection(); } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext() { - throw new UnsupportedOperationException("createContext() is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password) { - throw new UnsupportedOperationException("createContext(userName, password) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(String userName, String password, int sessionMode) { - throw new UnsupportedOperationException("createContext(userName, password, sessionMode) is not supported"); - } - - /** - * @return Returns the JMSContext. - */ - @Override - public JMSContext createContext(int sessionMode) { - throw new UnsupportedOperationException("createContext(sessionMode) is not supported"); - } } diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java index 7c42f82a3f..3ed5ef8e6e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundMessageProducerProxy.java @@ -16,9 +16,7 @@ */ package org.apache.activemq.ra; -import javax.jms.CompletionListener; import javax.jms.Destination; -import javax.jms.InvalidDestinationException; import javax.jms.JMSException; import javax.jms.Message; import javax.jms.MessageProducer; @@ -161,63 +159,4 @@ public class InboundMessageProducerProxy implements MessageProducer, QueueSender public void publish(Topic arg0, Message arg1, int arg2, int arg3, long arg4) throws JMSException { messageProducer.send(arg0, arg1, arg2, arg3, arg4); } - - /** - * - * @param message the message to send - * @param CompletionListener to callback - * @throws JMSException if the JMS provider fails to send the message due to - * some internal error. - * @throws UnsupportedOperationException if an invalid destination is - * specified. - * @throws InvalidDestinationException if a client uses this method with an - * invalid destination. - * @see javax.jms.Session#createProducer - * @since 2.0 - */ - @Override - public void send(Message message, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, CompletionListener) is not supported"); - - } - - @Override - public void send(Message message, int deliveryMode, int priority, long timeToLive, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, CompletionListener) is not supported"); - } - - @Override - public void send(Destination destination, Message message, int deliveryMode, int priority, long timeToLive, CompletionListener completionListener) throws JMSException { - throw new UnsupportedOperationException("send(Destination, Message, deliveryMode, priority, timetoLive, CompletionListener) is not supported"); - } - - /** - * Gets the delivery delay associated with this MessageProducer. - * - * @return this producer's DeliveryDely/ - * @throws JMSException if the JMS provider fails to close the producer due to - * some internal error. - * @since 2.0 - */ - @Override - public void setDeliveryDelay(long deliveryDelay) throws JMSException { - throw new UnsupportedOperationException("setDeliveryDelay() is not supported"); - } - - /** - * Gets the delivery delay value for this MessageProducer. - * - * @return the delivery delay for this messageProducer - * @throws javax.jms.JMSException if the JMS provider fails to determine if deliver delay is - * disabled due to some internal error. - */ - @Override - public long getDeliveryDelay() throws JMSException { - throw new UnsupportedOperationException("getDeliveryDelay() is not supported"); - } } diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java index 93ea988b66..ae9d84830e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/InboundSessionProxy.java @@ -237,36 +237,6 @@ public class InboundSessionProxy implements Session, QueueSession, TopicSession return getTopicSession().createPublisher(topic); } - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName) is not supported"); - } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName, messageSelector) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name, messageSelector, noLocal) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name, messageSelector) is not supported"); - } - public String toString() { try { return "InboundSessionProxy { " + getSession() + " }"; diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java index c3b3c883e8..d18260a0a2 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedConnectionProxy.java @@ -290,62 +290,4 @@ public class ManagedConnectionProxy implements Connection, QueueConnection, Topi } } - /** - * Creates a Session object. - * - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @since 2.0 - */ - @Override - public Session createSession() throws JMSException { - throw new UnsupportedOperationException("createSession() is unsupported"); - } - - /** - * Creates a Session object. - * - * @param acknowledgeMode indicates whether the consumer or the client will - * acknowledge any messages it receives; ignored if the - * session is transacted. Legal values are - * Session.AUTO_ACKNOWLEDGE, - * Session.CLIENT_ACKNOWLEDGE, and - * Session.DUPS_OK_ACKNOWLEDGE. - * @return a newly created session - * @throws JMSException if the Connection object fails to - * create a session due to some internal error or lack of - * support for the specific transaction and acknowledgement - * mode. - * @see Session#AUTO_ACKNOWLEDGE - * @see Session#CLIENT_ACKNOWLEDGE - * @see Session#DUPS_OK_ACKNOWLEDGE - * @since 2.0 - */ - @Override - public Session createSession(int sessionMode) throws JMSException { - throw new UnsupportedOperationException("createSession(int sessionMode) is unsupported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - - /** - * - * @see javax.jms.ConnectionConsumer - * @since 2.0 - */ - @Override - public ConnectionConsumer createSharedDurableConnectionConsumer(Topic topic, String subscriptionName, String messageSelector, ServerSessionPool sessionPool, int maxMessages) throws JMSException { - throw new UnsupportedOperationException("createSharedConnectionConsumer() is not supported"); - } - } diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java index 6d76a4780c..a71e48a41e 100644 --- a/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java +++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ManagedSessionProxy.java @@ -406,36 +406,6 @@ public class ManagedSessionProxy implements Session, QueueSession, TopicSession throw new RuntimeException("Operation not supported."); } - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName) is not supported"); - } - - @Override - public MessageConsumer createSharedConsumer(Topic topic, String sharedSubscriptionName, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedConsumer(Topic, sharedSubscriptionName, messageSelector) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createDurableConsumer(Topic topic, String name, String messageSelector, boolean noLocal) throws JMSException { - throw new UnsupportedOperationException("createDurableConsumer(Topic, name, messageSelector, noLocal) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name) is not supported"); - } - - @Override - public MessageConsumer createSharedDurableConsumer(Topic topic, String name, String messageSelector) throws JMSException { - throw new UnsupportedOperationException("createSharedDurableConsumer(Topic, name, messageSelector) is not supported"); - } - public String toString() { return "ManagedSessionProxy { " + session + " }"; } diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 1c387873d5..5342b475e4 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -38,8 +38,8 @@ activemq-spring - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs @@ -164,8 +164,8 @@ activemq-ra - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/activemq-tooling/activemq-maven-plugin/pom.xml b/activemq-tooling/activemq-maven-plugin/pom.xml index a17c6b665e..4cf6d308d2 100644 --- a/activemq-tooling/activemq-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-maven-plugin/pom.xml @@ -55,8 +55,8 @@ derbynet - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml index e52472b6d3..06296c9f03 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml @@ -56,8 +56,8 @@ derbynet - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml index ca7197ff39..398bf1581a 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml @@ -59,8 +59,8 @@ derbynet - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index fd2f2af3c0..11e175b773 100644 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -67,8 +67,8 @@ activemq-runtime-config - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.slf4j diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 0901d6f9bc..305c174ed4 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -186,8 +186,8 @@ - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index 4ee5a184b5..fbf58042d6 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -142,8 +142,8 @@ - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/assembly/pom.xml b/assembly/pom.xml index 941e6f5954..afd0834c77 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -244,8 +244,8 @@ log4j-api - jakarta.jms - jakarta.jms-api + org.apache.geronimo.specs + geronimo-jms_1.1_spec org.apache.geronimo.specs diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml index ffe1b8f1ff..be629a53b1 100644 --- a/assembly/src/main/descriptors/common-bin.xml +++ b/assembly/src/main/descriptors/common-bin.xml @@ -142,7 +142,7 @@ ${pom.groupId}:activemq-jaas org.apache.activemq.protobuf:activemq-protobuf org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec - jakarta.jms:jakarta.jms-api + org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jta_1.1_spec ${pom.groupId}:activemq-web org.fusesource.hawtbuf:hawtbuf diff --git a/assembly/src/release/examples/amqp/java/pom.xml b/assembly/src/release/examples/amqp/java/pom.xml index d257ab3e7a..955f71566f 100644 --- a/assembly/src/release/examples/amqp/java/pom.xml +++ b/assembly/src/release/examples/amqp/java/pom.xml @@ -29,9 +29,9 @@ - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 org.apache.qpid diff --git a/assembly/src/release/examples/openwire/advanced-scenarios/pom.xml b/assembly/src/release/examples/openwire/advanced-scenarios/pom.xml index a53d815b9b..5e9c8e2325 100644 --- a/assembly/src/release/examples/openwire/advanced-scenarios/pom.xml +++ b/assembly/src/release/examples/openwire/advanced-scenarios/pom.xml @@ -41,10 +41,11 @@ ActiveMQ OpenWire Java Examples + - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 org.apache.activemq diff --git a/assembly/src/release/examples/openwire/java/pom.xml b/assembly/src/release/examples/openwire/java/pom.xml index 58e84d89a9..a624592a16 100644 --- a/assembly/src/release/examples/openwire/java/pom.xml +++ b/assembly/src/release/examples/openwire/java/pom.xml @@ -28,9 +28,9 @@ - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 org.apache.activemq diff --git a/assembly/src/release/examples/stomp/java/pom.xml b/assembly/src/release/examples/stomp/java/pom.xml index a52ff14e0e..50b451189d 100644 --- a/assembly/src/release/examples/stomp/java/pom.xml +++ b/assembly/src/release/examples/stomp/java/pom.xml @@ -29,9 +29,9 @@ - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1 org.fusesource.stompjms diff --git a/pom.xml b/pom.xml index e06fb2ec76..85d9758be4 100644 --- a/pom.xml +++ b/pom.xml @@ -444,9 +444,9 @@ - jakarta.jms - jakarta.jms-api - 2.0.3 + org.apache.geronimo.specs + geronimo-jms_1.1_spec + 1.1.1