From bc518b9cf378a49d6b2a3b32ca1ad043594c7e3b Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Sun, 20 Mar 2011 04:36:09 +0000
Subject: [PATCH] Overrides subfloor resolve task so we can resolve custom Ivy
 configurations.

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@413 c6a108a4-781c-0410-a6c6-c2d559e19af0
---
 build.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 8adc2a7..bb6dee3 100644
--- a/build.xml
+++ b/build.xml
@@ -220,8 +220,18 @@ class XmlaOlap4jDriverVersion {
         <antcall target="init-hsql"/>
     </target>
 
+    <!-- Override of subfloor to resolve artifacts of custom configurations -->
+    <target name="resolve" depends="resolve-xmla,resolve-jdk14,subfloor.resolve"/>
+    <target name="resolve-jdk14" depends="resolve-init">
+        <ivy:resolve file="ivy.xml" conf="default-jdk1.4" />
+        <ivy:retrieve conf="default-jdk1.4" pattern="${lib.dir}/[module](-[classifier]).[ext]" />
+    </target>
+    <target name="resolve-xmla" depends="resolve-init">
+        <ivy:resolve file="ivy.xml" conf="xmla" />
+        <ivy:retrieve conf="xmla" pattern="${lib.dir}/[module](-[classifier]).[ext]" />
+    </target>
+
     <!-- override compile task to account for special jdk handling -->
-    <!-- <target name="compile.compile" depends="init,parser"> -->
     <target name="compile.compile">
         <javac destdir="${classes.dir}" debug="${javac.debug}"
             deprecation="${javac.deprecation}" fork="true" source="${javac.source}"