QPID-3994: move the deps for the optional charting module over to being retrieved using Ivy

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1337589 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 44 insertions, 17 deletions

diff --git a/.gitignore b/.gitignore
index 6d9f0ffdd9..0b053fdcd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,8 @@ qpid/java/lib/bdbstore
 qpid/java/lib/cobertura
 qpid/java/lib/findbugs
 qpid/java/lib/ivy
+qpid/java/lib/csvjdbc
+qpid/java/lib/jfree
 qpid/java/build.overrides
 qpid/java/felix-cache/*
 qpid/java/eclipse-projects
diff --git a/qpid/java/common.xml b/qpid/java/common.xml
index fbb17d7412..ea3b5849d0 100644
--- a/qpid/java/common.xml
+++ b/qpid/java/common.xml
@@ -123,6 +123,9 @@
   <condition property="ivy.dont.retrieve">
     <isfalse value="${retrieve.dependencies}"/>
   </condition>
+  <condition property="ivy.configured">
+    <isfalse value="${retrieve.dependencies}"/>
+  </condition>
 
 
   <macrodef name="indirect">
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 609d773c21..7facdf4e50 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -20,9 +20,11 @@
 
   <info organisation="${ivy.organisation}" module="${project.name}" revision="${project.version}"/>
 
-  <configurations defaultconf="required" defaultconfmapping="required->default;bdbje->default">
+  <configurations defaultconf="required" defaultconfmapping="required->default;bdbje->default;jfree->default;csvjdbc->default">
     <conf name="required"/>
     <conf name="bdbje"/>
+    <conf name="jfree"/>
+    <conf name="csvjdbc"/>
   </configurations>
 
   <publications xmlns:e="urn:ant.apache.org:ivy-extras"/>
@@ -62,5 +64,8 @@
     for use in optional build/test steps. Their optional status is usually indicative of licences
     which are not compatible with the Apache Licence -->
     <dependency org="com.sleepycat" name="je" rev="5.0.34" transitive="false" conf="bdbje"/>
+    <dependency org="jfree" name="jfreechart" rev="1.0.13" transitive="false" conf="jfree"/>
+    <dependency org="jfree" name="jcommon" rev="1.0.16" transitive="false" conf="jfree"/>
+    <dependency org="net.sourceforge.csvjdbc" name="csvjdbc" rev="1.0.8" transitive="false" conf="csvjdbc"/>
   </dependencies>
 </ivy-module>
diff --git a/qpid/java/ivysettings.retrieve.xml b/qpid/java/ivysettings.retrieve.xml
index aead12935a..bdce28d007 100644
--- a/qpid/java/ivysettings.retrieve.xml
+++ b/qpid/java/ivysettings.retrieve.xml
@@ -30,6 +30,10 @@
       <artifact pattern="${ivy.m2repo.url}/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
     </url>
 
+    <url name="csvjdbc" m2compatible="true">
+      <artifact pattern="http://csvjdbc.sourceforge.net/maven2/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
+    </url>
+
     <url name="oracle" m2compatible="true">
       <artifact pattern="http://download.oracle.com/maven/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"/>
     </url>
@@ -38,6 +42,7 @@
 
     <chain name="chain" returnFirst="true">
       <resolver ref="m2repo"/>
+      <resolver ref="csvjdbc"/>
       <resolver ref="oracle"/>
       <resolver ref="public"/>
     </chain>
diff --git a/qpid/java/perftests/visualisation-jfc/build.xml b/qpid/java/perftests/visualisation-jfc/build.xml
index b838855e8b..91bd2eeddd 100644
--- a/qpid/java/perftests/visualisation-jfc/build.xml
+++ b/qpid/java/perftests/visualisation-jfc/build.xml
@@ -16,7 +16,7 @@
  - specific language governing permissions and limitations
  - under the License.
  -->
-<project name="visualisation-jfc" default="build">
+<project name="visualisation-jfc" xmlns:ivy="antlib:org.apache.ivy.ant" default="build">
     <property name="module.depends" value="common perftests" />
     <property name="module.test.depends" value="test" />
 
@@ -28,19 +28,30 @@
     <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.download.url" value="http://repo1.maven.org/maven2/jfree/jfreechart/${jfreechart.version}/jfreechart-${jfreechart.version}.jar" />
-    <property name="jfreecommon.download.url" value="http://repo1.maven.org/maven2/jfree/jcommon/${jfreecommon.version}/jcommon-${jfreecommon.version}.jar" />
     <property name="jfreechart.jar.file" value="${jfree.lib.dir}/jfreechart-${jfreechart.version}.jar" />
-    <property name="jfreecommon.jar.file" value="${jfree.lib.dir}/jfreecommon-${jfreecommon.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}"/>
+        <istrue value="${optional.dependencies}"/>
+      </or>
+    </condition>
 
     <!-- CSVJDBC -->
 
     <property name="csvjdbc.lib.dir" value="${project.root}/lib/csvjdbc" />
     <property name="csvjdbc.version" value="1.0.8" />
-    <property name="csvjdbc.download.url" value="http://csvjdbc.sourceforge.net/maven2/net/sourceforge/csvjdbc/csvjdbc/${csvjdbc.version}/csvjdbc-${csvjdbc.version}.jar" />
 
     <property name="csvjdbc.jar.file" value="${csvjdbc.lib.dir}/csvjdbc-${csvjdbc.version}.jar" />
 
+    <condition property="download.csvjdbc.jar">
+      <or>
+        <istrue value="${download-csvjdbc}"/>
+        <istrue value="${optional.dependencies}"/>
+      </or>
+    </condition>
+
     <!--check whether the JFree jar is present, possibly after download-->
     <target name="check-jfree-jars">
         <condition property="jfree.available">
@@ -86,7 +97,7 @@ http://www.gnu.org/licenses/lgpl.html
     </target>
 
     <!--check if an inline JFree download was requested with the build-->
-    <target name="checkjfree-request-props" if="download-jfree">
+    <target name="checkjfree-request-props" if="download.jfree.jars">
         <antcall target="download-jfree"/>
     </target>
 
@@ -119,21 +130,22 @@ http://www.gnu.org/licenses/lgpl.html
     </target>
 
     <!--download JFree, with licencing note-->
-    <target name="download-jfree" depends="jfree-licence-note">
-        <mkdir dir="${jfree.lib.dir}"/>
-        <echo>Downloading JFreeChart</echo>
-        <get src="${jfreechart.download.url}" dest="${jfreechart.jar.file}" usetimestamp="true" />
-        <get src="${jfreecommon.download.url}" dest="${jfreecommon.jar.file}" usetimestamp="true" />
+    <target name="download-jfree" depends="jfree-licence-note, load-ivy, configure-ivy" unless="${ivy.dont.retrieve}">
+        <echo message="Resolving and retrieving dependencies..."/>
+        <ivy:resolve type="jar" file="${project.root}/ivy.retrieve.xml" conf="jfree"/>
+        <ivy:retrieve type="jar" conf="jfree" sync="true"
+            pattern="${project.root}/lib/jfree/[artifact]-[revision].[ext]" />
     </target>
 
-    <target name="checkcsvjdbc-request-props" if="download-csvjdbc">
+    <target name="checkcsvjdbc-request-props" if="download.csvjdbc.jar">
         <antcall target="download-csvjdbc"/>
     </target>
 
-    <target name="download-csvjdbc" depends="csvjdbc-licence-note">
-        <mkdir dir="${csvjdbc.lib.dir}"/>
-        <echo>Downloading csvjdbc</echo>
-        <get src="${csvjdbc.download.url}" dest="${csvjdbc.jar.file}" usetimestamp="true" />
+    <target name="download-csvjdbc" depends="csvjdbc-licence-note, load-ivy, configure-ivy" unless="${ivy.dont.retrieve}">
+        <echo message="Resolving and retrieving dependencies..."/>
+        <ivy:resolve type="jar" file="${project.root}/ivy.retrieve.xml" conf="csvjdbc"/>
+        <ivy:retrieve type="jar" conf="csvjdbc" sync="true"
+            pattern="${project.root}/lib/csvjdbc/[artifact]-[revision].[ext]" />
     </target>
 
     <target name="build" depends="checkjfree-request-props, jfree-jar-required, checkcsvjdbc-request-props, csvjdbc-jar-required, module.build" />