maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update UpdateCommandTckTest.java
Date Fri, 24 Dec 2004 03:04:48 GMT
brett       2004/12/23 19:04:48

  Modified:    maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog
                        CvsChangeLogCommand.java CvsChangeLogConsumer.java
               maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin
                        CvsCheckInCommand.java CvsCheckInConsumer.java
               maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout
                        CvsCheckOutCommand.java CvsCheckOutConsumer.java
               maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag
                        CvsTagCommand.java
               maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update
                        CvsUpdateCommand.java CvsUpdateConsumer.java
               maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib
                        AbstractCvsConsumer.java CvsScmProvider.java
               maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog
                        CvsChangeLogCommandTest.java
                        CvsChangeLogConsumerTest.java
               maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin
                        CvsCheckInCommandTest.java
               maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout
                        CvsCheckoutCommandTest.java
               maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update
                        CvsUpdateCommandTest.java
               maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib
                        AbstractCvsScmTest.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/add
                        AbstractAddCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/branch
                        AbstractBranchCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog
                        AbstractChangeLogCommand.java
                        ChangeLogScmResult.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin
                        AbstractCheckInCommand.java CheckInScmResult.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout
                        AbstractCheckOutCommand.java CheckOutScmResult.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/diff
                        AbstractDiffCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/fileinfo
                        AbstractFileInfoCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles
                        AbstractListFilesCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/lock
                        AbstractLockCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/remove
                        AbstractRemoveCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/tag
                        AbstractTagCommand.java TagScmResult.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock
                        AbstractUnlockCommand.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command/update
                        AbstractUpdateCommand.java UpdateScmResult.java
               maven-scm-api/src/main/java/org/apache/maven/scm/command
                        AbstractCommand.java Command.java
               maven-scm-api/src/main/java/org/apache/maven/scm/manager
                        DefaultScmManager.java ScmManager.java
               maven-scm-api/src/main/java/org/apache/maven/scm/provider
                        AbstractScmProvider.java ScmProvider.java
               maven-scm-api/src/main/java/org/apache/maven/scm
                        ScmFileSet.java ScmTestCase.java
               maven-scm-api/src/test/java/org/apache/maven/scm/command/changelog
                        ChangeLogEntryTest.java ChangeLogFileTest.java
               maven-scm-api/src/test/java/org/apache/maven/scm/manager
                        ScmManagerTest.java
               maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog
                        SvnChangeLogCommand.java SvnChangeLogConsumer.java
               maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin
                        SvnCheckInCommand.java SvnCheckInConsumer.java
               maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout
                        SvnCheckOutCommand.java SvnCheckOutConsumer.java
               maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update
                        ScmUpdateScmResult.java SvnUpdateCommand.java
                        SvnUpdateConsumer.java
               maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn
                        SvnScmProvider.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog
                        SvnChangeLogCommandTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkin
                        SvnCheckInCommandTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout
                        SvnCheckOutCommandTckTest.java
                        SvnCheckOutCommandTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update
                        SvnUpdateCommandTckTest.java
                        SvnUpdateCommandTest.java
               maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn
                        SvnScmTestUtils.java
               maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout
                        CheckOutCommandTckTest.java
               maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update
                        UpdateCommandTckTest.java
  Log:
  - propogate ScmFileSet to commands
  - optimize imports
  - next step: add tests for commands on a partial set of files
  
  Revision  Changes    Path
  1.6       +8 -8      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java
  
  Index: CvsChangeLogCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommand.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsChangeLogCommand.java	2 Nov 2004 22:09:52 -0000	1.5
  +++ CvsChangeLogCommand.java	24 Dec 2004 03:04:45 -0000	1.6
  @@ -16,21 +16,20 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  -
   import org.apache.maven.scm.ScmException;
  +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.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.cvslib.command.CvsCommand;
   import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  @@ -40,7 +39,8 @@
       extends AbstractChangeLogCommand
       implements CvsCommand
   {
  -    protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, File workingDirectory, Date startDate, Date endDate, int numDays, String branch )
  +    protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
  +                                                          Date startDate, Date endDate, int numDays, String branch )
           throws ScmException
       {
           CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
  @@ -56,7 +56,7 @@
   
           cl.setExecutable( "cvs" );
   
  -        cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
  +        cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
   
           cl.createArgument().setValue( "-d" );
   
  
  
  
  1.6       +9 -5      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java
  
  Index: CvsChangeLogConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsChangeLogConsumer.java	2 Nov 2004 22:17:55 -0000	1.5
  +++ CvsChangeLogConsumer.java	24 Dec 2004 03:04:45 -0000	1.6
  @@ -16,14 +16,18 @@
    * limitations under the License.
    */
   
  -import java.text.SimpleDateFormat;
  -import java.util.*;
  -
   import org.apache.maven.scm.command.changelog.ChangeLogEntry;
   import org.apache.maven.scm.command.changelog.ChangeLogFile;
  -
   import org.codehaus.plexus.logging.Logger;
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.text.SimpleDateFormat;
  +import java.util.ArrayList;
  +import java.util.Collections;
  +import java.util.List;
  +import java.util.Map;
  +import java.util.StringTokenizer;
  +import java.util.TreeMap;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  
  
  
  1.5       +8 -7      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java
  
  Index: CvsCheckInCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsCheckInCommand.java	24 Dec 2004 01:21:35 -0000	1.4
  +++ CvsCheckInCommand.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,22 +16,22 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.IOException;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkin.AbstractCheckInCommand;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   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;
  -
   import org.codehaus.plexus.util.FileUtils;
   import org.codehaus.plexus.util.StringUtils;
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.io.File;
  +import java.io.IOException;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  @@ -41,7 +41,8 @@
       extends AbstractCheckInCommand
       implements CvsCommand
   {
  -    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, File workingDirectory, String message, String tag, File[] files )
  +    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
  +                                                      String tag )
           throws ScmException
       {
           CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
  @@ -50,7 +51,7 @@
   
           cl.setExecutable( "cvs" );
   
  -        cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
  +        cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
   
           File messageFile;
   
  
  
  
  1.4       +4 -5      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java
  
  Index: CvsCheckInConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInConsumer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CvsCheckInConsumer.java	31 Oct 2004 14:19:05 -0000	1.3
  +++ CvsCheckInConsumer.java	24 Dec 2004 03:04:45 -0000	1.4
  @@ -16,13 +16,12 @@
    * limitations under the License.
    */
   
  -import java.util.ArrayList;
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  -
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.5       +7 -10     maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java
  
  Index: CvsCheckOutCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsCheckOutCommand.java	29 Oct 2004 11:49:57 -0000	1.4
  +++ CvsCheckOutCommand.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,15 +16,13 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
   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;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
  @@ -38,7 +36,7 @@
       extends AbstractCheckOutCommand
       implements CvsCommand
   {
  -    protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, File workingDirectory, String tag, File[] files )
  +    protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
           throws ScmException
       {
           CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
  @@ -47,7 +45,7 @@
   
           cl.setExecutable( "cvs" );
   
  -        cl.setWorkingDirectory( workingDirectory.getParentFile().getAbsolutePath() );
  +        cl.setWorkingDirectory( fileSet.getBasedir().getParentFile().getAbsolutePath() );
   
           cl.createArgument().setValue( "-d" );
   
  @@ -64,18 +62,17 @@
   
           cl.createArgument().setValue( "-d" );
   
  -        cl.createArgument().setValue( workingDirectory.getName() );
  -//        cl.createArgument().setValue( "." );
  +        cl.createArgument().setValue( fileSet.getBasedir().getName() );
   
           cl.createArgument().setValue( repository.getModule() );
   
  -        CvsCheckOutConsumer consumer = new CvsCheckOutConsumer( getLogger(), workingDirectory );
  +        CvsCheckOutConsumer consumer = new CvsCheckOutConsumer( getLogger() );
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
           int exitCode;
   
  -        getLogger().debug( "Working directory: " + workingDirectory.getAbsolutePath() );
  +        getLogger().debug( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
           getLogger().debug( "Command line: " + cl );
   
           try
  
  
  
  1.5       +6 -12     maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java
  
  Index: CvsCheckOutConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckOutConsumer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsCheckOutConsumer.java	29 Oct 2004 11:49:57 -0000	1.4
  +++ CvsCheckOutConsumer.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,15 +16,13 @@
    * limitations under the License.
    */
   
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  -
  -import org.codehaus.plexus.util.cli.StreamConsumer;
   import org.codehaus.plexus.logging.Logger;
  +import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  @@ -35,15 +33,11 @@
   {
       private Logger logger;
   
  -    private File workingDirectory;
  -
       private List files = new ArrayList();
   
  -    public CvsCheckOutConsumer( Logger logger, File workingDirectory )
  +    public CvsCheckOutConsumer( Logger logger )
       {
           this.logger = logger;
  -
  -        this.workingDirectory = workingDirectory;
       }
   
       public void consumeLine( String line )
  
  
  
  1.5       +6 -7      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommand.java
  
  Index: CvsTagCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsTagCommand.java	22 Dec 2004 08:04:47 -0000	1.4
  +++ CvsTagCommand.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,21 +16,20 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.ArrayList;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.tag.AbstractTagCommand;
   import org.apache.maven.scm.command.tag.TagScmResult;
   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;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.util.ArrayList;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  @@ -40,7 +39,7 @@
       extends AbstractTagCommand
       implements CvsCommand
   {
  -    public ScmResult executeTagCommand( ScmProviderRepository repo, File workingDirectory, String tag ) throws ScmException
  +    public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag ) throws ScmException
       {
           CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
   
  @@ -48,7 +47,7 @@
   
           cl.setExecutable( "cvs" );
   
  -        cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
  +        cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
   
           cl.createArgument().setValue( "-d" );
   
  
  
  
  1.5       +4 -9      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommand.java
  
  Index: CvsUpdateCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsUpdateCommand.java	29 Oct 2004 17:24:47 -0000	1.4
  +++ CvsUpdateCommand.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,15 +16,12 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.update.AbstractUpdateCommand;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   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;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
  @@ -38,16 +35,14 @@
       extends AbstractUpdateCommand
       implements CvsCommand
   {
  -    public UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, File workingDirectory, String tag )
  +    public UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
           throws ScmException
       {
  -        CvsScmProviderRepository repository = (CvsScmProviderRepository) repo;
  -
           Commandline cl = new Commandline();
   
           cl.setExecutable( "cvs" );
   
  -        cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
  +        cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
   
           cl.createArgument().setValue( "-q" );
   
  
  
  
  1.4       +4 -5      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java
  
  Index: CvsUpdateConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CvsUpdateConsumer.java	28 Oct 2004 13:06:21 -0000	1.3
  +++ CvsUpdateConsumer.java	24 Dec 2004 03:04:45 -0000	1.4
  @@ -16,14 +16,13 @@
    * limitations under the License.
    */
   
  -import java.util.ArrayList;
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  -
   import org.codehaus.plexus.logging.Logger;
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.4       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java
  
  Index: AbstractCvsConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/AbstractCvsConsumer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCvsConsumer.java	28 Oct 2004 13:06:21 -0000	1.3
  +++ AbstractCvsConsumer.java	24 Dec 2004 03:04:45 -0000	1.4
  @@ -16,14 +16,13 @@
    * limitations under the License.
    */
   
  -import java.util.ArrayList;
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  -
  -import org.codehaus.plexus.util.cli.StreamConsumer;
   import org.codehaus.plexus.logging.Logger;
  +import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @deprecated 
  
  
  
  1.5       +3 -4      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java
  
  Index: CvsScmProvider.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/CvsScmProvider.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CvsScmProvider.java	2 Nov 2004 22:18:54 -0000	1.4
  +++ CvsScmProvider.java	24 Dec 2004 03:04:45 -0000	1.5
  @@ -16,14 +16,13 @@
    * limitations under the License.
    */
   
  -import java.util.Map;
  -
   import org.apache.maven.scm.provider.AbstractScmProvider;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepositoryException;
  -
   import org.codehaus.plexus.util.StringUtils;
  +
  +import java.util.Map;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  
  
  
  1.6       +4 -5      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java
  
  Index: CvsChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogCommandTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsChangeLogCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  +++ CvsChangeLogCommandTest.java	24 Dec 2004 03:04:45 -0000	1.6
  @@ -16,13 +16,12 @@
    * limitations under the License.
    */
   
  -import java.util.Date;
  -import java.util.List;
  -
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  -import org.apache.maven.scm.ScmFileSet;
  +
  +import java.util.Date;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  
  
  
  1.4       +4 -4      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java
  
  Index: CvsChangeLogConsumerTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/changelog/CvsChangeLogConsumerTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CvsChangeLogConsumerTest.java	28 Oct 2004 13:06:21 -0000	1.3
  +++ CvsChangeLogConsumerTest.java	24 Dec 2004 03:04:45 -0000	1.4
  @@ -16,15 +16,15 @@
    * limitations under the License.
    */
   
  +import org.apache.maven.scm.command.changelog.ChangeLogEntry;
  +import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  +
   import java.io.BufferedReader;
   import java.io.File;
   import java.io.FileInputStream;
   import java.io.InputStreamReader;
   import java.util.Collection;
   import java.util.Iterator;
  -
  -import org.apache.maven.scm.command.changelog.ChangeLogEntry;
  -import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.6       +7 -8      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommandTest.java
  
  Index: CvsCheckInCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkin/CvsCheckInCommandTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsCheckInCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  +++ CvsCheckInCommandTest.java	24 Dec 2004 03:04:46 -0000	1.6
  @@ -16,20 +16,19 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.FileWriter;
  -import java.io.PrintWriter;
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmFile;
  -import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmFileSet;
  +import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.FileUtils;
  +
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.PrintWriter;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.6       +4 -4      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java
  
  Index: CvsCheckoutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/checkout/CvsCheckoutCommandTest.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CvsCheckoutCommandTest.java	24 Dec 2004 01:21:35 -0000	1.5
  +++ CvsCheckoutCommandTest.java	24 Dec 2004 03:04:46 -0000	1.6
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
  +
  +import java.io.File;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.7       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java
  
  Index: CvsUpdateCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateCommandTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CvsUpdateCommandTest.java	24 Dec 2004 01:21:35 -0000	1.6
  +++ CvsUpdateCommandTest.java	24 Dec 2004 03:04:46 -0000	1.7
  @@ -16,18 +16,17 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.FileWriter;
  -
   import org.apache.maven.scm.ScmFile;
  -import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmFileSet;
  +import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.cvslib.AbstractCvsScmTest;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.FileUtils;
  +
  +import java.io.File;
  +import java.io.FileWriter;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.4       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java
  
  Index: AbstractCvsScmTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/test/java/org/apache/maven/scm/provider/cvslib/AbstractCvsScmTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCvsScmTest.java	31 Oct 2004 14:19:05 -0000	1.3
  +++ AbstractCvsScmTest.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,14 +16,13 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Calendar;
  -import java.util.Date;
  -
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.FileUtils;
  +
  +import java.io.File;
  +import java.util.Calendar;
  +import java.util.Date;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java
  
  Index: AbstractAddCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractAddCommand.java	26 Oct 2004 12:37:05 -0000	1.2
  +++ AbstractAddCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java
  
  Index: AbstractBranchCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractBranchCommand.java	26 Oct 2004 12:37:05 -0000	1.2
  +++ AbstractBranchCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.3       +9 -7      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
  
  Index: AbstractChangeLogCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractChangeLogCommand.java	26 Oct 2004 12:37:05 -0000	1.2
  +++ AbstractChangeLogCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,16 +16,16 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Date;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   
  +import java.util.Date;
  +
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
  @@ -33,10 +33,12 @@
   public abstract class AbstractChangeLogCommand
       extends AbstractCommand
   {
  -    protected abstract ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repository, File workingDirectory, Date startDate, Date endDate, int numDays, String branch )
  +    protected abstract ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                                                   Date startDate, Date endDate, int numDays,
  +                                                                   String branch )
           throws ScmException;
   
  -    public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException
       {
           Date startDate = parameters.getDate( CommandParameter.START_DATE, null );
  @@ -57,6 +59,6 @@
               throw new ScmException( "The end date is set but the start date isn't." );
           }
   
  -        return executeChangeLogCommand( repository, workingDirectory, startDate, endDate, numDays, branch );
  +        return executeChangeLogCommand( repository, fileSet, startDate, endDate, numDays, branch );
       }
   }
  
  
  
  1.4       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java
  
  Index: ChangeLogScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ChangeLogScmResult.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ChangeLogScmResult.java	28 Oct 2004 13:00:48 -0000	1.3
  +++ ChangeLogScmResult.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmResult;
  +
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.4       +6 -8      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java
  
  Index: AbstractCheckInCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCheckInCommand.java	29 Oct 2004 11:43:28 -0000	1.3
  +++ AbstractCheckInCommand.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,11 +16,10 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.provider.ScmProviderRepository;
  @@ -35,18 +34,17 @@
   {
       public final static String NAME = "check-in";
   
  -    protected abstract CheckInScmResult executeCheckInCommand( ScmProviderRepository repository, File workingDirectory, String message, String tag, File[] files )
  +    protected abstract CheckInScmResult executeCheckInCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                                               String message, String tag )
           throws ScmException;
   
  -    public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException
       {
           String message = parameters.getString( CommandParameter.MESSAGE );
   
           String tag = parameters.getString( CommandParameter.TAG, null );
   
  -        File[] files = parameters.getFileArray( CommandParameter.FILES, new File[ 0 ] );
  -
  -        return executeCheckInCommand( repository, workingDirectory, message, tag, files );
  +        return executeCheckInCommand( repository, fileSet, message, tag );
       }
   }
  
  
  
  1.4       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
  
  Index: CheckInScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CheckInScmResult.java	28 Oct 2004 13:00:48 -0000	1.3
  +++ CheckInScmResult.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmResult;
  +
  +import java.util.List;
   
   
   /**
  
  
  
  1.3       +7 -8      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
  
  Index: AbstractCheckOutCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractCheckOutCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractCheckOutCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,11 +16,10 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.provider.ScmProviderRepository;
  @@ -33,16 +32,16 @@
   public abstract class AbstractCheckOutCommand
       extends AbstractCommand
   {
  -    protected abstract CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repository, File workingDirectory, String tag, File[] files )
  +    protected abstract CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repository,
  +                                                                 ScmFileSet fileSet, String tag )
           throws ScmException;
   
  -    public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                     CommandParameters parameters )
           throws ScmException
       {
           String tag = parameters.getString( CommandParameter.TAG, null );
   
  -        File[] files = parameters.getFileArray( CommandParameter.FILES, null );
  -
  -        return executeCheckOutCommand( repository, workingDirectory, tag, files );
  +        return executeCheckOutCommand( repository, fileSet, tag );
       }
   }
  
  
  
  1.4       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
  
  Index: CheckOutScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CheckOutScmResult.java	28 Oct 2004 13:00:48 -0000	1.3
  +++ CheckOutScmResult.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmResult;
  +
  +import java.util.List;
   
   
   /**
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java
  
  Index: AbstractDiffCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractDiffCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractDiffCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * TODO: Better support for entire filesets.
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/fileinfo/AbstractFileInfoCommand.java
  
  Index: AbstractFileInfoCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/fileinfo/AbstractFileInfoCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractFileInfoCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractFileInfoCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java
  
  Index: AbstractListFilesCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/listfiles/AbstractListFilesCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractListFilesCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractListFilesCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/lock/AbstractLockCommand.java
  
  Index: AbstractLockCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/lock/AbstractLockCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractLockCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractLockCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java
  
  Index: AbstractRemoveCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractRemoveCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractRemoveCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,14 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +5 -6      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
  
  Index: AbstractTagCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractTagCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractTagCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,11 +16,10 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.provider.ScmProviderRepository;
  @@ -33,14 +32,14 @@
   public abstract class AbstractTagCommand
       extends AbstractCommand
   {
  -    protected abstract ScmResult executeTagCommand( ScmProviderRepository repository, File workingDirectory, String tag )
  +    protected abstract ScmResult executeTagCommand( ScmProviderRepository repository, ScmFileSet fileSet, String tag )
           throws ScmException;
   
  -    public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException
       {
           String tag = parameters.getString( CommandParameter.TAG );
   
  -        return executeTagCommand( repository, workingDirectory, tag );
  +        return executeTagCommand( repository, fileSet, tag );
       }
   }
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java
  
  Index: TagScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/TagScmResult.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TagScmResult.java	2 Nov 2004 22:00:33 -0000	1.2
  +++ TagScmResult.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmResult;
  +
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java
  
  Index: AbstractUnlockCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractUnlockCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractUnlockCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,13 +16,13 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.repository.ScmRepository;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  
  
  
  1.3       +7 -6      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java
  
  Index: AbstractUpdateCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractUpdateCommand.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ AbstractUpdateCommand.java	24 Dec 2004 03:04:46 -0000	1.3
  @@ -16,11 +16,10 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameter;
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.AbstractCommand;
   import org.apache.maven.scm.provider.ScmProviderRepository;
  @@ -33,14 +32,16 @@
   public abstract class AbstractUpdateCommand
       extends AbstractCommand
   {
  -    protected abstract UpdateScmResult executeUpdateCommand( ScmProviderRepository repository, File workingDirectory, String tag )
  +    protected abstract UpdateScmResult executeUpdateCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                                             String tag )
           throws ScmException;
   
  -    public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                     CommandParameters parameters )
           throws ScmException
       {
           String tag = parameters.getString( CommandParameter.TAG, null );
   
  -        return executeUpdateCommand( repository, workingDirectory, tag );
  +        return executeUpdateCommand( repository, fileSet, tag );
       }
   }
  
  
  
  1.4       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java
  
  Index: UpdateScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResult.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- UpdateScmResult.java	28 Oct 2004 13:00:48 -0000	1.3
  +++ UpdateScmResult.java	24 Dec 2004 03:04:46 -0000	1.4
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.ScmResult;
  +
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.4       +8 -9      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java
  
  Index: AbstractCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractCommand.java	28 Oct 2004 13:00:48 -0000	1.3
  +++ AbstractCommand.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,13 +16,11 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.provider.ScmProviderRepository;
  -
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   
   /**
  @@ -34,10 +32,11 @@
       extends AbstractLogEnabled
       implements Command
   {
  -    protected abstract ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    protected abstract ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
  +                                                 CommandParameters parameters )
           throws ScmException;
   
  -    public final ScmResult execute( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public final ScmResult execute( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException
       {
           if ( repository == null )
  @@ -45,14 +44,14 @@
               throw new NullPointerException( "repository cannot be null" );
           }
   
  -        if ( workingDirectory == null )
  +        if ( fileSet == null )
           {
  -            throw new NullPointerException( "workingDirectory cannot be null" );
  +            throw new NullPointerException( "fileSet cannot be null" );
           }
   
           try
           {
  -            return executeCommand( repository, workingDirectory, parameters );
  +            return executeCommand( repository, fileSet, parameters );
           }
           catch( Exception ex )
           {
  
  
  
  1.3       +3 -4      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java
  
  Index: Command.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Command.java	26 Oct 2004 12:37:05 -0000	1.2
  +++ Command.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,10 +16,9 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   
  @@ -32,6 +31,6 @@
   {
       String ROLE = Command.class.getName();
   
  -    ScmResult execute( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    ScmResult execute( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException;
   }
  
  
  
  1.7       +8 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/DefaultScmManager.java
  
  Index: DefaultScmManager.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/DefaultScmManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultScmManager.java	24 Dec 2004 01:21:35 -0000	1.6
  +++ DefaultScmManager.java	24 Dec 2004 03:04:47 -0000	1.7
  @@ -16,7 +16,12 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.scm.*;
  +import org.apache.maven.scm.CommandNameConstants;
  +import org.apache.maven.scm.CommandParameter;
  +import org.apache.maven.scm.CommandParameters;
  +import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
  +import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
  @@ -198,7 +203,7 @@
           ScmProvider scmProvider = getScmProvider( repository.getProvider() );
   
           // TODO: actually, probably passing fileset here too
  -        return scmProvider.execute( commandName, repository.getProviderRepository(), fileSet.getBasedir(), parameters );
  +        return scmProvider.execute( commandName, repository.getProviderRepository(), fileSet, parameters );
       }
   
       // ----------------------------------------------------------------------
  
  
  
  1.5       +3 -3      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java
  
  Index: ScmManager.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/manager/ScmManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ScmManager.java	24 Dec 2004 01:21:35 -0000	1.4
  +++ ScmManager.java	24 Dec 2004 03:04:47 -0000	1.5
  @@ -16,8 +16,6 @@
    * limitations under the License.
    */
   
  -import java.util.Date;
  -
   import org.apache.maven.scm.ScmException;
   import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
  @@ -27,6 +25,8 @@
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.repository.ScmRepository;
   import org.apache.maven.scm.repository.ScmRepositoryException;
  +
  +import java.util.Date;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.4       +9 -9      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java
  
  Index: AbstractScmProvider.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- AbstractScmProvider.java	28 Oct 2004 23:26:48 -0000	1.3
  +++ AbstractScmProvider.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,20 +16,19 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Collections;
  -import java.util.Iterator;
  -import java.util.Map;
  -
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.NoSuchCommandScmException;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.command.Command;
  -
   import org.codehaus.plexus.logging.AbstractLogEnabled;
   import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
   
  +import java.util.Collections;
  +import java.util.Iterator;
  +import java.util.Map;
  +
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
  @@ -77,12 +76,13 @@
       // Scm Implementation
       // ----------------------------------------------------------------------
   
  -    public ScmResult execute( String commandName, ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    public ScmResult execute( String commandName, ScmProviderRepository repository, ScmFileSet fileSet,
  +                              CommandParameters parameters )
           throws ScmException
       {
           Command command = getCommand( commandName );
   
  -        return command.execute( repository, workingDirectory, parameters );
  +        return command.execute( repository, fileSet, parameters );
       }
   
       // ----------------------------------------------------------------------
  
  
  
  1.4       +3 -4      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
  
  Index: ScmProvider.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ScmProvider.java	28 Oct 2004 23:26:48 -0000	1.3
  +++ ScmProvider.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,10 +16,9 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.CommandParameters;
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmResult;
   import org.apache.maven.scm.repository.ScmRepositoryException;
   
  @@ -36,6 +35,6 @@
       ScmProviderRepository makeProviderScmRepository( String scmSpecificUrl, String delimiter )
       	throws ScmRepositoryException;
   
  -    ScmResult execute( String commandName, ScmProviderRepository repository, File workingDirectory, CommandParameters parameters )
  +    ScmResult execute( String commandName, ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
           throws ScmException;
   }
  
  
  
  1.2       +14 -2     maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java
  
  Index: ScmFileSet.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ScmFileSet.java	24 Dec 2004 01:21:35 -0000	1.1
  +++ ScmFileSet.java	24 Dec 2004 03:04:47 -0000	1.2
  @@ -29,10 +29,12 @@
   
       private ScmFile[] files;
   
  +    private static final ScmFile[] EMPTY_FILE_ARRAY = new ScmFile[0];
  +
       public ScmFileSet( File basedir )
       {
  +        this( basedir, EMPTY_FILE_ARRAY );
           this.basedir = basedir;
  -        this.files = null;
       }
   
       public ScmFileSet( File basedir, String includes, String excludes )
  @@ -44,6 +46,16 @@
   
       public ScmFileSet( File basedir, ScmFile[] files )
       {
  +        if ( basedir == null )
  +        {
  +            throw new NullPointerException( "basedir must not be null" );
  +        }
  +
  +        if ( files == null )
  +        {
  +            throw new NullPointerException( "files must not be null" );
  +        }
  +
           this.basedir = basedir;
           this.files = files;
       }
  
  
  
  1.10      +6 -7      maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTestCase.java
  
  Index: ScmTestCase.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTestCase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ScmTestCase.java	24 Dec 2004 01:21:35 -0000	1.9
  +++ ScmTestCase.java	24 Dec 2004 03:04:47 -0000	1.10
  @@ -16,20 +16,19 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.FileWriter;
  -import java.io.IOException;
  -
  +import junit.framework.TestCase;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.PlexusTestCase;
   import org.codehaus.plexus.util.FileUtils;
   import org.codehaus.plexus.util.StringUtils;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer;
   import org.codehaus.plexus.util.cli.Commandline;
  -import junit.framework.TestCase;
  +
  +import java.io.File;
  +import java.io.FileWriter;
  +import java.io.IOException;
   
   /**
    * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
  
  
  
  1.3       +4 -6      maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/command/changelog/ChangeLogEntryTest.java
  
  Index: ChangeLogEntryTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/command/changelog/ChangeLogEntryTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ChangeLogEntryTest.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ ChangeLogEntryTest.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,14 +16,12 @@
    * limitations under the License.
    */
   
  -import java.util.Calendar;
  -import java.util.Date;
  -
  +import junit.framework.TestCase;
   import org.apache.maven.scm.command.changelog.ChangeLogEntry;
   import org.apache.maven.scm.command.changelog.ChangeLogFile;
   
  -
  -import junit.framework.TestCase;
  +import java.util.Calendar;
  +import java.util.Date;
   
   /**
    * Tests for the {@link ChangeLogEntry}class
  
  
  
  1.3       +1 -2      maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/command/changelog/ChangeLogFileTest.java
  
  Index: ChangeLogFileTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/command/changelog/ChangeLogFileTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ChangeLogFileTest.java	26 Oct 2004 12:37:06 -0000	1.2
  +++ ChangeLogFileTest.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,9 +16,8 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.scm.command.changelog.ChangeLogFile;
  -
   import junit.framework.TestCase;
  +import org.apache.maven.scm.command.changelog.ChangeLogFile;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse </a>
  
  
  
  1.4       +2 -2      maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java
  
  Index: ScmManagerTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-api/src/test/java/org/apache/maven/scm/manager/ScmManagerTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ScmManagerTest.java	24 Dec 2004 01:21:35 -0000	1.3
  +++ ScmManagerTest.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,8 +16,8 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.ScmFileSet;
  +import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.manager.NoSuchScmProviderException;
   import org.apache.maven.scm.manager.ScmManager;
   
  
  
  
  1.4       +12 -10    maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java
  
  Index: SvnChangeLogCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommand.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnChangeLogCommand.java	9 Nov 2004 16:07:16 -0000	1.3
  +++ SvnChangeLogCommand.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,20 +16,20 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.text.SimpleDateFormat;
  -import java.util.Date;
  -import java.util.TimeZone;
  -
   import org.apache.maven.scm.ScmException;
  +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.provider.ScmProviderRepository;
  -import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.provider.svn.command.SvnCommand;
  -
  +import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.io.File;
  +import java.text.SimpleDateFormat;
  +import java.util.Date;
  +import java.util.TimeZone;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
    * @version $Id$
  @@ -40,10 +40,12 @@
   {
       private final static String DATE_FORMAT = "yyyy/MM/dd 'GMT'";
   
  -    protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, File workingDirectory, Date startDate, Date endDate, int numDays, String branch )
  +    protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
  +                                                          Date startDate, Date endDate, int numDays, String branch )
           throws ScmException
       {
  -        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, workingDirectory, branch, startDate, endDate );
  +        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, fileSet.getBasedir(), branch, startDate,
  +                                            endDate );
   
           SvnChangeLogConsumer consumer = new SvnChangeLogConsumer();
   
  
  
  
  1.4       +7 -8      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumer.java
  
  Index: SvnChangeLogConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnChangeLogConsumer.java	9 Nov 2004 16:07:16 -0000	1.3
  +++ SvnChangeLogConsumer.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,18 +16,17 @@
    * limitations under the License.
    */
   
  -import java.text.ParseException;
  -import java.text.SimpleDateFormat;
  -import java.util.ArrayList;
  -import java.util.Date;
  -import java.util.List;
  -
   import org.apache.maven.scm.command.changelog.ChangeLogEntry;
   import org.apache.maven.scm.command.changelog.ChangeLogFile;
   import org.apache.regexp.RE;
   import org.apache.regexp.RESyntaxException;
  -
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.text.ParseException;
  +import java.text.SimpleDateFormat;
  +import java.util.ArrayList;
  +import java.util.Date;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.2       +12 -11    maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommand.java
  
  Index: SvnCheckInCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommand.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SvnCheckInCommand.java	17 Dec 2004 19:53:41 -0000	1.1
  +++ SvnCheckInCommand.java	24 Dec 2004 03:04:47 -0000	1.2
  @@ -16,21 +16,21 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.IOException;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkin.AbstractCheckInCommand;
   import org.apache.maven.scm.command.checkin.CheckInScmResult;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
  -
   import org.codehaus.plexus.util.FileUtils;
   import org.codehaus.plexus.util.StringUtils;
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.io.File;
  +import java.io.IOException;
  +
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
    * @version $Id$
  @@ -38,11 +38,12 @@
   public class SvnCheckInCommand
       extends AbstractCheckInCommand
   {
  -    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, File workingDirectory,
  -                                                      String message, String tag, File[] files )
  +    protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
  +                                                      String tag )
           throws ScmException
       {
  -        if ( files.length != 0 )
  +        // TODO: it should
  +        if ( fileSet.getFiles().length != 0 )
           {
               throw new ScmException( "This command can only commit entire working directories." );
           }
  @@ -63,13 +64,13 @@
               return new CheckInScmResult( "Error while making a temporary file for the commit message: " + ex.getMessage(), null, false );
           }
   
  -        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, workingDirectory, messageFile );
  +        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, fileSet.getBasedir(), messageFile );
   
  -        SvnCheckInConsumer consumer = new SvnCheckInConsumer( getLogger(), workingDirectory.getParentFile() );
  +        SvnCheckInConsumer consumer = new SvnCheckInConsumer( getLogger(), fileSet.getBasedir().getParentFile() );
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
  -        getLogger().info( "Working directory: " + workingDirectory.getAbsolutePath() );
  +        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
           getLogger().info( "Command line: " + cl );
   
           int exitCode;
  
  
  
  1.2       +6 -7      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInConsumer.java
  
  Index: SvnCheckInConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInConsumer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SvnCheckInConsumer.java	17 Dec 2004 19:53:41 -0000	1.1
  +++ SvnCheckInConsumer.java	24 Dec 2004 03:04:47 -0000	1.2
  @@ -16,15 +16,14 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.io.File;
  -
  -import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmFile;
  -
  +import org.apache.maven.scm.ScmFileStatus;
   import org.codehaus.plexus.logging.Logger;
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.io.File;
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.5       +8 -8      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommand.java
  
  Index: SvnCheckOutCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SvnCheckOutCommand.java	12 Dec 2004 22:33:53 -0000	1.4
  +++ SvnCheckOutCommand.java	24 Dec 2004 03:04:47 -0000	1.5
  @@ -16,19 +16,19 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.checkout.AbstractCheckOutCommand;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.svn.command.SvnCommand;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.io.File;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
    * @version $Id$
  @@ -37,18 +37,18 @@
       extends AbstractCheckOutCommand
       implements SvnCommand
   {
  -    protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, File workingDirectory, String tag, File[] files )
  +    protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
           throws ScmException
       {
  -        Commandline cl = createCommandLine( (SvnScmProviderRepository)repo, workingDirectory, tag );
  +        Commandline cl = createCommandLine( (SvnScmProviderRepository)repo, fileSet.getBasedir(), tag );
   
  -        SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(), workingDirectory.getParentFile() );
  +        SvnCheckOutConsumer consumer = new SvnCheckOutConsumer( getLogger(), fileSet.getBasedir().getParentFile() );
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
           int exitCode;
   
  -        getLogger().info( "Working directory: " + workingDirectory.getAbsolutePath() );
  +        getLogger().info( "Working directory: " + fileSet.getBasedir().getAbsolutePath() );
           getLogger().info( "Command line: " + cl );
   
           try
  
  
  
  1.2       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java
  
  Index: SvnCheckOutConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutConsumer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SvnCheckOutConsumer.java	9 Nov 2004 16:07:17 -0000	1.1
  +++ SvnCheckOutConsumer.java	24 Dec 2004 03:04:47 -0000	1.2
  @@ -16,15 +16,14 @@
    * limitations under the License.
    */
   
  -import java.util.ArrayList;
  -import java.util.List;
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileStatus;
  -
   import org.codehaus.plexus.logging.Logger;
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.io.File;
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.2       +3 -3      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/ScmUpdateScmResult.java
  
  Index: ScmUpdateScmResult.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/ScmUpdateScmResult.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ScmUpdateScmResult.java	13 Dec 2004 01:01:19 -0000	1.1
  +++ ScmUpdateScmResult.java	24 Dec 2004 03:04:47 -0000	1.2
  @@ -16,9 +16,9 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -
   import org.apache.maven.scm.command.update.UpdateScmResult;
  +
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.5       +7 -7      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommand.java
  
  Index: SvnUpdateCommand.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommand.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SvnUpdateCommand.java	12 Dec 2004 22:34:24 -0000	1.4
  +++ SvnUpdateCommand.java	24 Dec 2004 03:04:47 -0000	1.5
  @@ -16,19 +16,19 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmException;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.update.AbstractUpdateCommand;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.svn.command.SvnCommand;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
  -
   import org.codehaus.plexus.util.cli.CommandLineException;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
   
  +import java.io.File;
  +
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
    * @version $Id$
  @@ -37,12 +37,12 @@
       extends AbstractUpdateCommand
       implements SvnCommand
   {
  -    protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, File workingDirectory, String tag )
  +    protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag )
           throws ScmException
       {
  -        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, workingDirectory, tag );
  +        Commandline cl = createCommandLine( (SvnScmProviderRepository) repo, fileSet.getBasedir(), tag );
   
  -        SvnUpdateConsumer consumer = new SvnUpdateConsumer( getLogger(), workingDirectory );
  +        SvnUpdateConsumer consumer = new SvnUpdateConsumer( getLogger(), fileSet.getBasedir() );
   
           CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
   
  
  
  
  1.3       +6 -7      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java
  
  Index: SvnUpdateConsumer.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateConsumer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnUpdateConsumer.java	12 Dec 2004 22:34:24 -0000	1.2
  +++ SvnUpdateConsumer.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,15 +16,14 @@
    * limitations under the License.
    */
   
  -import java.util.List;
  -import java.util.ArrayList;
  -import java.io.File;
  -
  -import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmFile;
  -
  +import org.apache.maven.scm.ScmFileStatus;
   import org.codehaus.plexus.logging.Logger;
   import org.codehaus.plexus.util.cli.StreamConsumer;
  +
  +import java.io.File;
  +import java.util.ArrayList;
  +import java.util.List;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.3       +3 -3      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java
  
  Index: SvnScmProvider.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnScmProvider.java	12 Dec 2004 22:32:08 -0000	1.2
  +++ SvnScmProvider.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,12 +16,12 @@
    * limitations under the License.
    */
   
  -import java.util.Map;
  -
   import org.apache.maven.scm.provider.AbstractScmProvider;
   import org.apache.maven.scm.provider.ScmProviderRepository;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepositoryException;
  +
  +import java.util.Map;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.4       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommandTest.java
  
  Index: SvnChangeLogCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogCommandTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnChangeLogCommandTest.java	9 Nov 2004 16:07:17 -0000	1.3
  +++ SvnChangeLogCommandTest.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,15 +16,14 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Calendar;
  -import java.util.Date;
  -
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.cli.Commandline;
  +
  +import java.io.File;
  +import java.util.Calendar;
  +import java.util.Date;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +3 -4      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommandTest.java
  
  Index: SvnCheckInCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkin/SvnCheckInCommandTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnCheckInCommandTest.java	24 Dec 2004 01:22:17 -0000	1.2
  +++ SvnCheckInCommandTest.java	24 Dec 2004 03:04:47 -0000	1.3
  @@ -16,13 +16,12 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.cli.Commandline;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.4       +2 -4      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTckTest.java
  
  Index: SvnCheckOutCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTckTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnCheckOutCommandTckTest.java	24 Dec 2004 01:22:17 -0000	1.3
  +++ SvnCheckOutCommandTckTest.java	24 Dec 2004 03:04:47 -0000	1.4
  @@ -16,10 +16,8 @@
    * limitations under the License.
    */
   
  -import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
   import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
  -
  -import org.codehaus.plexus.util.StringUtils;
  +import org.apache.maven.scm.tck.command.checkout.CheckOutCommandTckTest;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.5       +3 -4      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTest.java
  
  Index: SvnCheckOutCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/checkout/SvnCheckOutCommandTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SvnCheckOutCommandTest.java	12 Dec 2004 22:32:08 -0000	1.4
  +++ SvnCheckOutCommandTest.java	24 Dec 2004 03:04:47 -0000	1.5
  @@ -16,14 +16,13 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.cli.Commandline;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.4       +4 -6      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTckTest.java
  
  Index: SvnUpdateCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTckTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SvnUpdateCommandTckTest.java	24 Dec 2004 01:22:17 -0000	1.3
  +++ SvnUpdateCommandTckTest.java	24 Dec 2004 03:04:48 -0000	1.4
  @@ -16,13 +16,11 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
  -import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
  -import org.apache.maven.scm.repository.ScmRepository;
   import org.apache.maven.scm.provider.svn.SvnScmTestUtils;
  +import org.apache.maven.scm.repository.ScmRepository;
  +import org.apache.maven.scm.tck.command.update.UpdateCommandTckTest;
   
  -import org.codehaus.plexus.util.StringUtils;
  +import java.io.File;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.5       +3 -4      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTest.java
  
  Index: SvnUpdateCommandTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/update/SvnUpdateCommandTest.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SvnUpdateCommandTest.java	17 Dec 2004 19:53:15 -0000	1.4
  +++ SvnUpdateCommandTest.java	24 Dec 2004 03:04:48 -0000	1.5
  @@ -16,13 +16,12 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -
   import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.util.cli.Commandline;
  +
  +import java.io.File;
   
   /**
    * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  
  
  
  1.3       +5 -6      maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java
  
  Index: SvnScmTestUtils.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/SvnScmTestUtils.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SvnScmTestUtils.java	24 Dec 2004 01:22:17 -0000	1.2
  +++ SvnScmTestUtils.java	24 Dec 2004 03:04:48 -0000	1.3
  @@ -16,16 +16,15 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.io.FileInputStream;
  -
  +import junit.framework.Assert;
   import org.apache.maven.scm.ScmTestCase;
  -
   import org.codehaus.plexus.util.FileUtils;
   import org.codehaus.plexus.util.StringUtils;
   import org.codehaus.plexus.util.cli.CommandLineUtils;
   import org.codehaus.plexus.util.cli.Commandline;
  -import junit.framework.Assert;
  +
  +import java.io.File;
  +import java.io.FileInputStream;
   
   /**
    * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  
  
  
  1.3       +8 -9      maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java
  
  Index: CheckOutCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/checkout/CheckOutCommandTckTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CheckOutCommandTckTest.java	24 Dec 2004 01:21:35 -0000	1.2
  +++ CheckOutCommandTckTest.java	24 Dec 2004 03:04:48 -0000	1.3
  @@ -16,21 +16,20 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.List;
  -import java.util.SortedSet;
  -import java.util.TreeSet;
  -import java.util.Iterator;
  -
  -import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.ScmFile;
   import org.apache.maven.scm.ScmFileSet;
  +import org.apache.maven.scm.ScmTestCase;
   import org.apache.maven.scm.command.checkout.CheckOutScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.PlexusTestCase;
   import org.codehaus.plexus.util.FileUtils;
  +
  +import java.io.File;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.SortedSet;
  +import java.util.TreeSet;
   
   /**
    * This test tests the check out command.
  
  
  
  1.3       +7 -8      maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java
  
  Index: UpdateCommandTckTest.java
  ===================================================================
  RCS file: /home/cvs/maven-scm/maven-scm-test/src/main/java/org/apache/maven/scm/tck/command/update/UpdateCommandTckTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UpdateCommandTckTest.java	24 Dec 2004 01:21:35 -0000	1.2
  +++ UpdateCommandTckTest.java	24 Dec 2004 03:04:48 -0000	1.3
  @@ -16,21 +16,20 @@
    * limitations under the License.
    */
   
  -import java.io.File;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.TreeSet;
  -
   import org.apache.maven.scm.ScmFile;
  +import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.ScmFileStatus;
   import org.apache.maven.scm.ScmTestCase;
  -import org.apache.maven.scm.ScmFileSet;
   import org.apache.maven.scm.command.update.UpdateScmResult;
   import org.apache.maven.scm.manager.ScmManager;
   import org.apache.maven.scm.repository.ScmRepository;
  -
   import org.codehaus.plexus.PlexusTestCase;
   import org.codehaus.plexus.util.FileUtils;
  +
  +import java.io.File;
  +import java.util.Iterator;
  +import java.util.List;
  +import java.util.TreeSet;
   
   /**
    * This test tests the update command.
  
  
  

Mime
View raw message