You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2012/03/08 22:41:45 UTC
svn commit: r1298597 - in /qpid/trunk: ./ qpid/java/ qpid/java/jca/
qpid/java/jca/example/ qpid/java/jca/src/test/ qpid/java/jca/src/test/java/
qpid/java/jca/src/test/java/org/ qpid/java/jca/src/test/java/org/apache/
qpid/java/jca/src/test/java/org/apa...
Author: rajith
Date: Thu Mar 8 21:41:45 2012
New Revision: 1298597
URL: http://svn.apache.org/viewvc?rev=1298597&view=rev
Log:
QPID-3751 Committing patch from Weston Price.
Added:
qpid/trunk/qpid/java/jca/src/test/
qpid/trunk/qpid/java/jca/src/test/java/
qpid/trunk/qpid/java/jca/src/test/java/org/
qpid/trunk/qpid/java/jca/src/test/java/org/apache/
qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/
qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/
qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
Removed:
qpid/trunk/qpid/java/jca/.gitignore
Modified:
qpid/trunk/.gitignore
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/jca/example/.gitignore
qpid/trunk/qpid/java/systests/build.xml
Modified: qpid/trunk/.gitignore
URL: http://svn.apache.org/viewvc/qpid/trunk/.gitignore?rev=1298597&r1=1298596&r2=1298597&view=diff
==============================================================================
--- qpid/trunk/.gitignore (original)
+++ qpid/trunk/.gitignore Thu Mar 8 21:41:45 2012
@@ -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
+
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1298597&r1=1298596&r2=1298597&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Thu Mar 8 21:41:45 2012
@@ -118,7 +118,7 @@ management-eclipse-plugin-macosx.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=${te
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
Modified: qpid/trunk/qpid/java/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1298597&r1=1298596&r2=1298597&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Thu Mar 8 21:41:45 2012
@@ -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">
Modified: qpid/trunk/qpid/java/jca/example/.gitignore
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/example/.gitignore?rev=1298597&r1=1298596&r2=1298597&view=diff
==============================================================================
--- qpid/trunk/qpid/java/jca/example/.gitignore (original)
+++ qpid/trunk/qpid/java/jca/example/.gitignore Thu Mar 8 21:41:45 2012
@@ -1,4 +1,3 @@
build/*
lib/*
-*.swp
build-properties.xml
Added: qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java?rev=1298597&view=auto
==============================================================================
--- qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java (added)
+++ qpid/trunk/qpid/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java Thu Mar 8 21:41:45 2012
@@ -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));
+ }
+
+}
Modified: qpid/trunk/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1298597&r1=1298596&r2=1298597&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Thu Mar 8 21:41:45 2012
@@ -7,9 +7,9 @@ nn - or more contributor license agreeme
- 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 agreeme
</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"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org