From b65fcc8a3a23d8a3fb1af6d22cb9fa32f6e963ce Mon Sep 17 00:00:00 2001
From: Peter Reilly <peterreilly@apache.org>
Date: Mon, 25 Sep 2006 21:37:19 +0000
Subject: [PATCH] Bugzilla 28883 add <matches> condition.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@449824 13f79535-47bb-0310-9956-ffa450edef68
---
 CONTRIBUTORS                                              | 1 +
 WHATSNEW                                                  | 2 ++
 contributors.xml                                          | 4 ++++
 src/main/org/apache/tools/ant/types/conditions/antlib.xml | 2 ++
 4 files changed, 9 insertions(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b732bb212..115bbeef1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -188,6 +188,7 @@ Patrick Martin
 Paul Austin
 Paul Christmann
 Paul Galbraith
+Paul King
 Paulo Gaspar
 Peter B. West
 Peter Donald
diff --git a/WHATSNEW b/WHATSNEW
index ae34ab1af..50c9cfb55 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -32,6 +32,8 @@ Other changes:
 
 * Some performance improvements, including Bugzilla report  25778.
 
+* Add <matches> condition. Bugzilla report 28883.
+
 
 Changes from Ant 1.7.0Beta1 to Ant 1.7.0Beta2
 =============================================
diff --git a/contributors.xml b/contributors.xml
index 2b8bafaa7..6b6efaf44 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -750,6 +750,10 @@
     <first>Paul</first>
     <last>Galbraith</last>
   </name>
+  <name>
+    <first>Paul</first>
+    <last>King</last>
+  </name>
   <name>
     <first>Paulo</first>
     <last>Gaspar</last>
diff --git a/src/main/org/apache/tools/ant/types/conditions/antlib.xml b/src/main/org/apache/tools/ant/types/conditions/antlib.xml
index 135982490..8c298374f 100644
--- a/src/main/org/apache/tools/ant/types/conditions/antlib.xml
+++ b/src/main/org/apache/tools/ant/types/conditions/antlib.xml
@@ -64,6 +64,8 @@
            classname="org.apache.tools.ant.taskdefs.condition.IsTrue"/>
   <typedef name="not" onerror="ignore"
            classname="org.apache.tools.ant.taskdefs.condition.Not"/>
+  <typedef name="matches" onerror="ignore"
+           classname="org.apache.tools.ant.taskdefs.condition.Matches"/>
   <typedef name="or" onerror="ignore"
            classname="org.apache.tools.ant.taskdefs.condition.Or"/>
   <typedef name="os" onerror="ignore"