From 9d26827b5dcddfde295f690073b2676facf1cd13 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 8 May 2006 23:59:04 +0000
Subject: [PATCH] test with a given file name for the ant build script

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@405234 13f79535-47bb-0310-9956-ffa450edef68
---
 ant/plugin.jelly                       | 1 +
 ant/src/plugin-test/maven.xml          | 6 +++---
 ant/src/plugin-test/project.properties | 4 +++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ant/plugin.jelly b/ant/plugin.jelly
index 22a9c265..75aaf81e 100644
--- a/ant/plugin.jelly
+++ b/ant/plugin.jelly
@@ -47,6 +47,7 @@
       <ant:echo>!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!</ant:echo>
     </j:if>
     <ant:echo>Generating ${maven.ant.generate.dir}/${maven.ant.generate.script} ...</ant:echo>
+    <ant:mkdir dir="${maven.ant.generate.dir}"/>
     <j:file name="${maven.ant.generate.dir}/${maven.ant.generate.script}" prettyPrint="true">
       <j:import file="${plugin.resources}/templates/build.jelly" inherit="true"/>
     </j:file>
diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
index 84707a19..a2298b24 100644
--- a/ant/src/plugin-test/maven.xml
+++ b/ant/src/plugin-test/maven.xml
@@ -18,12 +18,12 @@
 <project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:u="jelly:util" xmlns:assert="assert" xmlns:x="jelly:xml">
   <goal name="testPlugin" prereqs="test-ant"/>
   <goal name="test-ant" prereqs="clean">
-    <delete file="${basedir}/build.xml" failonerror="false"/>
+    <delete file="${maven.ant.generate.dir}/${maven.ant.generate.script}" failonerror="false"/>
     <attainGoal name="ant:generate-build"/>
-    <assert:assertFileExists file="${basedir}/build.xml"/>
+    <assert:assertFileExists file="${maven.ant.generate.dir}/${maven.ant.generate.script}"/>
     <attainGoal name="ant:execute"/>
     <!-- load build.xml file and check that 'target' property is relative -->
-    <u:file name="${basedir}/build.xml" var="buildFile"/>
+    <u:file name="${maven.ant.generate.dir}/${maven.ant.generate.script}" var="buildFile"/>
     <x:parse var="buildXml" xml="${buildFile.toURL()}"/>
     <x:set var="properties" select="$buildXml/project/property"/>
     <j:set var="defaulttargetdirName" value="${properties[2].attribute('name').value}"/>
diff --git a/ant/src/plugin-test/project.properties b/ant/src/plugin-test/project.properties
index 90563578..24083f0b 100644
--- a/ant/src/plugin-test/project.properties
+++ b/ant/src/plugin-test/project.properties
@@ -1,6 +1,8 @@
+maven.ant.generate.script = myBuild.xml
+maven.ant.generate.dir    = ${basedir}
+
 maven.jar.override        =on
 maven.jar.activation      =${basedir}/lib/activation-1.0.2.jar
-
 maven.license.licenseFile =${basedir}/LICENSE.txt
 
 maven.ant.use.multirepo   =false
\ No newline at end of file