QPID-3751 Committing patch from Weston Price.

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

7 files changed, 58 insertions, 15 deletions

diff --git a/.gitignore b/.gitignore
index 4ae95e9a21..bf3a63166e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,9 @@ qpid/java/lib/cobertura
 qpid/java/lib/findbugs
 qpid/java/lib/ivy
 qpid/java/build.overrides
+qpid/java/felix-cache/*
+qpid/java/eclipse-projects
+qpid/java/derby.log
 # Intellij Project files
 *.iml
 *.ipr
@@ -79,3 +82,6 @@ qpid/java/build.overrides
 
 #Eclipse workspace
 workspace/
+
+*.swp
+
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index baf263e6a7..fe0ca6362b 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -118,7 +118,7 @@ management-eclipse-plugin-macosx.libs=${management-eclipse-plugin.core-libs} \
     ${ecl-swt-macosx-carbon} ${ecl-equinox-launcher-macosx-carbon} ${ecl-core-runtime-compat-registry}
 management-eclipse-plugin-solaris-gtk-sparc.libs=${management-eclipse-plugin.core-libs} \
     ${ecl-swt-solaris-gtk-sparc} ${ecl-equinox-launcher-solaris-gtk-sparc} ${ecl-core-runtime-compat-registry}
-    
+
 common.test.libs=${test.libs}
 broker.test.libs=${test.libs}
 client.test.libs=${test.libs}
@@ -133,7 +133,12 @@ management-eclipse-plugin.test.libs=${test.libs}
 management-common.test.libs=${test.libs}
 
 # JCA Resource adapter
-ra.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${slf4j-api} ${geronimo-kernel} ${geronimo-openejb}
+ra.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${test.libs} ${geronimo-kernel} ${geronimo-openejb}
+ra.test.libs=${test.libs}
+
+#note this is a hack because systests is looking for 'jca' versus 'ra' we need to do this twice
+jca.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${test.libs} ${geronimo-kernel} ${geronimo-openejb}
+jca.test.libs=${test.libs}
 
 # optional bdbstore module deps
 bdb-je=lib/bdbstore/je-5.0.34.jar
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 54043b3d75..36e34f4071 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -7,9 +7,9 @@
  - 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
@@ -34,7 +34,7 @@
   <property name="modules.opt"        value=""/>
   <property name="modules.jca"        value="jca"/>
   <property name="modules"            value="${modules.core} ${modules.examples}
-   ${modules.management} ${modules.tests} ${modules.plugin} ${modules.opt} ${modules.jca}"/>
+   ${modules.management} ${modules.jca} ${modules.tests} ${modules.plugin} ${modules.opt}"/>
 
   <property name="qpid.jar"           location="${build.lib}/qpid-all.jar"/>
   <basename property="qpid.jar.name"  file="${qpid.jar}"/>
@@ -94,7 +94,7 @@
     <fail if="failed" message="TEST SUITE FAILED"/>
 
   </target>
-  
+
   <target name="report-module" description="generate junitreport for modules">
     <iterate target="report-module"/>
   </target>
@@ -122,7 +122,7 @@
   <target name="bundle" description="create OSGi bundles">
     <iterate target="bundle"/>
   </target>
-  
+
   <target name="release-bin" description="build a binary release artifact" depends="build,bundle">
       <iterate  target="release-bin"/>
   </target>
@@ -245,14 +245,14 @@
   <target name="instrument" description="instrument for artifacts">
     <iterate target="instrument"/>
   </target>
-  
+
   <target name="cover-test" description="run tests and generate coverage information" depends="build">
     <iterate target="cover-test" modules="broker client common"/>
   </target>
 
   <target name="test-interop" depends="build,compile-tests"
       description="run JMS examples against the corresponding c++ and python examples">
-      <property name="qpid.src.home" location=".."/> 
+      <property name="qpid.src.home" location=".."/>
       <echo-prop name="qpid.src.home"/>
       <exec executable="/bin/sh" failonerror="true">
          <env key="QPID_SRC_HOME" value="${qpid.src.home}"/>
@@ -276,7 +276,7 @@
 
     <findbugs home="${findbugs.dir}"
               output="html"
-              outputFile="${build.findbugs}/report.html" 
+              outputFile="${build.findbugs}/report.html"
               stylesheet="fancy-hist.xsl"
               jvmargs="-Xmx512m"
               projectName="Qpid">
diff --git a/qpid/java/jca/.gitignore b/qpid/java/jca/.gitignore
deleted file mode 100644
index 1377554ebe..0000000000
--- a/qpid/java/jca/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.swp
diff --git a/qpid/java/jca/example/.gitignore b/qpid/java/jca/example/.gitignore
index 54c810d4a0..71337b619c 100644
--- a/qpid/java/jca/example/.gitignore
+++ b/qpid/java/jca/example/.gitignore
@@ -1,4 +1,3 @@
 build/*
 lib/*
-*.swp
 build-properties.xml
diff --git a/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
new file mode 100644
index 0000000000..0db7c710d9
--- /dev/null
+++ b/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
@@ -0,0 +1,34 @@
+/*
+ *
+ * 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.qpid.ra;
+
+
+import junit.framework.TestCase;
+
+public class QpidResourceAdapterTest extends TestCase
+{
+    public void testGetXAResources() throws Exception
+    {
+        QpidResourceAdapter ra = new QpidResourceAdapter();
+        assertNull(ra.getXAResources(null));
+    }
+
+}
diff --git a/qpid/java/systests/build.xml b/qpid/java/systests/build.xml
index fb2bae1d47..fd7203dd40 100644
--- a/qpid/java/systests/build.xml
+++ b/qpid/java/systests/build.xml
@@ -7,9 +7,9 @@ nn - or more contributor license agreements.  See the NOTICE 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
@@ -27,7 +27,7 @@ nn - or more contributor license agreements.  See the NOTICE file
         </and>
     </condition>
 
-    <property name="module.depends" value="client management/common broker broker/test common common/test junit-toolkit ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker broker/test common common/test junit-toolkit jca ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>