From edd5a72f358b4b4814516d865203908ed1af778a Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 14 May 2012 21:11:13 +0000
Subject: QPID-3994: add properties for libraries used only in the build

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1338426 13f79535-47bb-0310-9956-ffa450edef68
---
 java/build.deps | 7 +++++--
 java/common.xml | 2 +-
 java/module.xml | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'java')

diff --git a/java/build.deps b/java/build.deps
index 5569bb83e6..4601b9eca1 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -54,8 +54,6 @@ felix.libs=${felix-main}
 jackson-core=lib/required/jackson-core-asl-1.9.0.jar
 jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
 
-bnd=lib/required/bnd-0.0.384.jar
-
 commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
   ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
 
@@ -162,3 +160,8 @@ jcommon.jar=lib/jfree/jcommon-1.0.16.jar
 csvjdbc.jar=lib/csvjdbc/csvjdbc-1.0.8.jar
 perftests-visualisation-jfc.libs=${jfreechart.jar} ${jcommon.jar} ${csvjdbc.jar}
 perftests-visualisation-jfc.test.libs=${test.libs}
+
+# Libraries used only within the build
+bnd=lib/required/bnd-0.0.384.jar
+jython=lib/required/jython-standalone-2.5.2.jar
+maven-ant-tasks=lib/required/maven-ant-tasks-2.1.1.jar
diff --git a/java/common.xml b/java/common.xml
index 0f7117e3f0..6d65f68fc2 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -180,7 +180,7 @@
     <attribute name="path"/>
     <element name="args"/>
     <sequential>
-      <java jar="${project.root}/lib/required/jython-standalone-2.5.2.jar" fork="true" failonerror="true">
+      <java jar="${project.root}/${jython}" fork="true" failonerror="true">
         <arg value="-Dpython.path=@{path}"/>
         <args/>
       </java>
diff --git a/java/module.xml b/java/module.xml
index 68a2fac9c3..1261a1bdea 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -22,7 +22,9 @@
 
   <import file="common.xml"/>
 
-  <path id="maven-ant-tasks.classpath" path="${project.root}/lib/required/maven-ant-tasks-2.1.1.jar" />
+  <property file="${project.root}/build.deps"/>
+
+  <path id="maven-ant-tasks.classpath" path="${project.root}/${maven-ant-tasks}" />
   <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
            uri="antlib:org.apache.maven.artifact.ant"
            classpathref="maven-ant-tasks.classpath" />
@@ -39,8 +41,6 @@
 	
   <echo message="Running ant for module : ${module}" level="info"/>
 
-  <property file="${project.root}/build.deps"/>
-
   <property name="module.build"        location="${build.scratch}/${module}"/>
   <property name="module.classes"      location="${module.build}/classes"/>
   <property name="module.instrumented" location="${module.build}/classes-instrumented"/>
-- 
cgit v1.2.1