diff --git a/build.xml b/build.xml
index 143b85bba..b0f53281b 100644
--- a/build.xml
+++ b/build.xml
@@ -75,6 +75,7 @@
+
@@ -115,6 +116,7 @@
+
@@ -338,6 +340,7 @@
+
@@ -371,6 +374,7 @@
+
diff --git a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
index 21a8e581e..2e73812a6 100644
--- a/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
+++ b/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -74,8 +74,15 @@ public class RegexpPatternMapper implements FileNameMapper {
public RegexpPatternMapper() throws BuildException {
try {
- regexpMatcherClass = Class.forName("org.apache.tools.ant.util.regexp.JakartaRegexpMatcher");
- } catch (ClassNotFoundException ce) {}
+ regexpMatcherClass = Class.forName("org.apache.tools.ant.util.regexp.JakartaOroMatcher");
+
+ if (regexpMatcherClass == null) {
+ regexpMatcherClass = Class.forName("org.apache.tools.ant.util.regexp.JakartaRegexpMatcher");
+
+ }
+ } catch (ClassNotFoundException ce) {
+ } catch (NoClassDefFoundError ne) {
+ }
if (regexpMatcherClass == null) {
throw new BuildException("No supported regular expression matcher found");
diff --git a/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
new file mode 100644
index 000000000..c2baf248e
--- /dev/null
+++ b/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
@@ -0,0 +1,116 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ */
+
+package org.apache.tools.ant.util.regexp;
+
+import org.apache.oro.text.regex.*;
+
+import org.apache.tools.ant.BuildException;
+import java.util.Vector;
+
+/**
+ * Implementation of RegexpMatcher for Jakarta-ORO.
+ *
+ * @author Stefan Bodewig
+ */
+public class JakartaOroMatcher implements RegexpMatcher {
+
+ protected Perl5Matcher reg = new Perl5Matcher();
+ protected Perl5Compiler comp = new Perl5Compiler();
+ private Pattern pattern;
+
+ /**
+ * Set the regexp pattern from the String description.
+ */
+ public void setPattern(String pattern) throws BuildException {
+ try {
+ this.pattern = comp.compile(pattern);
+ } catch (MalformedPatternException e) {
+ throw new BuildException(e);
+ }
+ }
+
+ /**
+ * Get a String representation of the regexp pattern
+ */
+ public String getPattern() {
+ return pattern.getPattern();
+ }
+
+ /**
+ * Does the given argument match the pattern?
+ */
+ public boolean matches(String argument) {
+ return reg.contains(argument, pattern);
+ }
+
+ /**
+ * Returns a Vector of matched groups found in the argument.
+ *
+ * Group 0 will be the full match, the rest are the
+ * parenthesized subexpressions
.
+ */
+ public Vector getGroups(String argument) {
+ if (!matches(argument)) {
+ return null;
+ }
+ Vector v = new Vector();
+ MatchResult mr = reg.getMatch();
+ for (int i=0; i.
+ */
+
+package org.apache.tools.ant.util.regexp;
+
+/**
+ * Tests for the jakarta-oro implementation of the OroMatcher interface.
+ *
+ * @author Stefan Bodewig
+ */
+public class JakartaOroMatcherTest extends RegexpMatcherTest {
+
+ public RegexpMatcher getImplementation() {
+ return new JakartaOroMatcher();
+ }
+
+ public JakartaOroMatcherTest(String name) {
+ super(name);
+ }
+
+}
diff --git a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
index c6e79c34c..16d3e29bd 100644
--- a/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
+++ b/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
@@ -23,7 +23,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.