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
This commit is contained in:
evenisse
2003-02-27 10:30:33 +00:00
parent adcec2136e
commit 95ebcf3852
6 changed files with 39 additions and 5 deletions

View File

@@ -51,6 +51,7 @@
outputEncoding="${maven.docs.outputencoding}"
range="${maven.changelog.range}"
repositoryConnection="${pom.repository.connection}"
dateFormat="${maven.changelog.dateformat}"
/>
<doc:jsl

View File

@@ -87,7 +87,7 @@ import org.apache.maven.project.Developer;
* @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
* @author <a href="mailto:bodewig@apache.org">Stefan Bodewig</a>
* @author <a href="mailto:peter@apache.org">Peter Donald</a>
* @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

View File

@@ -71,7 +71,7 @@ import org.apache.tools.ant.types.Commandline;
* interface.
*
* @author <a href="mailto:evenisse@ifrance.com">Emmanuel Venisse</a>
* @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;
}

View File

@@ -81,7 +81,7 @@ import org.apache.commons.logging.LogFactory;
* A class to parse starteam log output
*
* @author <a href="mailto:evenisse@ifrance">Emmanuel Venisse</a>
* @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());
}
}
/**

View File

@@ -58,6 +58,7 @@
outputEncoding="${maven.docs.outputencoding}"
range="${maven.activitylog.range}"
repositoryConnection="${pom.repository.connection}"
dateFormat="${maven.changelog.dateformat}"
/>
</j:if>

View File

@@ -67,6 +67,7 @@
outputEncoding="${maven.docs.outputencoding}"
range="${maven.activitylog.range}"
repositoryConnection="${pom.repository.connection}"
dateFormat="${maven.changelog.dateformat}"
/>
</j:if>