jvanzyl 02/02/25 12:59:20
Modified: . build-bootstrap-jars.sh project.xml
src/java/org/apache/maven/jrcs/rcs Archive.java
Log:
replace gnu regexp with jakarta regexp, we are now gnu free.
Revision Changes Path
1.2 +1 -1 jakarta-turbine-maven/build-bootstrap-jars.sh
Index: build-bootstrap-jars.sh
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap-jars.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-bootstrap-jars.sh 25 Feb 2002 20:12:28 -0000 1.1
+++ build-bootstrap-jars.sh 25 Feb 2002 20:59:19 -0000 1.2
@@ -15,7 +15,7 @@
commons-beanutils.jar \
commons-collections.jar \
oro.jar \
- gnu-regexp-1.1.4.jar"
+ jakarta-regexp-1.2.jar"
for JAR in $JARS
do
1.7 +3 -3 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 25 Feb 2002 14:13:07 -0000 1.6
+++ project.xml 25 Feb 2002 20:59:19 -0000 1.7
@@ -207,10 +207,10 @@
</dependency>
<dependency>
- <name>gnu-regex</name>
+ <name>jakarta-regexp</name>
<type>required</type>
- <version>1.1.4</version>
- <jar>gnu-regexp-1.1.4.jar</jar>
+ <version>1.2</version>
+ <jar>jakarta-regexp-1.2.jar</jar>
</dependency>
</dependencies>
1.7 +21 -21
jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Archive.java
Index: Archive.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/Archive.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Archive.java 24 Feb 2002 13:52:28 -0000 1.6
+++ Archive.java 25 Feb 2002 20:59:20 -0000 1.7
@@ -68,8 +68,8 @@
import java.util.TreeMap;
import java.util.TreeSet;
-import gnu.regexp.RE;
-import gnu.regexp.REException;
+import org.apache.regexp.RE;
+import org.apache.regexp.RESyntaxException;
import org.apache.maven.jrcs.diff.Diff;
import org.apache.maven.jrcs.diff.PatchFailedException;
@@ -785,7 +785,7 @@
State_re = new RE("\\$State(:[^\\$]*)?\\$");
Locker_re = new RE("\\$Locker(:[^\\$]*)?\\$");
}
- catch (REException e)
+ catch (RESyntaxException e)
{
throw new PatchFailedException(e.getMessage());
}
@@ -808,15 +808,15 @@
Object[] result = new Object[text.length];
for (int i = 0; i < text.length; i++)
{
- result[i] = Id_re.substituteAll(text[i], "$" +
Id_FORMAT.format(revisionInfo) + "$");
- result[i] = Header_re.substituteAll(text[i], "$" +
Header_FORMAT.format(revisionInfo) + "$");
- result[i] = Source_re.substituteAll(text[i], "$" +
Source_FORMAT.format(revisionInfo) + "$");
- result[i] = RCSfile_re.substituteAll(text[i], "$" +
RCSFile_FORMAT.format(revisionInfo) + "$");
- result[i] = Revision_re.substituteAll(text[i], "$" +
Revision_FORMAT.format(revisionInfo) + "$");
- result[i] = Date_re.substituteAll(text[i], "$" +
Date_FORMAT.format(revisionInfo) + "$");
- result[i] = Author_re.substituteAll(text[i], "$" +
Author_FORMAT.format(revisionInfo) + "$");
- result[i] = State_re.substituteAll(text[i], "$" +
State_FORMAT.format(revisionInfo) + "$");
- result[i] = Locker_re.substituteAll(text[i], "$" +
Locker_FORMAT.format(revisionInfo) + "$");
+ result[i] = Id_re.subst((String)text[i], "$" +
Id_FORMAT.format(revisionInfo) + "$");
+ result[i] = Header_re.subst((String)text[i], "$" +
Header_FORMAT.format(revisionInfo) + "$");
+ result[i] = Source_re.subst((String)text[i], "$" +
Source_FORMAT.format(revisionInfo) + "$");
+ result[i] = RCSfile_re.subst((String)text[i], "$" +
RCSFile_FORMAT.format(revisionInfo) + "$");
+ result[i] = Revision_re.subst((String)text[i], "$" +
Revision_FORMAT.format(revisionInfo) + "$");
+ result[i] = Date_re.subst((String)text[i], "$" +
Date_FORMAT.format(revisionInfo) + "$");
+ result[i] = Author_re.subst((String)text[i], "$" +
Author_FORMAT.format(revisionInfo) + "$");
+ result[i] = State_re.subst((String)text[i], "$" +
State_FORMAT.format(revisionInfo) + "$");
+ result[i] = Locker_re.subst((String)text[i], "$" +
Locker_FORMAT.format(revisionInfo) + "$");
//@TODO: should do something about Name and Log
}
return result;
@@ -829,15 +829,15 @@
Object[] result = new Object[text.length];
for (int i = 0; i < text.length; i++)
{
- result[i] = Id_re.substituteAll(text[i], "$" + "Id" + "$");
- result[i] = Header_re.substituteAll(text[i], "$" + "Header" + "$");
- result[i] = Source_re.substituteAll(text[i], "$" + "Source" + "$");
- result[i] = RCSfile_re.substituteAll(text[i], "$" + "RCSfile" + "$");
- result[i] = Revision_re.substituteAll(text[i], "$" + "Revision" + "$");
- result[i] = Date_re.substituteAll(text[i], "$" + "Date" + "$");
- result[i] = Author_re.substituteAll(text[i], "$" + "Author" + "$");
- result[i] = State_re.substituteAll(text[i], "$" + "State" + "$");
- result[i] = Locker_re.substituteAll(text[i], "$" + "Locker" + "$");
+ result[i] = Id_re.subst((String)text[i], "$" + "Id" + "$");
+ result[i] = Header_re.subst((String)text[i], "$" + "Header" + "$");
+ result[i] = Source_re.subst((String)text[i], "$" + "Source" + "$");
+ result[i] = RCSfile_re.subst((String)text[i], "$" + "RCSfile" + "$");
+ result[i] = Revision_re.subst((String)text[i], "$" + "Revision" + "$");
+ result[i] = Date_re.subst((String)text[i], "$" + "Date" + "$");
+ result[i] = Author_re.subst((String)text[i], "$" + "Author" + "$");
+ result[i] = State_re.subst((String)text[i], "$" + "State" + "$");
+ result[i] = Locker_re.subst((String)text[i], "$" + "Locker" + "$");
//@TODO: should do something about Name and Log
}
return result;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
