From 3f88c82539738dd254a6a6c8649dc6b4ab0d4f83 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 14 Jan 2005 21:30:55 +0000
Subject: [PATCH] MPANT-20 : - Use the property maven.ant.use.properties to
 define if build.properties files must be loaded. - Allow to load
 ${user.home}/build.properties

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@125210 13f79535-47bb-0310-9956-ffa450edef68
---
 ant/plugin.properties                          | 1 +
 ant/src/plugin-resources/templates/build.jelly | 8 ++++++--
 ant/src/plugin-test/maven.xml                  | 4 ++--
 ant/xdocs/properties.xml                       | 7 ++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ant/plugin.properties b/ant/plugin.properties
index 550377bc..145fb819 100644
--- a/ant/plugin.properties
+++ b/ant/plugin.properties
@@ -22,3 +22,4 @@
 # -------------------------------------------------------------------
 
 maven.ant.generatebuild.file = ${basedir}/build.xml
+maven.ant.use.properties     = true
\ No newline at end of file
diff --git a/ant/src/plugin-resources/templates/build.jelly b/ant/src/plugin-resources/templates/build.jelly
index 807f12e9..3ff2fb6a 100644
--- a/ant/src/plugin-resources/templates/build.jelly
+++ b/ant/src/plugin-resources/templates/build.jelly
@@ -42,6 +42,12 @@
 
 <project name="${pom.artifactId}" default="jar" basedir=".">
   
+  <j:if test="${maven.ant.use.properties}">
+  <!-- Load local and user build preferences -->
+  <property file="build.properties"/>
+  <property file="$${user.home}/build.properties"/>
+  </j:if>
+  
   <j:set var="baseDirFile" value="${pom.file.canonicalFile.parentFile}"/>
   <maven:makeRelativePath basedir="${baseDirFile}" path="${maven.build.dir}" separator="/" var="defaulttargetdir"/>
   <property name="defaulttargetdir" value="${defaulttargetdir}"/> 
@@ -67,8 +73,6 @@
   <property name="javadocdir" value="dist/docs/api"/>
   <property name="final.name" value="${maven.final.name}"/>
 
-  <property file="build.properties"/>
-
   <path id="build.classpath">
     <fileset dir="$${libdir}" >
       <include name="**/*.jar"/>
diff --git a/ant/src/plugin-test/maven.xml b/ant/src/plugin-test/maven.xml
index dd466f1c..d61539c1 100644
--- a/ant/src/plugin-test/maven.xml
+++ b/ant/src/plugin-test/maven.xml
@@ -28,8 +28,8 @@
     <u:file name="${basedir}/build.xml" var="buildFile"/>
     <x:parse var="buildXml" xml="${buildFile.toURL()}"/>
     <x:set var="properties" select="$buildXml/project/property"/>
-    <j:set var="defaulttargetdirName" value="${properties[0].attribute('name').value}"/>
-    <j:set var="defaulttargetdirValue" value="${properties[0].attribute('value').value}"/>
+    <j:set var="defaulttargetdirName" value="${properties[2].attribute('name').value}"/>
+    <j:set var="defaulttargetdirValue" value="${properties[2].attribute('value').value}"/>
     <assert:assertEquals expected="defaulttargetdir" value="${defaulttargetdirName}" msg="first target is not defaulttargetdir"/>
     <assert:assertEquals expected="target" value="${defaulttargetdirValue}" msg="defaulttargetdir property is not relative"/>
     <!-- check obey jar override -->
diff --git a/ant/xdocs/properties.xml b/ant/xdocs/properties.xml
index cc7748c4..82d39afd 100644
--- a/ant/xdocs/properties.xml
+++ b/ant/xdocs/properties.xml
@@ -16,14 +16,11 @@
  * limitations under the License.
  */
  -->
-
 <document>
-
   <properties>
     <title>Maven Ant Plugin Properties</title>
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
-
   <body>
     <section name="Maven Ant Plugin Settings">
       <table>
@@ -42,7 +39,7 @@
         </tr>
         <tr>
           <td colspan="3">
-<source>
+            <source>
 maven.ant.excludeTests=**/*Test.java,**/*Suite.java
 </source>
           </td>
@@ -59,4 +56,4 @@ maven.ant.excludeTests=**/*Test.java,**/*Suite.java
       </table>
     </section>
   </body>
-</document>
\ No newline at end of file
+</document>