diff options
| author | Weston M. Price <wprice@apache.org> | 2012-05-04 17:38:55 +0000 |
|---|---|---|
| committer | Weston M. Price <wprice@apache.org> | 2012-05-04 17:38:55 +0000 |
| commit | 5c80b835bf53caf2e0b642788fd0865e040e0975 (patch) | |
| tree | 7c15e1f3a5b4fabb1294a9d1d30ae8d4ce11af5f | |
| parent | c14e1e0f7fc02e71e1c2ad651566e14c9a8f209b (diff) | |
| download | qpid-python-5c80b835bf53caf2e0b642788fd0865e040e0975.tar.gz | |
NO-JIRA: JCA Cleanup
*Renamed module.name in JCA project to be in line with directory
*Removed hack in build.deps to satisfy system tests and jca compile
time dependencies
*Added Apache Geronimo servlet jar for JCA examples
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1334080 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/build.deps | 9 | ||||
| -rw-r--r-- | qpid/java/jca/build.xml | 10 | ||||
| -rw-r--r-- | qpid/java/lib/geronimo-servlet_2.5_spec-1.2.jar | bin | 0 -> 70593 bytes |
3 files changed, 9 insertions, 10 deletions
diff --git a/qpid/java/build.deps b/qpid/java/build.deps index 76b1461fe2..168e38ccf9 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -33,6 +33,7 @@ geronimo-j2ee=lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar geronimo-jta=lib/geronimo-jta_1.1_spec-1.1.1.jar geronimo-kernel=lib/geronimo-kernel-2.2.1.jar geronimo-openejb=lib/geronimo-ejb_3.0_spec-1.0.1.jar +geronimo-servlet=lib/geronimo-servlet_2.5_spec-1.2.jar junit=lib/junit-3.8.1.jar mockito-all=lib/mockito-all-1.9.0.jar @@ -139,17 +140,13 @@ testkit.test.libs=${test.libs} systests.libs=${test.libs} perftests.test.libs=${test.libs} -broker-plugins.test.libs=${test.libs} +broker-plugins.test.libs=${test.libs} management-eclipse-plugin.test.libs=${test.libs} management-common.test.libs=${test.libs} # JCA Resource adapter -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.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${test.libs} ${geronimo-kernel} ${geronimo-openejb} ${geronimo-servlet} jca.test.libs=${test.libs} # optional bdbstore module deps diff --git a/qpid/java/jca/build.xml b/qpid/java/jca/build.xml index 3430232003..abb18e1a21 100644 --- a/qpid/java/jca/build.xml +++ b/qpid/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"/> diff --git a/qpid/java/lib/geronimo-servlet_2.5_spec-1.2.jar b/qpid/java/lib/geronimo-servlet_2.5_spec-1.2.jar Binary files differnew file mode 100644 index 0000000000..00a2010036 --- /dev/null +++ b/qpid/java/lib/geronimo-servlet_2.5_spec-1.2.jar |