QPID-3858: Updated branch - merged from trunk r.1368650

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368910 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 34 insertions, 16 deletions

diff --git a/java/jca/build.xml b/java/jca/build.xml
index 3430232003..934514aa52 100644
--- a/java/jca/build.xml
+++ b/java/jca/build.xml
@@ -18,18 +18,20 @@
  - under the License.
  -
  -->
-<project name="Qpid JCA RA" default="build">
+<project name="Qpid JCA" default="build">
 
   <property name="module.depends" value="common client"/>
-  <property name="module.name" value="ra"/>
+  <property name="module.name" value="jca"/>
 
   <import file="../module.xml"/>
 
-  <property name="module.rar" value="${build.lib}/${project.name}-${module.name}-${project.version}.rar"/>
-  <property name="module.resources" value="src/main/resources"/>
+  <property name="module.rar" value="${build.lib}/${project.name}-ra-${project.version}.rar"/>
 
+  <property name="module.resources" value="src/main/resources"/>
 
   <target name="rar" depends="jar">
+      <!--Note we need to do this as we need to keep the ra in the name of the artificats but we can't override the module.jar property which is based on the directory name-->
+    <move file="${build.lib}/${project.name}-${module.name}-${project.version}.jar" tofile="${build.lib}/${project.name}-ra-${project.version}.jar"/>
     <jar destfile="${module.rar}">
       <fileset dir="${module.resources}">
         <include name="**/*.xml"/>
@@ -66,4 +68,5 @@
   <target name="examples" depends="example-properties-file, example-jars"/>
 
   <target name="build" depends="rar, examples"/>
+
 </project>
diff --git a/java/jca/example/README-EXAMPLE.txt b/java/jca/example/README-EXAMPLE.txt
index 3a2ee0c38e..fd0af585ef 100644
--- a/java/jca/example/README-EXAMPLE.txt
+++ b/java/jca/example/README-EXAMPLE.txt
@@ -232,4 +232,9 @@ While this documentation highlights the major components and steps needed to tak
 the possiblities for modifcation are numerous. You are encouraged to experiment with the example as you work
 to develop your own messaging applications.
 
+***Note***
+Due to the way Ant handle XML escape characters in the Copy task, if you are attempting to deploy the
+examples to a clustered broker configuration, you will need to modify the resultant XML configuration
+file to remove the '&' character and replace it with the &amp; character. This file varies by app
+server. Please see the app server specific documentation for your platform for further details.
 
diff --git a/java/jca/example/build-jboss7-properties.xml b/java/jca/example/build-jboss7-properties.xml
index 68ecd8a4f4..157802cc73 100644
--- a/java/jca/example/build-jboss7-properties.xml
+++ b/java/jca/example/build-jboss7-properties.xml
@@ -53,19 +53,19 @@
 
     <path id="compile.classpath">
         <fileset dir="${jboss.modules}/javax/jms/api/main">
-            <include name="jboss-jms-api_1.1_spec-1.0.1.Final.jar"/>
+            <include name="jboss-jms-api_1.1_spec-*.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/ejb/api/main">
-            <include name="jboss-ejb-api_3.1_spec-1.0.2.Final.jar"/>
+            <include name="jboss-ejb-api_3.1_spec-*.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/servlet/api/main">
-            <include name="jboss-servlet-api_3.0_spec-1.0.1.Final.jar"/>
+            <include name="jboss-servlet-api_3.0_spec-*.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/javax/transaction/api/main">
-            <include name="jboss-transaction-api_1.1_spec-1.0.1.Final.jar"/>
+            <include name="jboss-transaction-api_1.1_spec-*.Final.jar"/>
         </fileset>
         <fileset dir="${jboss.modules}/org/slf4j/main">
-            <include name="slf4j-api-1.6.1.jar"/>
+            <include name="slf4j-api-*.jar"/>
         </fileset>
     </path>
 
@@ -121,13 +121,10 @@
     <target name="deploy-config" depends="generate" description="Deploys the standalone file to the JBoss environment.">
         <copy todir="${jboss.config.dir}" overwrite="true">
             <fileset dir="${gen.dir}">
-                <include name="${jboss.server.config}.xml"/>
+                <include name="qpid-${jboss.server.config}.xml"/>
             </fileset>
         </copy>
     </target>
 
-    <target name="undeploy-ds" description="Undeploys the ds.xml file from the JBoss environment.">
-        <delete file="${jboss.deploy}/qpid-jca-ds.xml"/>
-    </target>
 
 </project>
diff --git a/java/jca/example/conf/qpid-standalone.xml b/java/jca/example/conf/qpid-standalone.xml
index 8d6137aea7..2e22bd3f99 100644
--- a/java/jca/example/conf/qpid-standalone.xml
+++ b/java/jca/example/conf/qpid-standalone.xml
@@ -1,3 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
 <!--
  -
  - Licensed to the Apache Software Foundation (ASF) under one
@@ -18,7 +19,6 @@
  - under the License.
  -
 -->
-<?xml version='1.0' encoding='UTF-8'?>
 
 <server xmlns="urn:jboss:domain:1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance">
 
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
index 22b39792b1..37ae7f5514 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
+++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
@@ -21,10 +21,13 @@
 
 package org.apache.qpid.ra;
 
+import java.util.List;
+
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
+import org.apache.qpid.client.AMQXAResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * QpidRAXAResource.
  *
  */
-public class QpidRAXAResource implements XAResource
+public class QpidRAXAResource implements AMQXAResource
 {
    /** The logger */
    private static final Logger _log = LoggerFactory.getLogger(QpidRAXAResource.class);
@@ -192,7 +195,7 @@ public class QpidRAXAResource implements XAResource
       {
          _log.trace("isSameRM(" + xaRes + ")");
       }
-
+      
       return _xaResource.isSameRM(xaRes);
    }
 
@@ -242,4 +245,14 @@ public class QpidRAXAResource implements XAResource
 
       return _xaResource.setTransactionTimeout(seconds);
    }
+   
+   public String getBrokerUUID()
+   {
+       return ((AMQXAResource)_xaResource).getBrokerUUID();
+   }
+   
+   public List<XAResource> getSiblings()
+   {
+       return ((AMQXAResource)_xaResource).getSiblings();
+   }
 }