You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm-commits@maven.apache.org by ev...@apache.org on 2006/02/01 08:59:06 UTC
svn commit: r374014 - in /maven/scm/trunk:
maven-scm-api/src/main/java/org/apache/maven/scm/
maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/
maven-scm-api/src/main/java/org/apache/maven/scm/command/update/
maven-scm-providers/maven-...
Author: evenisse
Date: Tue Jan 31 23:58:32 2006
New Revision: 374014
URL: http://svn.apache.org/viewcvs?rev=374014&view=rev
Log:
o Add ChangeLogSet that contains list of ChangeSet
o Add toXml() method in ChangeSet
Added:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java (with props)
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java Tue Jan 31 23:58:32 2006
@@ -56,15 +56,19 @@
*/
public static final String QUOTE_ENTITY = """;
+ private static final String DATE_PATTERN = "yyyy-MM-dd";
+
/**
* Formatter used by the getDateFormatted method.
*/
- private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat( "yyyy-MM-dd" );
+ private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat( DATE_PATTERN );
+
+ private static final String TIME_PATTERN = "HH:mm:ss";
/**
* Formatter used by the getTimeFormatted method.
*/
- private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat( "HH:mm:ss" );
+ private static final SimpleDateFormat TIME_FORMAT = new SimpleDateFormat( TIME_PATTERN );
/**
* Formatter used to parse date/timestamp.
@@ -289,10 +293,10 @@
StringBuffer buffer = new StringBuffer();
buffer.append( "\t<changelog-entry>\n" )
- .append( "\t\t<date>" )
+ .append( "\t\t<date pattern=\"" + DATE_PATTERN + "\">" )
.append( getDateFormatted() )
.append( "</date>\n" )
- .append( "\t\t<time>" )
+ .append( "\t\t<time pattern=\"" + TIME_PATTERN + "\">" )
.append( getTimeFormatted() )
.append( "</time>\n" )
.append( "\t\t<author><![CDATA[" )
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -61,6 +61,13 @@
throw new ScmException( "The end date is set but the start date isn't." );
}
+ if ( numDays > 0 )
+ {
+ startDate = new Date( System.currentTimeMillis() - (long) numDays * 24 * 60 * 60 * 1000 );
+
+ endDate = new Date( System.currentTimeMillis() + (long) 1 * 24 * 60 * 60 * 1000 );
+ }
+
return executeChangeLogCommand( repository, fileSet, startDate, endDate, numDays, branch );
}
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java Tue Jan 31 23:58:32 2006
@@ -18,8 +18,6 @@
import org.apache.maven.scm.ScmResult;
-import java.util.List;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @version $Id$
@@ -27,21 +25,21 @@
public class ChangeLogScmResult
extends ScmResult
{
- private List changeLog;
+ private ChangeLogSet changeLog;
public ChangeLogScmResult( String commandLine, String providerMessage, String commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
}
- public ChangeLogScmResult( String commandLine, List changeLog )
+ public ChangeLogScmResult( String commandLine, ChangeLogSet changeLog )
{
super( commandLine, null, null, true );
this.changeLog = changeLog;
}
- public List getChangeLog()
+ public ChangeLogSet getChangeLog()
{
return changeLog;
}
Added: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java?rev=374014&view=auto
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java (added)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java Tue Jan 31 23:58:32 2006
@@ -0,0 +1,124 @@
+package org.apache.maven.scm.command.changelog;
+
+import org.apache.maven.scm.ChangeSet;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+/*
+ * Copyright 2001-2006 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.
+ */
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class ChangeLogSet
+{
+ private List entries;
+
+ private Date startDate;
+
+ private Date endDate;
+
+ /**
+ * Initializes a new instance of this class.
+ *
+ * @param startDate the start date/tag for this set.
+ * @param endDate the end date/tag for this set, or <code>null</code> if this set goes to the present time.
+ */
+ public ChangeLogSet( Date startDate, Date endDate )
+ {
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
+ /**
+ * Initializes a new instance of this class.
+ *
+ * @param entries collection of {@link org.apache.maven.scm.ChangeSet} objects for this set.
+ * @param startDate the start date/tag for this set.
+ * @param endDate the end date/tag for this set, or <code>null</code> if this set goes to the present time.
+ */
+ public ChangeLogSet( List entries, Date startDate, Date endDate )
+ {
+ this.entries = entries;
+ this.startDate = startDate;
+ this.endDate = endDate;
+ }
+
+ /**
+ * Returns the start date.
+ *
+ * @return the start date.
+ */
+ public Date getStartDate()
+ {
+ return startDate;
+ }
+
+ /**
+ * Returns the end date for this set.
+ *
+ * @return the end date for this set, or <code>null</code> if this set goes to the present time.
+ */
+ public Date getEndDate()
+ {
+ return endDate;
+ }
+
+ /**
+ * Returns the collection of changeSet.
+ *
+ * @return the collection of {@link org.apache.maven.scm.ChangeSet} objects for this set.
+ */
+ public List getChangeSets()
+ {
+ return entries;
+ }
+
+ public void setChangeSets( List changeSets )
+ {
+ this.entries = changeSets;
+ }
+
+ /**
+ * Creates an XML representation of this change log set.
+ */
+ public String toXML()
+ {
+ StringBuffer buffer = new StringBuffer();
+ String pattern = "yyyyMMdd HH:mm:ss z";
+ SimpleDateFormat formatter = new SimpleDateFormat( pattern );
+
+ buffer.append( "<changeset datePattern=\"" + pattern + "\" start=\"" )
+ .append( formatter.format( startDate ) )
+ .append( "\" end=\"" )
+ .append( formatter.format( endDate ) )
+ .append( "\">\n" );
+
+ // Write out the entries
+ for ( Iterator i = getChangeSets().iterator(); i.hasNext(); )
+ {
+ buffer.append( ( (ChangeSet) i.next() ).toXML() );
+ }
+
+ buffer.append( "</changeset>\n" );
+
+ return buffer.toString();
+ }
+}
Propchange: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogSet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Tue Jan 31 23:58:32 2006
@@ -26,6 +26,7 @@
import org.apache.maven.scm.command.AbstractCommand;
import org.apache.maven.scm.command.changelog.ChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import java.util.ArrayList;
@@ -63,11 +64,11 @@
List changes = new ArrayList();
- List changesList = changeLogScmResult.getChangeLog();
+ ChangeLogSet changeLogSet = changeLogScmResult.getChangeLog();
- if ( changesList != null )
+ if ( changeLogSet != null )
{
- for ( Iterator i = changesList.iterator(); i.hasNext(); )
+ for ( Iterator i = changeLogSet.getChangeSets().iterator(); i.hasNext(); )
{
ChangeSet change = (ChangeSet) i.next();
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.clearcase.command.ClearCaseCommand;
import org.apache.maven.scm.providers.clearcase.settings.Settings;
@@ -68,6 +69,9 @@
}
catch ( XmlPullParserException e )
{
+ String message = settingsFile.getAbsolutePath() + " isn't well formed. SKIPPED." + e.getMessage();
+
+ System.out.println( message );
}
}
}
@@ -104,7 +108,8 @@
return new ChangeLogScmResult( cl.toString(), "The cleartool command failed.", stderr.getOutput(), false );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.cvslib.command.CvsCommand;
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
@@ -45,13 +46,6 @@
{
CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
- if ( numDays > 0 )
- {
- startDate = new Date( System.currentTimeMillis() - (long) numDays * 24 * 60 * 60 * 1000 );
-
- endDate = new Date( System.currentTimeMillis() + (long) 1 * 24 * 60 * 60 * 1000 );
- }
-
Commandline cl = new Commandline();
cl.setExecutable( "cvs" );
@@ -119,6 +113,7 @@
return new ChangeLogScmResult( cl.toString(), "The cvs command failed.", stderr.getOutput(), false );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java Tue Jan 31 23:58:32 2006
@@ -17,12 +17,12 @@
*/
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
import org.apache.maven.scm.provider.cvslib.CvsScmTestUtils;
import java.util.Date;
-import java.util.List;
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
@@ -83,10 +83,10 @@
fail( changeLogResult.getProviderMessage() + "\n" + changeLogResult.getCommandOutput() );
}
- List changeLog = changeLogResult.getChangeLog();
+ ChangeLogSet changeLogSet = changeLogResult.getChangeLog();
- assertNotNull( changeLog );
+ assertNotNull( changeLogSet );
- assertEquals( changeLogSize, changeLog.size() );
+ assertEquals( changeLogSize, changeLogSet.getChangeSets().size() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/src/main/java/org/apache/maven/scm/provider/local/command/changelog/LocalChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -22,6 +22,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.local.repository.LocalScmProviderRepository;
import org.codehaus.plexus.util.FileUtils;
@@ -153,6 +154,6 @@
throw new ScmException( "Error while getting change logs.", ex );
}
- return new ChangeLogScmResult( null, changeLogList );
+ return new ChangeLogScmResult( null, new ChangeLogSet( changeLogList, startDate, endDate ) );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/changelog/PerforceChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
import org.apache.maven.scm.provider.perforce.command.PerforceCommand;
@@ -75,7 +76,8 @@
getLogger().error( e.getMessage(), e );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
public static Commandline createCommandLine( PerforceScmProviderRepository repo, File workingDirectory )
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/changelog/StarteamChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.starteam.command.StarteamCommand;
import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
@@ -78,7 +79,8 @@
return new ChangeLogScmResult( cl.toString(), "The 'stcmd' command failed.", stderr.getOutput(), false );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.svn.SvnTagBranchUtils;
import org.apache.maven.scm.provider.svn.command.SvnCommand;
@@ -74,7 +75,8 @@
return new ChangeLogScmResult( cl.toString(), "The svn command failed.", stderr.getOutput(), false );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
// ----------------------------------------------------------------------
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java Tue Jan 31 23:58:32 2006
@@ -51,6 +51,8 @@
List modifications = consumer.getModifications();
+ System.out.println( "Text format:" );
+
System.out.println( "nb modifications : " + modifications.size() );
for ( Iterator i = modifications.iterator(); i.hasNext(); )
@@ -71,6 +73,19 @@
System.out.println( "File:" + file.getName() );
}
+
+ System.out.println( "==============================" );
+ }
+
+ System.out.println( "XML format:" );
+
+ System.out.println( "nb modifications : " + modifications.size() );
+
+ for ( Iterator i = modifications.iterator(); i.hasNext(); )
+ {
+ ChangeSet entry = (ChangeSet) i.next();
+
+ System.out.println( entry.toXML() );
System.out.println( "==============================" );
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java?rev=374014&r1=374013&r2=374014&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-vss/src/main/java/org/apache/maven/scm/provider/vss/commands/changelog/VssHistoryCommand.java Tue Jan 31 23:58:32 2006
@@ -20,6 +20,7 @@
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.changelog.AbstractChangeLogCommand;
import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.vss.commands.VssCommandLineUtils;
import org.apache.maven.scm.provider.vss.commands.VssConstants;
@@ -89,7 +90,8 @@
return new ChangeLogScmResult( cl.toString(), "The vss command failed.", stderr.getOutput(), false );
}
- return new ChangeLogScmResult( cl.toString(), consumer.getModifications() );
+ return new ChangeLogScmResult( cl.toString(),
+ new ChangeLogSet( consumer.getModifications(), startDate, endDate ) );
}
public Commandline buildCmdLine( VssScmProviderRepository repo, ScmFileSet fileSet, Date startDate, Date endDate,
@@ -124,7 +126,7 @@
ssDir += "/";
}
}
- command.setExecutable( ssDir + VssConstants.SS_EXE );
+ command.setExecutable( ssDir + VssConstants.SS_EXE );
command.createArgument().setValue( VssConstants.COMMAND_HISTORY );