From 3a0ea500b35021d1eef1dfa76e2cf7e153f8c5dd Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Fri, 21 Mar 2008 22:44:54 +0000
Subject: [PATCH] Do not make system be the default location - it is too
 dangerous - noone reads manuals!

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@639900 13f79535-47bb-0310-9956-ffa450edef68
---
 fetch.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/fetch.xml b/fetch.xml
index b3417fe0e..245e18f47 100644
--- a/fetch.xml
+++ b/fetch.xml
@@ -29,8 +29,8 @@
 
   You can choose three locations, by going -Ddest=LOCATION on the command line
   -Ddest=user     user lib dir  ${user.home}/.ant/lib
-  -Ddest=system   ant lib dir   ${ant.home}/lib --Default--
-  -Ddest=optional optional dir  ${ant.home}/lib/optional  (for Ant developers)
+  -Ddest=system   ant lib dir   ${ant.home}/lib
+  -Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
 
   You may also need to set proxy settings. On Java1.5, Ant tries to get
   this from the OS, unless you use the -noproxy option.
@@ -63,7 +63,18 @@
   <import file="get-m2.xml" />
 
   <target name="pick-dest">
-    <property name="dest" value="system" />
+    <fail>
+      <condition>
+        <not>
+          <isset property="dest"/>
+        </not>
+      </condition>ERROR
+Set -Ddest=LOCATION on the command line
+  -Ddest=user     user lib dir  ${user.home}/.ant/lib
+  -Ddest=system   ant lib dir   ${ant.home}/lib
+  -Ddest=optional optional dir  $${basedir}/lib/optional  (for Ant developers)
+    </fail>
+
     <condition property="dest.dir"
       value="${lib.dir}">
       <equals arg1="${dest}" arg2="system" />