From 59bd3c54532574aadf512fc43166e10c37443084 Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Thu, 3 Feb 2011 09:45:47 -0800
Subject: [PATCH] MONDRIAN: Fixes an issue in subfloor where Cobertura
 artifacts would cause a conflict because of the Ivy retrieve patters.

[git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 14087]
---
 subfloor.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/subfloor.xml b/subfloor.xml
index 2cd5ba8b1a..a554e5e478 100644
--- a/subfloor.xml
+++ b/subfloor.xml
@@ -1442,7 +1442,7 @@ TYPICAL TARGET SEQUENCE
   <target name="cobertura.install" depends="cobertura.download">
     <path id="cobertura.classpath">
       <fileset dir="${cobertura.build.cache.dir}">
-        <include name="*.jar" />
+        <include name="**/*.jar" />
       </fileset>
     </path>
     <taskdef classpathref="cobertura.classpath" resource="tasks.properties" />
@@ -1461,7 +1461,7 @@ TYPICAL TARGET SEQUENCE
         <available classname="net.sourceforge.cobertura.ant.InstrumentTask">
           <classpath>
             <fileset dir="${cobertura.build.cache.dir}">
-              <include name="*.jar" />
+              <include name="**/*.jar" />
             </fileset>
           </classpath>
         </available>
@@ -1480,7 +1480,7 @@ TYPICAL TARGET SEQUENCE
                   organisation="net.sourceforge.cobertura"
                   module="cobertura"
                   revision="1.9"
-                  pattern="${cobertura.build.cache.dir}/[module].[ext]" />
+                  pattern="${cobertura.build.cache.dir}/[organisation]/[module]/[revision]/[type]s/[artifact]-[revision].[ext]" />
   </target>