From d302c0889c0cbde3ef171929b47198148d5a0b75 Mon Sep 17 00:00:00 2001
From: Luc Boudreau <lucboudreau@gmail.com>
Date: Sat, 19 Mar 2011 18:11:10 +0000
Subject: [PATCH] Fixes a property conflict with the XMLA jar publish target.

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

diff --git a/build.xml b/build.xml
index 40014eb..3b6c15d 100644
--- a/build.xml
+++ b/build.xml
@@ -341,17 +341,17 @@ class XmlaOlap4jDriverVersion {
           </if>
         </sequential>
         <property
-            name="publish.file"
+            name="publish.file.xmla"
             value="${dist.dir}/${ivy.artifact.id}-xmla-${project.revision}.jar"/>
         <sequential>
-          <fail message="No file found at: ${publish.file}">
+          <fail message="No file found at: ${publish.file.xmla}">
             <condition>
               <not>
-                <available file="${publish.file}" />
+                <available file="${publish.file.xmla}" />
               </not>
             </condition>
           </fail>
-          <echo message="Publishing ${publish.file} to ${ivy.repository.publish}..." />
+          <echo message="Publishing ${publish.file.xmla} to ${ivy.repository.publish}..." />
           <if>
             <isset property="isWindows" />
             <then>
@@ -365,7 +365,7 @@ class XmlaOlap4jDriverVersion {
                 <arg value="-DartifactId=${ivy.artifact.id}-xmla" />
                 <arg value="-Dpackaging=jar" />
                 <arg value="-Dversion=${project.revision}" />
-                <arg value="-Dfile=${publish.file}" />
+                <arg value="-Dfile=${publish.file.xmla}" />
               </exec>
             </then>
             <else>
@@ -377,7 +377,7 @@ class XmlaOlap4jDriverVersion {
                 <arg value="-DartifactId=${ivy.artifact.id}-xmla" />
                 <arg value="-Dpackaging=jar" />
                 <arg value="-Dversion=${project.revision}" />
-                <arg value="-Dfile=${publish.file}" />
+                <arg value="-Dfile=${publish.file.xmla}" />
               </exec>
             </else>
           </if>