From e7ac384cf17702b59ddae64d55c7438b26fbd0e3 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 15 May 2012 23:30:13 +0000
Subject: NO-JIRA: reuse the properties from build.deps, remove duplication in
 build.xml file

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1338951 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/perftests/visualisation-jfc/build.xml | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/perftests/visualisation-jfc/build.xml b/qpid/java/perftests/visualisation-jfc/build.xml
index e2b40100b7..6fafba0480 100644
--- a/qpid/java/perftests/visualisation-jfc/build.xml
+++ b/qpid/java/perftests/visualisation-jfc/build.xml
@@ -24,13 +24,6 @@
 
 
     <!-- JFreeChart and JFreeCommon -->
-
-    <property name="jfree.lib.dir" value="${project.root}/lib/jfree" />
-    <property name="jfreechart.version" value="1.0.13" />
-    <property name="jfreecommon.version" value="1.0.16" />
-    <property name="jfreechart.jar.file" value="${jfree.lib.dir}/jfreechart-${jfreechart.version}.jar" />
-    <property name="jfreecommon.jar.file" value="${jfree.lib.dir}/jcommon-${jfreecommon.version}.jar" />
-
     <condition property="download.jfree.jars">
       <or>
         <istrue value="${download-jfree}"/>
@@ -40,12 +33,6 @@
     </condition>
 
     <!-- CSVJDBC -->
-
-    <property name="csvjdbc.lib.dir" value="${project.root}/lib/csvjdbc" />
-    <property name="csvjdbc.version" value="1.0.8" />
-
-    <property name="csvjdbc.jar.file" value="${csvjdbc.lib.dir}/csvjdbc-${csvjdbc.version}.jar" />
-
     <condition property="download.csvjdbc.jar">
       <or>
         <istrue value="${download-csvjdbc}"/>
@@ -58,8 +45,8 @@
     <target name="check-jfree-jars">
         <condition property="jfree.available">
             <and>
-                <available file="${jfreechart.jar.file}"/>
-                <available file="${jfreecommon.jar.file}"/>
+                <available file="${project.root}/${jfreechart.jar}"/>
+                <available file="${project.root}/${jcommon.jar}"/>
             </and>
         </condition>
     </target>
@@ -94,7 +81,7 @@ http://www.gnu.org/licenses/lgpl.html
 
     <target name="check-csvjdbc-jars">
         <condition property="csvjdbc.available">
-            <available file="${csvjdbc.jar.file}"/>
+            <available file="${project.root}/${csvjdbc.jar}"/>
         </condition>
     </target>
 
-- 
cgit v1.2.1