From b7e7a2c33e35e2fd809c45b09730ea8b5ee53243 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 4 Jan 2013 11:07:12 +0000 Subject: QPID-4527: update the JCA module to use the standard build target implementation, rather than replacing it. - Overrides the output destinations (to give the filenames 'ra' instead of 'jca' as it was doing) and uses the postbuild target to additionally create the rar and examples. - Moves the META-INF resources for the rar file to their own directory, removing need to specifically prevent their inclusion in the jar file. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1428787 13f79535-47bb-0310-9956-ffa450edef68 --- java/jca/build.xml | 37 ++-- .../rar/src/main/resources/META-INF/jboss-ra.xml | 33 +++ java/jca/rar/src/main/resources/META-INF/ra.xml | 230 +++++++++++++++++++++ java/jca/src/main/resources/META-INF/jboss-ra.xml | 33 --- java/jca/src/main/resources/META-INF/ra.xml | 230 --------------------- 5 files changed, 279 insertions(+), 284 deletions(-) create mode 100644 java/jca/rar/src/main/resources/META-INF/jboss-ra.xml create mode 100755 java/jca/rar/src/main/resources/META-INF/ra.xml 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') diff --git a/java/jca/build.xml b/java/jca/build.xml index 768ff54bff..42a19ff83a 100644 --- a/java/jca/build.xml +++ b/java/jca/build.xml @@ -25,26 +25,23 @@ - - - - - + + - + + + + - - + - - - - - - + + + - + @@ -78,11 +75,9 @@ - + - - - - - + + diff --git a/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml b/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml new file mode 100644 index 0000000000..f459b1efc1 --- /dev/null +++ b/java/jca/rar/src/main/resources/META-INF/jboss-ra.xml @@ -0,0 +1,33 @@ + + + + + TransactionManagerLocatorClass + java.lang.String + org.apache.qpid.ra.tm.JBossTransactionManagerLocator + + + TransactionManagerLocatorMethod + java.lang.String + getTm + + diff --git a/java/jca/rar/src/main/resources/META-INF/ra.xml b/java/jca/rar/src/main/resources/META-INF/ra.xml new file mode 100755 index 0000000000..a9374f52d7 --- /dev/null +++ b/java/jca/rar/src/main/resources/META-INF/ra.xml @@ -0,0 +1,230 @@ + + + + + + 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 + + + + 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