summaryrefslogtreecommitdiff
path: root/java/jca
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-10-12 11:44:13 +0000
committerRobert Gemmell <robbie@apache.org>2012-10-12 11:44:13 +0000
commite1be5e17a41681eb26b23895ad1dbf596020d4e9 (patch)
treeaf58bc84e5796c8fdf3aa62856bd7cc57eff422e /java/jca
parent7fdb249ca7278f4fb8ba3a76fffcf828ebc9222f (diff)
downloadqpid-python-e1be5e17a41681eb26b23895ad1dbf596020d4e9.tar.gz
QPID-4335, QPID-4353: Refactored broker plugins to use simplified ServiceLoader-based model rather than embedding Felix to use OSGi.
Removed the ability to reload security configuration because this feature is not very useful in its current form and was making our code hard to refactor. Modified all tests to use jars rather than classes. This makes them closer to real-world deployments, e.g. the META-INF/services file is read from within the jar. Also moved various system tests from their respective modules into "systests". This removes the need for most modules to depend on systests, thus simplifying our dependency graph. Applied patch from myself, Keith Wall and Phil Harvey <phil@philharveyonline.com> git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1397519 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/jca')
-rw-r--r--java/jca/build.xml9
1 files changed, 8 insertions, 1 deletions
diff --git a/java/jca/build.xml b/java/jca/build.xml
index 3f34cc9f41..768ff54bff 100644
--- a/java/jca/build.xml
+++ b/java/jca/build.xml
@@ -22,6 +22,8 @@
<property name="module.depends" value="common client"/>
<property name="module.name" value="jca"/>
+ <!-- Hack to make the renamed module jars available on the module test classpath -->
+ <property name="module.test.depends" value="ra ra/tests"/>
<import file="../module.xml"/>
@@ -76,6 +78,11 @@
<target name="examples" depends="example-properties-file, example-jars"/>
- <target name="build" depends="rar, examples"/>
+ <target name="build" depends="rar, examples, jar-tests, jar-sources, postbuild"/>
+ <target name="postbuild">
+ <!-- Hack to make the tests/sources jar names match the renamed main module jar/rar -->
+ <move file="${module.test.jar}" tofile="${build.lib}/${project.name}-ra-tests-${project.version}.jar"/>
+ <move file="${module.source.jar}" tofile="${build.lib}/${project.name}-ra-${project.version}-sources.jar"/>
+ </target>
</project>