You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/11/28 17:01:14 UTC
cvs commit: jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp JakartaOroMatcherTest.java JakartaRegexpMatcherTest.java
bodewig 00/11/28 08:01:13
Modified: . build.xml
src/main/org/apache/tools/ant/util RegexpPatternMapper.java
src/main/org/apache/tools/ant/util/regexp
JakartaRegexpMatcher.java
src/testcases/org/apache/tools/ant/util/regexp
JakartaRegexpMatcherTest.java
Added: src/main/org/apache/tools/ant/util/regexp
JakartaOroMatcher.java
src/testcases/org/apache/tools/ant/util/regexp
JakartaOroMatcherTest.java
Log:
Implementation of the regexp interface for Jakarta-ORO.
Revision Changes Path
1.101 +4 -0 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- build.xml 2000/11/28 15:10:28 1.100
+++ build.xml 2000/11/28 16:01:11 1.101
@@ -75,6 +75,7 @@
<available property="vaj.present" classname="com.ibm.ivj.util.base.Workspace" />
<available property="stylebook.present" classname="org.apache.stylebook.Engine" />
<available property="jakarta.regexp.present" classname="org.apache.regexp.RE" />
+ <available property="jakarta.oro.present" classname="org.apache.oro.text.regex.Perl5Matcher" />
</target>
<!-- =================================================================== -->
@@ -115,6 +116,7 @@
<exclude name="**/ANTLR.java" unless="antlr.present" />
<exclude name="**/ide/VAJ*.java" unless="vaj.present" />
<exclude name="**/JakartaRegexpMatcher.java" unless="jakarta.regexp.present" />
+ <exclude name="**/JakartaOroMatcher.java" unless="jakarta.oro.present" />
</javac>
<copy todir="${build.classes}">
@@ -338,6 +340,7 @@
</classpath>
<exclude name="org/apache/tools/ant/taskdefs/optional/ANTLRTest.java" unless="antlr.present" />
<exclude name="org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java" unless="jakarta.regexp.present" />
+ <exclude name="org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java" unless="jakarta.oro.present" />
</javac>
</target>
@@ -371,6 +374,7 @@
<exclude name="org/apache/tools/ant/taskdefs/optional/ANTLRTest.java" unless="antlr.present" />
<exclude name="org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java" unless="jakarta.regexp.present" />
+ <exclude name="org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java" unless="jakarta.oro.present" />
</fileset>
</batchtest>
1.2 +10 -3 jakarta-ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java
Index: RegexpPatternMapper.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/RegexpPatternMapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegexpPatternMapper.java 2000/11/28 15:10:35 1.1
+++ RegexpPatternMapper.java 2000/11/28 16:01:11 1.2
@@ -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 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");
1.2 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java
Index: JakartaRegexpMatcher.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaRegexpMatcher.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JakartaRegexpMatcher.java 2000/11/28 15:10:36 1.1
+++ JakartaRegexpMatcher.java 2000/11/28 16:01:12 1.2
@@ -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.
1.1 jakarta-ant/src/main/org/apache/tools/ant/util/regexp/JakartaOroMatcher.java
Index: JakartaOroMatcher.java
===================================================================
/*
* 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
* <http://www.apache.org/>.
*/
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 <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
*/
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.
*
* <p>Group 0 will be the full match, the rest are the
* parenthesized subexpressions</p>.
*/
public Vector getGroups(String argument) {
if (!matches(argument)) {
return null;
}
Vector v = new Vector();
MatchResult mr = reg.getMatch();
for (int i=0; i<mr.groups(); i++) {
v.addElement(mr.group(i));
}
return v;
}
}
1.2 +1 -1 jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java
Index: JakartaRegexpMatcherTest.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaRegexpMatcherTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JakartaRegexpMatcherTest.java 2000/11/28 15:10:38 1.1
+++ JakartaRegexpMatcherTest.java 2000/11/28 16:01:13 1.2
@@ -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.
1.1 jakarta-ant/src/testcases/org/apache/tools/ant/util/regexp/JakartaOroMatcherTest.java
Index: JakartaOroMatcherTest.java
===================================================================
/*
* 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
* <http://www.apache.org/>.
*/
package org.apache.tools.ant.util.regexp;
/**
* Tests for the jakarta-oro implementation of the OroMatcher interface.
*
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
*/
public class JakartaOroMatcherTest extends RegexpMatcherTest {
public RegexpMatcher getImplementation() {
return new JakartaOroMatcher();
}
public JakartaOroMatcherTest(String name) {
super(name);
}
}