diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-05-11 00:31:10 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-05-11 00:31:10 +0000 |
| commit | 1b9dd059a7b2e3ffe0428e675e1e95ce36cd3676 (patch) | |
| tree | 6c8511109d9563c1d1be0765c71ff3eac180af5f | |
| parent | 721e6249969b511ee6d29b960080cdaed71b9d22 (diff) | |
| download | qpid-python-1b9dd059a7b2e3ffe0428e675e1e95ce36cd3676.tar.gz | |
QPID-1746,QPID-1748,QPID-1752,QPID-1753 : Update to module.xml to correctly convert sub project dependency i.e. management/common to a module name management-common for packaging purposes.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.5-release@773439 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/java/management/tools/qpid-cli/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/module.xml | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/qpid/java/management/tools/qpid-cli/build.xml b/qpid/java/management/tools/qpid-cli/build.xml index f943c7f7e0..244e3b6e5f 100644 --- a/qpid/java/management/tools/qpid-cli/build.xml +++ b/qpid/java/management/tools/qpid-cli/build.xml @@ -20,7 +20,7 @@ --> <project name="qpid-cli"> - <property name="module.depends" value="common management-common" /> + <property name="module.depends" value="common management/common" /> <property name="module.test.depends" value="common client" /> <property name="module.src" value="src" /> <!-- Disable tests as per QPID-1342 --> diff --git a/qpid/java/module.xml b/qpid/java/module.xml index d46bf7cebe..66fb92683b 100644 --- a/qpid/java/module.xml +++ b/qpid/java/module.xml @@ -335,11 +335,16 @@ </copy> </target> - <map property="module.depends.jars" value="${module.depends}" join=","> + <map property="module.name.depends" value="${module.depends}"> + <filtermapper> + <replacestring from="${file.separator}" to="-"/> + </filtermapper> + </map> + + <map property="module.depends.jars" value="${module.name.depends}" join=","> <globmapper from="*" to="${project.name}-*-${project.version}.jar"/> </map> - <target name="libs-release" description="copy dependencies into module release"> <!-- Copy the module dependencies --> <copy todir="${module.release}" failonerror="true"> |