From edb6274b32af55b003490d429797c9d33a601a5b Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Thu, 8 Mar 2012 21:41:45 +0000 Subject: QPID-3751 Committing patch from Weston Price. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1298597 13f79535-47bb-0310-9956-ffa450edef68 --- java/build.deps | 9 ++++-- java/build.xml | 16 +++++----- java/jca/.gitignore | 1 - java/jca/example/.gitignore | 1 - .../apache/qpid/ra/QpidResourceAdapterTest.java | 34 ++++++++++++++++++++++ java/systests/build.xml | 6 ++-- 6 files changed, 52 insertions(+), 15 deletions(-) delete mode 100644 java/jca/.gitignore create mode 100644 java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java (limited to 'java') diff --git a/java/build.deps b/java/build.deps index baf263e6a7..fe0ca6362b 100644 --- a/java/build.deps +++ b/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/java/build.xml b/java/build.xml index 54043b3d75..36e34f4071 100644 --- a/java/build.xml +++ b/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 @@ + ${modules.management} ${modules.jca} ${modules.tests} ${modules.plugin} ${modules.opt}"/> @@ -94,7 +94,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -245,14 +245,14 @@ - + - + @@ -276,7 +276,7 @@ diff --git a/java/jca/.gitignore b/java/jca/.gitignore deleted file mode 100644 index 1377554ebe..0000000000 --- a/java/jca/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/java/jca/example/.gitignore b/java/jca/example/.gitignore index 54c810d4a0..71337b619c 100644 --- a/java/jca/example/.gitignore +++ b/java/jca/example/.gitignore @@ -1,4 +1,3 @@ build/* lib/* -*.swp build-properties.xml diff --git a/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java b/java/jca/src/test/java/org/apache/qpid/ra/QpidResourceAdapterTest.java new file mode 100644 index 0000000000..0db7c710d9 --- /dev/null +++ b/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/java/systests/build.xml b/java/systests/build.xml index fb2bae1d47..fd7203dd40 100644 --- a/java/systests/build.xml +++ b/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 - + -- cgit v1.2.1