From 9c73ef7a5ac10acd6a50d5d52bd721fc2faa5919 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 28 Feb 2013 16:14:30 +0000 Subject: Update from trunk r1375509 through r1450773 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1451244 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/ra/admin/QpidConnectionFactoryProxy.java | 73 ++++++- java/jca/src/main/resources/META-INF/jboss-ra.xml | 33 --- java/jca/src/main/resources/META-INF/ra.xml | 230 --------------------- 3 files changed, 63 insertions(+), 273 deletions(-) delete mode 100644 java/jca/src/main/resources/META-INF/jboss-ra.xml delete mode 100755 java/jca/src/main/resources/META-INF/ra.xml (limited to 'java/jca/src') diff --git a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java b/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java index a948948d6a..d7ca29e04a 100644 --- a/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java +++ b/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java @@ -27,13 +27,17 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.Serializable; -import javax.jms.ConnectionFactory; import javax.jms.Connection; +import javax.jms.ConnectionFactory; import javax.jms.JMSException; import javax.naming.NamingException; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; import javax.naming.Reference; import javax.naming.Referenceable; import javax.naming.spi.ObjectFactory; +import javax.jms.TopicConnection; +import javax.jms.TopicConnectionFactory; import org.apache.qpid.client.AMQConnectionFactory; @@ -44,7 +48,7 @@ import org.slf4j.LoggerFactory; * * */ -public class QpidConnectionFactoryProxy implements Externalizable, Referenceable, ConnectionFactory, Serializable +public class QpidConnectionFactoryProxy implements QueueConnectionFactory, TopicConnectionFactory, Externalizable, Referenceable, Serializable { private static final Logger _log = LoggerFactory.getLogger(QpidDestinationProxy.class); @@ -100,13 +104,6 @@ public class QpidConnectionFactoryProxy implements Externalizable, Referenceable try { _delegate = new AMQConnectionFactory(getConnectionURL()); - /* - QpidResourceAdapter ra = new QpidResourceAdapter(); - QpidRAManagedConnectionFactory mcf = new QpidRAManagedConnectionFactory(); - mcf.setResourceAdapter(ra); - mcf.setConnectionURL(getConnectionURL()); - delegate = new QpidRAConnectionFactoryImpl(mcf, null); - */ return ((Referenceable) _delegate).getReference(); } catch(Exception e) @@ -162,7 +159,63 @@ public class QpidConnectionFactoryProxy implements Externalizable, Referenceable */ public Connection createConnection(final String userName, final String password) throws JMSException { - return _delegate.createConnection(userName, password); + try + { + if(_delegate == null) + { + getReference(); + } + + return _delegate.createConnection(userName, password); + } + catch(Exception e) + { + throw new JMSException(e.getMessage()); + } + } + + /** + * Create a queue connection + * @return The queue connection + * @exception JMSException Thrown if the operation fails + */ + public QueueConnection createQueueConnection() throws JMSException + { + return (QueueConnection)createConnection(); + } + + /** + * Create a queue connection + * @param userName The user name + * @param password The password + * @return The connection + * @exception JMSException Thrown if the operation fails + */ + public QueueConnection createQueueConnection(final String userName, final String password) throws JMSException + { + return (QueueConnection)createConnection(userName, password); + } + + /** + * Create a topic connection + * @return The topic connection + * @exception JMSException Thrown if the operation fails + */ + public TopicConnection createTopicConnection() throws JMSException + { + return (TopicConnection)createConnection(); + } + + /** + * Create a topic connection + * @param userName The user name + * @param password The password + * @return The topic connection + * @exception JMSException Thrown if the operation fails + */ + public TopicConnection createTopicConnection(final String userName, final String password) throws JMSException + { + return (TopicConnection)createConnection(userName, password); } } diff --git a/java/jca/src/main/resources/META-INF/jboss-ra.xml b/java/jca/src/main/resources/META-INF/jboss-ra.xml deleted file mode 100644 index f459b1efc1..0000000000 --- a/java/jca/src/main/resources/META-INF/jboss-ra.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - TransactionManagerLocatorClass - java.lang.String - org.apache.qpid.ra.tm.JBossTransactionManagerLocator - - - TransactionManagerLocatorMethod - java.lang.String - getTm - - diff --git a/java/jca/src/main/resources/META-INF/ra.xml b/java/jca/src/main/resources/META-INF/ra.xml deleted file mode 100755 index a9374f52d7..0000000000 --- a/java/jca/src/main/resources/META-INF/ra.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - QPID Resource Adapter - QPID Resource Adapter - - Apache Software Foundation - JMS 1.1 Server - 1.0 - - - - 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. - - true - - - - org.apache.qpid.ra.QpidResourceAdapter - - Client ID for the connection - ClientId - java.lang.String - client_id - - - - Number of setup attempts before failing - SetupAttempts - java.lang.Integer - 5 - - - - Interval between setup attempts in milliseconds - SetupInterval - java.lang.Long - 5000 - - - - Use local transactions rather than XA - UseLocalTx - java.lang.Boolean - false - - - - Broker host - Host - java.lang.String - localhost - - - - Broker port - Port - java.lang.Integer - 5672 - - - - Virtual Path for Connection Factory - Path - java.lang.String - test - - - - Connection URL - ConnectionURL - java.lang.String - amqp://anonymous:passwd@client/test?brokerlist='tcp://localhost?sasl_mechs='PLAIN'' - - - - Use a JMS Connection per MessageHandler - UseConnectionPerHandler - java.lang.Boolean - true - - - - - org.apache.qpid.ra.QpidRAManagedConnectionFactory - - - Default session type - SessionDefaultType - java.lang.String - javax.jms.Queue - - - - Specify lock timeout in seconds - UseTryLock - java.lang.Integer - 0 - - - - Use local transactions rather than XA - UseLocalTx - java.lang.Boolean - false - - - - Client ID for the connection - ClientId - java.lang.String - client_id - - - - Connection URL - ConnectionURL - java.lang.String - - - - - Broker host - Host - java.lang.String - localhost - - - - Broker port - Port - java.lang.Integer - 5672 - - - - Virtual Path for Connection Factory - Path - java.lang.String - test - - - org.apache.qpid.ra.QpidRAConnectionFactory - org.apache.qpid.ra.QpidRAConnectionFactoryImpl - javax.jms.Session - org.apache.qpid.ra.QpidRASessionImpl - - XATransaction - - BasicPassword - javax.resource.spi.security.PasswordCredential - - false - - - - - javax.jms.MessageListener - - org.apache.qpid.ra.inflow.QpidActivationSpec - - destination - - - - - - - org.apache.qpid.ra.admin.QpidQueue - org.apache.qpid.ra.admin.QpidQueueImpl - - DestinationAddress - java.lang.String - - - - org.apache.qpid.ra.admin.QpidTopic - org.apache.qpid.ra.admin.QpidTopicImpl - - DestinationAddress - java.lang.String - - - - javax.jms.ConnectionFactory - org.apache.qpid.ra.admin.QpidConnectionFactoryProxy - - ConnectionURL - java.lang.String - - - - -- cgit v1.2.1