evenisse 2004/07/08 01:36:52
Modified: changelog project.xml
changelog/src/main/org/apache/maven/changelog ChangeLog.java
ChangeLogParser.java
changelog/src/main/org/apache/maven/clearcaselib
ClearcaseChangeLogParser.java
changelog/src/main/org/apache/maven/cvslib
CvsChangeLogParser.java
changelog/src/main/org/apache/maven/perforcelib
PerforceChangeLogParser.java
changelog/src/main/org/apache/maven/starteamlib
StarteamChangeLogParser.java
changelog/src/main/org/apache/maven/svnlib
SvnChangeLogParser.java
changelog/src/test/org/apache/maven/starteamlib
StarteamChangeLogParserTest.java
changelog/xdocs changes.xml properties.xml
Added: changelog/src/test/org/apache/maven/starteamlib
StarteamChangeLogParser2Test.java
changelog/src/test-resources/starteamlib starteamlog2.txt
Log:
Add the possibility to specify a date format for input stream (Starteam only).
Revision Changes Path
1.45 +1 -1 maven-plugins/changelog/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/project.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- project.xml 25 Jun 2004 16:55:44 -0000 1.44
+++ project.xml 8 Jul 2004 08:36:51 -0000 1.45
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-changelog-plugin</id>
<name>Maven Changelog Plugin</name>
- <currentVersion>1.6</currentVersion>
+ <currentVersion>1.7-SNAPSHOT</currentVersion>
<description/>
<shortDescription>Produce SCM changelog reports</shortDescription>
<url>http://maven.apache.org/reference/plugins/changelog/</url>
1.6 +5 -1
maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog.java 2 Mar 2004 15:00:17 -0000 1.5
+++ ChangeLog.java 8 Jul 2004 08:36:51 -0000 1.6
@@ -226,6 +226,10 @@
ChangeLogFactory factory = createFactory();
ChangeLogGenerator generator = factory.createGenerator();
ChangeLogParser parser = factory.createParser();
+ if (getDateFormat() != null)
+ {
+ parser.setDateFormatInFile(getDateFormat());
+ }
generator.init(this);
parser.init(this);
1.3 +7 -1
maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java
Index: ChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLogParser.java 2 Mar 2004 15:00:17 -0000 1.2
+++ ChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.3
@@ -60,4 +60,10 @@
* presumably the [EMAIL PROTECTED] #parse}) method.
*/
void cleanup();
+
+ /**
+ * Set the date formatter for parse starteam stream
+ * @param dateFormat a dateFormat for replace the local format
+ */
+ public void setDateFormatInFile( String dateFormat );
}
1.4 +3 -1
maven-plugins/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java
Index: ClearcaseChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClearcaseChangeLogParser.java 2 Mar 2004 15:00:18 -0000 1.3
+++ ClearcaseChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.4
@@ -317,5 +317,7 @@
this.status = status;
}
-
+ public void setDateFormatInFile( String dateFormat )
+ {
+ }
}
1.3 +5 -1
maven-plugins/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java
Index: CvsChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CvsChangeLogParser.java 2 Mar 2004 15:00:18 -0000 1.2
+++ CvsChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.3
@@ -319,4 +319,8 @@
{
this.status = status;
}
+
+ public void setDateFormatInFile( String dateFormat )
+ {
+ }
}
1.4 +4 -0
maven-plugins/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java
Index: PerforceChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerforceChangeLogParser.java 2 Mar 2004 15:00:18 -0000 1.3
+++ PerforceChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.4
@@ -262,4 +262,8 @@
int days = Integer.parseInt(this.changeLog.getRange());
beforeDate = new Date(System.currentTimeMillis() - (long) days * 24 * 60 *
60 * 1000);
}
+
+ public void setDateFormatInFile( String dateFormat )
+ {
+ }
}
1.5 +11 -5
maven-plugins/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java
Index: StarteamChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StarteamChangeLogParser.java 2 Mar 2004 15:00:18 -0000 1.4
+++ StarteamChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.5
@@ -141,14 +141,20 @@
}
/**
- * Set the date formatter for parse starteam stream
* Use only with StarteamChangeLogParserTest class
+ */
+ public void setTestMode( boolean testMode )
+ {
+ this.testMode = testMode;
+ }
+
+ /**
+ * Set the date formatter for parse starteam stream
* @param aSimpleDateFormat a simpleDateFormat for replace the local format
*/
- public void setDateFormatInFile(SimpleDateFormat aSimpleDateFormat)
+ public void setDateFormatInFile( String dateFormat )
{
- localFormat = aSimpleDateFormat;
- testMode = true;
+ localFormat = new SimpleDateFormat( dateFormat );
}
/**
1.6 +5 -1
maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
Index: SvnChangeLogParser.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SvnChangeLogParser.java 10 May 2004 02:00:25 -0000 1.5
+++ SvnChangeLogParser.java 8 Jul 2004 08:36:51 -0000 1.6
@@ -279,4 +279,8 @@
return null;
}
}
+
+ public void setDateFormatInFile( String dateFormat )
+ {
+ }
}
1.3 +2 -2
maven-plugins/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java
Index: StarteamChangeLogParserTest.java
===================================================================
RCS file:
/home/cvs/maven-plugins/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StarteamChangeLogParserTest.java 2 Mar 2004 15:00:19 -0000 1.2
+++ StarteamChangeLogParserTest.java 8 Jul 2004 08:36:51 -0000 1.3
@@ -68,7 +68,7 @@
public void testParse() throws Exception
{
FileInputStream fis = new FileInputStream(testFile);
- instance.setDateFormatInFile(new SimpleDateFormat("dd/MM/yy HH:mm",
Locale.FRENCH));
+ instance.setDateFormatInFile("dd/MM/yy HH:mm");
Collection entries = instance.parse(fis);
assertEquals("Wrong number of entries returned", 3, entries.size());
ChangeLogEntry entry = null;
1.1
maven-plugins/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParser2Test.java
Index: StarteamChangeLogParser2Test.java
===================================================================
package org.apache.maven.starteamlib;
/* ====================================================================
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* ====================================================================
*/
import java.io.FileInputStream;
import java.text.SimpleDateFormat;
import java.util.Collection;
import java.util.Iterator;
import java.util.Locale;
import junit.framework.TestCase;
import org.apache.maven.changelog.ChangeLogEntry;
/**
* Test cases for [EMAIL PROTECTED] StarteamChangeLogParser}
* @author <a href="mailto:[EMAIL PROTECTED]">Emmanuel Venisse</a>
* @version $Id: StarteamChangeLogParser2Test.java,v 1.1 2004/07/08 08:36:51
evenisse Exp $
*/
public class StarteamChangeLogParser2Test extends TestCase
{
/** the [EMAIL PROTECTED] StarteamChangeLogParser} used for testing */
private StarteamChangeLogParser instance;
/** file with test results to check against */
private String testFile;
/**
* Create a test with the given name
* @param testName the name of the test
*/
public StarteamChangeLogParser2Test(String testName)
{
super(testName);
}
/**
* Initialize per test data
* @throws Exception when there is an unexpected problem
*/
public void setUp() throws Exception
{
String baseDir = System.getProperty("basedir");
assertNotNull("The system property basedir was not defined.", baseDir);
testFile = baseDir + "/src/test-resources/starteamlib/starteamlog2.txt";
instance = new StarteamChangeLogParser();
}
/**
* Test of parse method
* @throws Exception when there is an unexpected problem
*/
public void testParse() throws Exception
{
FileInputStream fis = new FileInputStream(testFile);
instance.setDateFormatInFile("yy-MM-dd HH:mm");
Collection entries = instance.parse(fis);
assertEquals("Wrong number of entries returned", 3, entries.size());
ChangeLogEntry entry = null;
for (Iterator i = entries.iterator(); i.hasNext(); )
{
entry = (ChangeLogEntry) i.next();
assertTrue("ChangeLogEntry erroneously picked up",
entry.toString().indexOf("ChangeLogEntry.java") == -1);
}
}
}
1.36 +3 -0 maven-plugins/changelog/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/xdocs/changes.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- changes.xml 25 Jun 2004 16:55:44 -0000 1.35
+++ changes.xml 8 Jul 2004 08:36:51 -0000 1.36
@@ -25,6 +25,9 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
+ <release version="1.7" date="In CVS">
+ <action dev="evenisse" type="fix">Add the possibility to specify a date
format for input stream (Starteam only).</action>
+ </release>
<release version="1.6" date="2004-06-25">
<action dev="brett" type="fix" issue="MPCHANGELOG-34" due-to="Rafael
Santiago, Jr.">Prevent any NPE depending on certain repository definition
conditions</action>
<action dev="brett" type="fix">Build and run plugin against the installed
version of Maven</action>
1.7 +7 -0 maven-plugins/changelog/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/changelog/xdocs/properties.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- properties.xml 4 Mar 2004 18:01:12 -0000 1.6
+++ properties.xml 8 Jul 2004 08:36:51 -0000 1.7
@@ -83,6 +83,13 @@
the xdoc plugin, it defaults to <code>ISO-8859-1</code>
</td>
</tr>
+ <tr>
+ <td>maven.changelog.dateformat</td>
+ <td>Yes</td>
+ <td>
+ The date format in input stream. It's only used by Starteam changelog.
+ </td>
+ </tr>
</table>
</section>
<section name="Other properties">
1.1
maven-plugins/changelog/src/test-resources/starteamlib/starteamlog2.txt
Index: starteamlog2.txt
===================================================================
Folder: Maven (working dir: D:\Artin\projects\Artin\timemission_maven)
History for: project.properties
Description:
Locked by:
Status: Current
----------------------------
Revision: 2 View: Playground Branch Revision: 1.1
Author: Najvarek, Jan Date: 04-6-30 15:12:02 GMT+02:00
test revision
----------------------------
Revision: 1 View: Playground Branch Revision: 1.0
Author: Najvarek, Jan Date: 04-6-30 15:11:36 GMT+02:00
=============================================================================
Folder: lib (working dir: D:\Artin\projects\Artin\timemission_maven\lib)
Folder: interclient (working dir:
D:\Artin\projects\Artin\timemission_maven\lib\interclient)
Folder: jars (working dir:
D:\Artin\projects\Artin\timemission_maven\lib\interclient\jars)
History for: interclient.jar
Description:
Locked by:
Status: Current
----------------------------
Revision: 1 View: Playground Branch Revision: 1.0
Author: Najvarek, Jan Date: 04-6-28 9:57:29 GMT+02:00
=============================================================================
Folder: j2ee (working dir: D:\Artin\projects\Artin\timemission_maven\lib\j2ee)
Folder: jars (working dir: D:\Artin\projects\Artin\timemission_maven\lib\j2ee\jars)
Folder: jfreechart (working dir:
D:\Artin\projects\Artin\timemission_maven\lib\jfreechart)
Folder: jars (working dir:
D:\Artin\projects\Artin\timemission_maven\lib\jfreechart\jars)
Folder: mail (working dir: D:\Artin\projects\Artin\timemission_maven\lib\mail)
Folder: jars (working dir: D:\Artin\projects\Artin\timemission_maven\lib\mail\jars)
Folder: src (working dir: D:\Artin\projects\Artin\timemission_maven\src)
Folder: conf (working dir: D:\Artin\projects\Artin\timemission_maven\src\conf)
Folder: java (working dir: D:\Artin\projects\Artin\timemission_maven\src\java)
Folder: cz (working dir: D:\Artin\projects\Artin\timemission_maven\src\java\cz)
Folder: artin (working dir:
D:\Artin\projects\Artin\timemission_maven\src\java\cz\artin)
Folder: timemission (working dir:
D:\Artin\projects\Artin\timemission_maven\src\java\cz\artin\timemission)
History for: AssignedProject.java
Description:
Locked by:
Status: Current
----------------------------
Revision: 1 View: Playground Branch Revision: 1.0
Author: Najvarek, Jan Date: 04-6-28 9:57:38 GMT+02:00
=============================================================================
History for: AssignedProjectViewDef.java
Description:
Locked by:
Status: Current
----------------------------
Revision: 1 View: Playground Branch Revision: 1.0
Author: Najvarek, Jan Date: 04-6-28 9:57:48 GMT+02:00
=============================================================================
History for: Base32.java
Description:
Locked by:
Status: Current
----------------------------
Revision: 1 View: Playground Branch Revision: 1.0
Author: Najvarek, Jan Date: 04-6-28 9:57:52 GMT+02:00
=============================================================================
Folder: test (working dir: D:\Artin\projects\Artin\timemission_maven\src\test)
Folder: cz (working dir: D:\Artin\projects\Artin\timemission_maven\src\test\cz)
Folder: artin (working dir:
D:\Artin\projects\Artin\timemission_maven\src\test\cz\artin)
Folder: timemission (working dir:
D:\Artin\projects\Artin\timemission_maven\src\test\cz\artin\timemission)
Folder: webapp (working dir: D:\Artin\projects\Artin\timemission_maven\src\webapp)
Folder: jsp (working dir: D:\Artin\projects\Artin\timemission_maven\src\webapp\jsp)
Folder: target (working dir: D:\Artin\projects\Artin\timemission_maven\target)
Folder: classes (working dir:
D:\Artin\projects\Artin\timemission_maven\target\classes)
Folder: cz (working dir:
D:\Artin\projects\Artin\timemission_maven\target\classes\cz)
Folder: artin (working dir:
D:\Artin\projects\Artin\timemission_maven\target\classes\cz\artin)
Folder: timemission (working dir:
D:\Artin\projects\Artin\timemission_maven\target\classes\cz\artin\timemission)
Folder: test-classes (working dir:
D:\Artin\projects\Artin\timemission_maven\target\test-classes)
Folder: cz (working dir:
D:\Artin\projects\Artin\timemission_maven\target\test-classes\cz)
Folder: artin (working dir:
D:\Artin\projects\Artin\timemission_maven\target\test-classes\cz\artin)
Folder: timemission (working dir:
D:\Artin\projects\Artin\timemission_maven\target\test-classes\cz\artin\timemission)
Folder: test-reports (working dir:
D:\Artin\projects\Artin\timemission_maven\target\test-reports)
Folder: tm (working dir: D:\Artin\projects\Artin\timemission_maven\target\tm)
Folder: jsp (working dir: D:\Artin\projects\Artin\timemission_maven\target\tm\jsp)
Folder: WEB-INF (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF)
Folder: classes (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\classes)
Folder: cz (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\classes\cz)
Folder: artin (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\classes\cz\artin)
Folder: timemission (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\classes\cz\artin\timemission)
Folder: lib (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\lib)
Folder: tld (working dir:
D:\Artin\projects\Artin\timemission_maven\target\tm\WEB-INF\tld)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
