From 95ebcf3852b78aee0e690d82564188a80eb3317d Mon Sep 17 00:00:00 2001 From: evenisse Date: Thu, 27 Feb 2003 10:30:33 +0000 Subject: [PATCH] Apply patch from Jim Crossley. Thanks. o patch for support whitespace in starteam connection string o patch for support specific locale with Starteam git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113004 13f79535-47bb-0310-9956-ffa450edef68 --- changelog/plugin.jelly | 1 + .../org/apache/maven/changelog/ChangeLog.java | 29 ++++++++++++++++++- .../StarteamChangeLogGenerator.java | 4 +-- .../starteamlib/StarteamChangeLogParser.java | 8 +++-- developer-activity/plugin.jelly | 1 + file-activity/plugin.jelly | 1 + 6 files changed, 39 insertions(+), 5 deletions(-) diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly index 8eba8182..dabc8e12 100644 --- a/changelog/plugin.jelly +++ b/changelog/plugin.jelly @@ -51,6 +51,7 @@ outputEncoding="${maven.docs.outputencoding}" range="${maven.changelog.range}" repositoryConnection="${pom.repository.connection}" + dateFormat="${maven.changelog.dateformat}" /> dIon Gillard * @author Stefan Bodewig * @author Peter Donald - * @version $Id: ChangeLog.java,v 1.3 2003/02/08 23:53:13 bwalding Exp $ + * @version $Id: ChangeLog.java,v 1.4 2003/02/27 10:30:33 evenisse Exp $ */ public class ChangeLog { @@ -96,6 +96,11 @@ public class ChangeLog */ private String range; + /** + * Used to specify the date format of log entries to retrieve. + */ + private String dateFormat; + /** * Input dir. Working directory for running CVS executable */ @@ -161,6 +166,28 @@ public class ChangeLog return range; } + /** + * Set the date format of log entries to process; the + * interpretation of this parameter depends on the generator. + * + * @param dateFormat the dateFormat of log entries. + */ + public void setDateFormat(String dateFormat) + { + this.dateFormat = dateFormat; + } + + /** + * Get the date format of log entries to process; the + * interpretation of this parameter depends on the generator. + * + * @return the dateFormat of log entries. + */ + public String getDateFormat() + { + return dateFormat; + } + /** * Set the base directory for the change log generator. * @param base the base directory diff --git a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java index 53f9ddaa..3e10811e 100644 --- a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java +++ b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java @@ -71,7 +71,7 @@ import org.apache.tools.ant.types.Commandline; * interface. * * @author Emmanuel Venisse - * @version $Id: StarteamChangeLogGenerator.java,v 1.2 2003/02/26 16:16:20 evenisse Exp $ + * @version $Id: StarteamChangeLogGenerator.java,v 1.3 2003/02/27 10:30:33 evenisse Exp $ */ class StarteamChangeLogGenerator extends AbstractChangeLogGenerator { @@ -99,7 +99,7 @@ class StarteamChangeLogGenerator extends AbstractChangeLogGenerator if ("starteam".equals(repo.substring(4, 12))) { repo = repo.substring(13); - command.createArgument().setValue("\"" + repo + "\""); + command.createArgument().setValue(repo); } return command; } diff --git a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java index 302e2652..4dc3da5b 100644 --- a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java +++ b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java @@ -81,7 +81,7 @@ import org.apache.commons.logging.LogFactory; * A class to parse starteam log output * * @author Emmanuel Venisse - * @version $Id: StarteamChangeLogParser.java,v 1.1 2003/01/24 03:44:54 jvanzyl Exp $ + * @version $Id: StarteamChangeLogParser.java,v 1.2 2003/02/27 10:30:33 evenisse Exp $ */ class StarteamChangeLogParser implements ChangeLogParser { @@ -92,7 +92,7 @@ class StarteamChangeLogParser implements ChangeLogParser private static final SimpleDateFormat ENTRY_KEY_TIMESTAMP_FORMAT = new SimpleDateFormat("yyyyMMddHHmm"); - private static SimpleDateFormat localFormat = new SimpleDateFormat(); + private SimpleDateFormat localFormat = new SimpleDateFormat(); /** * rcs entries, in reverse (date, time, author, comment) order @@ -166,6 +166,10 @@ class StarteamChangeLogParser implements ChangeLogParser { setDateRange(changeLog.getRange()); } + if (changeLog.getDateFormat() != null) + { + localFormat = new SimpleDateFormat(changeLog.getDateFormat()); + } } /** diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly index e9b490da..ac9d07fb 100644 --- a/developer-activity/plugin.jelly +++ b/developer-activity/plugin.jelly @@ -58,6 +58,7 @@ outputEncoding="${maven.docs.outputencoding}" range="${maven.activitylog.range}" repositoryConnection="${pom.repository.connection}" + dateFormat="${maven.changelog.dateformat}" /> diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly index 992b6fc7..76a648aa 100644 --- a/file-activity/plugin.jelly +++ b/file-activity/plugin.jelly @@ -67,6 +67,7 @@ outputEncoding="${maven.docs.outputencoding}" range="${maven.activitylog.range}" repositoryConnection="${pom.repository.connection}" + dateFormat="${maven.changelog.dateformat}" />