From d4db1e4901957f7a87ca46143f4cf30b5ae55d3d Mon Sep 17 00:00:00 2001 From: Steve Loughran Date: Wed, 8 Mar 2006 16:38:44 +0000 Subject: [PATCH] we should have done this for ant1.6. Now my backwards compatible task has to copy in all the well-known condition names. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@384261 13f79535-47bb-0310-9956-ffa450edef68 --- .../tools/ant/types/defaults.properties | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/org/apache/tools/ant/types/defaults.properties b/src/main/org/apache/tools/ant/types/defaults.properties index a876a143f..2e6527996 100644 --- a/src/main/org/apache/tools/ant/types/defaults.properties +++ b/src/main/org/apache/tools/ant/types/defaults.properties @@ -31,15 +31,28 @@ compositemapper=org.apache.tools.ant.util.CompositeMapper chainedmapper=org.apache.tools.ant.util.ChainedMapper filtermapper=org.apache.tools.ant.types.mappers.FilterMapper -#conditions: -issigned=org.apache.tools.ant.taskdefs.condition.IsSigned +#all conditions, in alphabetical order +and=org.apache.tools.ant.taskdefs.condition.And +contains=org.apache.tools.ant.taskdefs.condition.Contains +equals=org.apache.tools.ant.taskdefs.condition.Equals +filesmatch=org.apache.tools.ant.taskdefs.condition.Filesmatch +http=org.apache.tools.ant.taskdefs.condition.Http +isfailure=org.apache.tools.ant.taskdefs.condition.IsFailure +isfalse=org.apache.tools.ant.taskdefs.condition.IsFalse isfileselected=org.apache.tools.ant.taskdefs.condition.IsFileSelected isreachable=org.apache.tools.ant.taskdefs.condition.IsReachable -scriptcondition=org.apache.tools.ant.types.optional.ScriptCondition -xor=org.apache.tools.ant.taskdefs.condition.Xor +isreference=org.apache.tools.ant.taskdefs.condition.IsReference +isset=org.apache.tools.ant.taskdefs.condition.IsSet +issigned=org.apache.tools.ant.taskdefs.condition.IsSigned +istrue=org.apache.tools.ant.taskdefs.condition.IsTrue +not=org.apache.tools.ant.taskdefs.condition.Not +or=org.apache.tools.ant.taskdefs.condition.Or +os=org.apache.tools.ant.taskdefs.condition.Os parsersupports=org.apache.tools.ant.taskdefs.condition.ParserSupports -isfailure=org.apache.tools.ant.taskdefs.condition.IsFailure resourcesmatch=org.apache.tools.ant.taskdefs.condition.ResourcesMatch +scriptcondition=org.apache.tools.ant.types.optional.ScriptCondition +socket=org.apache.tools.ant.taskdefs.condition.Socket +xor=org.apache.tools.ant.taskdefs.condition.Xor #ResourceCollections: dirset=org.apache.tools.ant.types.DirSet