sbailliez 02/02/26 14:56:23
Modified: src/java/org/apache/maven/jrcs/rcs ArchiveFormat.java
src/test/org/apache/maven/jrcs/rcs ArchiveFormatTest.java
Log:
Bitten by RCS keywords replacement... doh !
Revision Changes Path
1.2 +18 -18
jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java
Index: ArchiveFormat.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchiveFormat.java 26 Feb 2002 22:43:15 -0000 1.1
+++ ArchiveFormat.java 26 Feb 2002 22:56:23 -0000 1.2
@@ -75,23 +75,23 @@
final class ArchiveFormat
{
final Format Header_FORMAT =
- new MessageFormat("$Header:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
1.1 2002/02/26 22:43:15 sbailliez Exp $");
+ new MessageFormat("$" + "Header: {1} {2} {3, date,yyyy/MM/dd HH:mm:ss}
{4} {5} " + "$");
final Format Id_FORMAT =
- new MessageFormat("$Id: ArchiveFormat.java,v 1.1 2002/02/26 22:43:15
sbailliez Exp $");
+ new MessageFormat("$" + "Id: {1} {2} {3, date,yyyy/MM/dd HH:mm:ss} {4}
{5} " + "$");
final Format RCSFile_FORMAT =
- new MessageFormat("$RCSfile: ArchiveFormat.java,v $");
+ new MessageFormat("$" + "RCSfile: {1} " + "$");
final Format Revision_FORMAT =
- new MessageFormat("$Revision: 1.1 $");
+ new MessageFormat("$" + "Revision: {2} " + "$");
final Format Date_FORMAT =
- new MessageFormat("$Date: 2002/02/26 22:43:15 $");
+ new MessageFormat("$" + "Date: {3, date,yyyy/MM/dd HH:mm:ss} " + "$");
final Format Author_FORMAT =
- new MessageFormat("$Author: sbailliez $");
+ new MessageFormat("$" + "Author: {4} " + "$");
final Format State_FORMAT =
- new MessageFormat("$State: Exp $");
+ new MessageFormat("$" + "State: {5} " + "$");
final Format Locker_FORMAT =
- new MessageFormat("$Locker: $");
+ new MessageFormat("$" + "Locker: {6} " + "$");
final Format Source_FORMAT =
- new MessageFormat("$Source:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
$");
+ new MessageFormat("$" + "Source: {0} " + "$");
private final Pattern ID_RE;
private final Pattern HEADER_RE;
@@ -161,15 +161,15 @@
String reset(String text)
{
String data = text;
- data = substitute(data, ID_RE, "$Id: ArchiveFormat.java,v 1.1 2002/02/26
22:43:15 sbailliez Exp $");
- data = substitute(data, HEADER_RE, "$Header:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
1.1 2002/02/26 22:43:15 sbailliez Exp $");
- data = substitute(data, SOURCE_RE, "$Source:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/jrcs/rcs/ArchiveFormat.java,v
$");
- data = substitute(data, RCSFILE_RE, "$RCSfile: ArchiveFormat.java,v $");
- data = substitute(data, REVISION_RE, "$Revision: 1.1 $");
- data = substitute(data, DATE_RE, "$Date: 2002/02/26 22:43:15 $");
- data = substitute(data, AUTHOR_RE, "$Author: sbailliez $");
- data = substitute(data, STATE_RE, "$State: Exp $");
- data = substitute(data, LOCKER_RE, "$Locker: $");
+ data = substitute(data, ID_RE, '$' + "Id$");
+ data = substitute(data, HEADER_RE, '$' + "Header$");
+ data = substitute(data, SOURCE_RE, '$' + "Source$");
+ data = substitute(data, RCSFILE_RE, '$' + "RCSfile$");
+ data = substitute(data, REVISION_RE, '$' + "Revision$");
+ data = substitute(data, DATE_RE, '$' + "Date$");
+ data = substitute(data, AUTHOR_RE, '$' + "Author$");
+ data = substitute(data, STATE_RE, '$' + "State$");
+ data = substitute(data, LOCKER_RE, '$' + "Locker$");
//@TODO: should do something about Name and Log
return data;
}
1.2 +19 -18
jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java
Index: ArchiveFormatTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ArchiveFormatTest.java 26 Feb 2002 22:43:15 -0000 1.1
+++ ArchiveFormatTest.java 26 Feb 2002 22:56:23 -0000 1.2
@@ -67,25 +67,26 @@
{
private static final ArchiveFormat FORMATTER = new ArchiveFormat();
private static final String RCS_KEYWORDS =
- "$Id: ArchiveFormatTest.java,v 1.1 2002/02/26 22:43:15 sbailliez Exp
$\n" +
- "$Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
1.1 2002/02/26 22:43:15 sbailliez Exp $\n" +
+ "$Id: ArchiveFormatTest.java,v 1.2 2002/02/26 22:56:23 sbailliez Exp
$\n" +
+ "$Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
1.2 2002/02/26 22:56:23 sbailliez Exp $\n" +
"$Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
$\n" +
"$RCSfile: ArchiveFormatTest.java,v $\n" +
- "$Revision: 1.1 $\n" +
- "$Date: 2002/02/26 22:43:15 $\n" +
+ "$Revision: 1.2 $\n" +
+ "$Date: 2002/02/26 22:56:23 $\n" +
"$Author: sbailliez $\n" +
"$State: Exp $\n" +
"$Locker: $\n";
+ // don't get bitten by rcs keywords it should not be interpreted
private static final String RCS_CLEAN_KEYWORDS =
- "$Id: ArchiveFormatTest.java,v 1.1 2002/02/26 22:43:15 sbailliez Exp
$\n" +
- "$Header:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
1.1 2002/02/26 22:43:15 sbailliez Exp $\n" +
- "$Source:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/jrcs/rcs/ArchiveFormatTest.java,v
$\n" +
- "$RCSfile: ArchiveFormatTest.java,v $\n" +
- "$Revision: 1.1 $\n" +
- "$Date: 2002/02/26 22:43:15 $\n" +
- "$Author: sbailliez $\n" +
- "$State: Exp $\n" +
- "$Locker: $\n";
+ "$" + "Id$\n" +
+ "$" + "Header$\n" +
+ "$" + "Source$\n" +
+ "$" + "RCSfile$\n" +
+ "$" + "Revision$\n" +
+ "$" + "Date$\n" +
+ "$" + "Author$\n" +
+ "$" + "State$\n" +
+ "$" + "Locker$\n";
private static final Object[] REVISION_INFO = new Object[]{
"a/b/c/d/File.ext",
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
