diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-10-06 11:04:56 +0000 |
| commit | 6b49962c50e5ebbe810ddbb562dc2b55a3c4de06 (patch) | |
| tree | e4c7e1227ec4214094cded08b4a8effe9c9dc024 /qpid/java/broker-plugins/management-http/build.xml | |
| parent | 9e1128eed479d269cd9700675a46dd979f26d40a (diff) | |
| download | qpid-python-6b49962c50e5ebbe810ddbb562dc2b55a3c4de06.tar.gz | |
QPID-5207, QPID-5048: use the dojo release zip instead of extracting files from the war
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529610 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/build.xml')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/build.xml | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/qpid/java/broker-plugins/management-http/build.xml b/qpid/java/broker-plugins/management-http/build.xml index 05af45a289..d921b91580 100644 --- a/qpid/java/broker-plugins/management-http/build.xml +++ b/qpid/java/broker-plugins/management-http/build.xml @@ -26,28 +26,27 @@ <property name="broker.plugin" value="true"/> - <property name="broker-plugins-management-http.libs" value="" /> - <import file="../../module.xml" /> - <!-- Flagfile used to determine if uwar needs to be done. ._ is part of Ant's defaultexcludes so wont appear bundles --> - <property name="dojo.uptodate.flagfile" value="${module.classes}/resources/dojo/._dojouptodate.timestamp" /> + <property name="module.manifest" value="${module.build}/MANIFEST.MF" /> + <property name="dojo.config.file" value="${module.classes}/dojoconfig.properties" /> - <target name="precompile" depends="unwardojo" /> + <target name="precompile" depends="generate-manifest, generate-dojo-config"/> - <target name="unwardojo" depends="check-unwardojo.done" unless="unwardojo.done"> - <unwar src="${project.root}/${dojo}" dest="${module.classes}/resources/dojo"> - <patternset> - <exclude name="META-INF/**" /> - <exclude name="WEB-INF/**" /> - <exclude name="**/*.uncompressed.js" /> - </patternset> - </unwar> - <touch file="${dojo.uptodate.flagfile}" /> + <target name="generate-manifest"> + <!-- Echos exactly as shown, so leave no spaces before/after lines --> + <echo file="${module.manifest}" append="false">Manifest-Version: 1.0 +Class-Path: dojo-${dojo-version}.zip +</echo> </target> - <target name="check-unwardojo.done"> - <uptodate property="unwardojo.done" targetfile="${dojo.uptodate.flagfile}" srcfile="${project.root}/${dojo}" /> + <target name="generate-dojo-config"> + <!-- Echos exactly as shown, so leave no spaces before/after lines --> + <echo file="${dojo.config.file}" append="false">dojo-version=${dojo-version} +dojo-path=/dojo-${dojo-version}/dojo +dijit-path=/dojo-${dojo-version}/dijit +dojox-path=/dojo-${dojo-version}/dojox +</echo> </target> <target name="bundle" depends="bundle-tasks" /> |