maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r369175 - in /maven/scm/trunk: maven-scm-api/ maven-scm-api/src/main/java/org/apache/maven/scm/manager/ maven-scm-client/ maven-scm-managers/maven-scm-manager-plexus/ maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/mave...
Date Sun, 15 Jan 2006 03:57:45 GMT
Author: evenisse
Date: Sat Jan 14 19:57:37 2006
New Revision: 369175

URL: http://svn.apache.org/viewcvs?rev=369175&view=rev
Log:
Clean imports and unused code

Modified:
    maven/scm/trunk/maven-scm-api/   (props changed)
    maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
    maven/scm/trunk/maven-scm-client/   (props changed)
    maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/   (props changed)
    maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
    maven/scm/trunk/maven-scm-plugin/   (props changed)
    maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/   (props changed)
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/util/Entry.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
    maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
    maven/scm/trunk/maven-scm-test/   (props changed)

Propchange: maven/scm/trunk/maven-scm-api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
(original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java
Sat Jan 14 19:57:37 2006
@@ -54,7 +54,7 @@
         this.scmProviders = providers;
     }
 
-    private void addScmProvider( String providerType, ScmProvider provider )
+    protected void addScmProvider( String providerType, ScmProvider provider )
     {
         scmProviders.put( providerType, provider );
     }

Propchange: maven/scm/trunk/maven-scm-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Propchange: maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -1,3 +1,4 @@
 .classpath
 .project
 target
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
(original)
+++ maven/scm/trunk/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
Sat Jan 14 19:57:37 2006
@@ -18,20 +18,11 @@
 
 import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.manager.AbstractScmManager;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.provider.ScmProvider;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.scm.repository.UnknownRepositoryStructure;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
 
-import java.io.File;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**

Propchange: maven/scm/trunk/maven-scm-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -1,3 +1,4 @@
 target
 .classpath
 .project
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
(original)
+++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
Sat Jan 14 19:57:37 2006
@@ -16,14 +16,11 @@
  * limitations under the License.
  */
 
-import java.io.IOException;
+import org.apache.maven.plugin.MojoExecutionException;
+
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.repository.ScmRepository;
-
 /**
  * Validate scm connection string
  * @goal validate
@@ -56,7 +53,7 @@
         {
             validateConnection( getConnectionUrl(), "connectionUrl" );
         }
-        catch( NullPointerException e )
+        catch ( NullPointerException e )
         {
             // nothing to do. connectionUrl isn't define
         }
@@ -86,10 +83,11 @@
 
             Iterator iter = messages.iterator();
 
-            while (iter.hasNext()) {
+            while ( iter.hasNext() )
+            {
                 getLog().error( iter.next().toString() );
             }
-            
+
             throw new MojoExecutionException( "Command failed." );
         }
         else

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-clearcase/src/main/java/org/apache/maven/scm/provider/clearcase/command/changelog/ClearCaseChangeLogConsumer.java
Sat Jan 14 19:57:37 2006
@@ -50,12 +50,6 @@
 
     private static final String COMMENT_TAG = "COMM:";
 
-    /**
-     * Custom date/time formatter.  Rounds ChangeLogEntry times to the nearest
-     * minute.
-     */
-    private static final SimpleDateFormat ENTRY_KEY_TIMESTAMP_FORMAT = new SimpleDateFormat(
"yyyyMMddHHmm" );
-
     private List entries = new ArrayList();
 
     // state machine constants for reading clearcase lshistory command output

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-cvs/src/main/java/org/apache/maven/scm/provider/cvslib/command/diff/CvsDiffConsumer.java
Sat Jan 14 19:57:37 2006
@@ -35,15 +35,15 @@
 public class CvsDiffConsumer
     implements StreamConsumer
 {
-//
-// Index: plugin.jelly
-// ===================================================================
-// RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/resources/META-INF/plexus/components.xml,v
-// retrieving revision 1.2
-// diff -u -r1.2 components.xml
-// --- plugin.jelly        (revision 124799)
-// +++ plugin.jelly        (working copy)
-//
+    //
+    // Index: plugin.jelly
+    // ===================================================================
+    // RCS file: /home/cvs/maven-scm/maven-scm-providers/maven-scm-provider-cvs/src/main/resources/META-INF/plexus/components.xml,v
+    // retrieving revision 1.2
+    // diff -u -r1.2 components.xml
+    // --- plugin.jelly        (revision 124799)
+    // +++ plugin.jelly        (working copy)
+    //
 
     private final static String RCS_TOKEN = "RCS file: ";
 
@@ -71,8 +71,6 @@
 
     private ScmLogger logger;
 
-    private File workingDirectory;
-
     private String currentFile;
 
     private StringBuffer currentDifference;
@@ -90,8 +88,6 @@
     public CvsDiffConsumer( ScmLogger logger, File workingDirectory )
     {
         this.logger = logger;
-
-        this.workingDirectory = workingDirectory;
     }
 
     // ----------------------------------------------------------------------
@@ -150,9 +146,9 @@
         {
             // skip, though could parse to verify command
         }
-        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
) ||
-            line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
) ||
-            line.equals( NO_NEWLINE_TOKEN ) )
+        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
)
+            || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
)
+            || line.equals( NO_NEWLINE_TOKEN ) )
         {
             // add to buffer
             currentDifference.append( line ).append( "\n" );

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-local/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/main/java/org/apache/maven/scm/provider/perforce/command/unedit/PerforceUnEditConsumer.java
Sat Jan 14 19:57:37 2006
@@ -36,8 +36,6 @@
 
     private static final String PATTERN = "^([^#]+)#\\d+ - (.*)";
 
-    private static final String FILE_BEGIN_TOKEN = "//";
-
     private static final int STATE_NORMAL = 1;
 
     private static final int STATE_ERROR = 2;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/checkout/PerforceCheckOutCommandTest.java
Sat Jan 14 19:57:37 2006
@@ -16,16 +16,14 @@
  * limitations under the License.
  */
 
-import java.io.File;
-
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.perforce.PerforceScmProvider;
 import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
 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>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -43,7 +41,8 @@
     public void testGetCommandLineWithHost()
         throws Exception
     {
-        testCommandLine( "scm:perforce:a:username@//depot/projects/pathname", "p4 -H a -u
username -ctest-test-maven sync -f @somelabel" );
+        testCommandLine( "scm:perforce:a:username@//depot/projects/pathname",
+                         "p4 -H a -u username -ctest-test-maven sync -f @somelabel" );
     }
 
     public void testGetCommandLineWithHostAndPort()
@@ -52,8 +51,9 @@
         testCommandLine( "scm:perforce:myhost:1234:username@//depot/projects/pathname",
                          "p4 -H myhost:1234 -u username -ctest-test-maven sync -f @somelabel"
);
     }
-    
-    public void testClean() {
+
+    public void testClean()
+    {
         String generated = PerforceScmProvider.clean( "p4 -u mr -P mypass -cclient sync ..."
);
         assertEquals( "p4 -u mr -P ****** -cclient sync ...", generated );
         assertEquals( "p4 sync ...", PerforceScmProvider.clean( "p4 sync ..." ) );
@@ -72,8 +72,8 @@
         ScmRepository repository = getScmManager().makeScmRepository( scmUrl );
         PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
             .getProviderRepository();
-        ScmFileSet files = new ScmFileSet( new File( "." ), new File[] { new File( "foo.xml"
), new File( "bar.xml" ) } );
-        Commandline cl = PerforceCheckOutCommand.createCommandLine( svnRepository, workingDirectory,
"somelabel", "test-test-maven" );
+        Commandline cl = PerforceCheckOutCommand.createCommandLine( svnRepository, workingDirectory,
"somelabel",
+                                                                    "test-test-maven" );
 
         assertEquals( commandLine, cl.toString() );
     }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/diff/PerforceDiffCommandTest.java
Sat Jan 14 19:57:37 2006
@@ -16,15 +16,13 @@
  * limitations under the License.
  */
 
-import java.io.File;
-
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
 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>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -55,8 +53,8 @@
         File workingDirectory = getTestFile( "target/perforce-diff-command-test" );
 
         ScmRepository repository = getScmManager().makeScmRepository( "scm:perforce://depot/projects/pathname"
);
-        PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
-        ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"),
new File("bar.xml") } );
+        PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
+            .getProviderRepository();
         Commandline cl = PerforceDiffCommand.createCommandLine( svnRepository, workingDirectory,
startRev, endRev );
 
         assertEquals( commandLine, cl.toString() );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/login/PerforceLoginCommandTest.java
Sat Jan 14 19:57:37 2006
@@ -16,16 +16,14 @@
  * limitations under the License.
  */
 
-import java.io.File;
-
 import org.apache.maven.scm.CommandParameters;
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
 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>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
@@ -50,9 +48,8 @@
         File workingDirectory = getTestFile( "target/perforce-login-command-test" );
 
         ScmRepository repository = getScmManager().makeScmRepository( "scm:perforce://depot/projects/pathname"
);
-        PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository.getProviderRepository();
-        ScmFileSet files = new ScmFileSet( new File("."), new File[] { new File("foo.xml"),
new File("bar.xml") } );
-        
+        PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
+            .getProviderRepository();
         CommandParameters params = new CommandParameters();
         Commandline cl = PerforceLoginCommand.createCommandLine( svnRepository, workingDirectory,
params );
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-perforce/src/test/java/org/apache/maven/scm/provider/perforce/command/status/PerforceStatusCommandTest.java
Sat Jan 14 19:57:37 2006
@@ -16,15 +16,13 @@
  * limitations under the License.
  */
 
-import java.io.File;
-
-import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmTestCase;
 import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
 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>
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l </a>
@@ -52,8 +50,6 @@
         ScmRepository repository = getScmManager().makeScmRepository( "scm:perforce://depot/projects/pathname"
);
         PerforceScmProviderRepository svnRepository = (PerforceScmProviderRepository) repository
             .getProviderRepository();
-        ScmFileSet files = new ScmFileSet( new File( "." ), new File[] { new File( "foo.xml"
), new File( "bar.xml" ) } );
-
         Commandline cl1 = PerforceStatusCommand.createOpenedCommandLine( svnRepository, workingDirectory
);
         assertEquals( expected, cl1.toString() );
     }

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/checkout/StarteamCheckOutConsumer.java
Sat Jan 14 19:57:37 2006
@@ -16,17 +16,15 @@
  * limitations under the License.
  */
 
-import org.apache.maven.scm.ScmException;
 import org.apache.maven.scm.ScmFile;
 import org.apache.maven.scm.ScmFileStatus;
 import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.provider.starteam.command.StarteamCommandLineUtils;
 import org.codehaus.plexus.util.cli.StreamConsumer;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
-import java.io.File;
-import java.io.IOException;
 
 /**
  * @author <a href="mailto:dantran@gmail.com">Dan T. Tran</a>
@@ -101,21 +99,21 @@
     private void processDirectory( String line, int pos )
     {
         String dirPath = line.substring( pos + DIR_MARKER.length(), line.length() - 1 ).replace(
'\\', '/' );
-        
-        try 
+
+        try
         {
             this.currentDir = StarteamCommandLineUtils.getRelativeChildDirectory( this.workingDirectory,
dirPath );
         }
         catch ( IllegalStateException e )
         {
             String error = "Working and checkout directories are not on the same tree";
-            
+
             logger.error( error );
-            
+
             logger.error( "Working directory: " + workingDirectory );
-            
+
             logger.error( "Checked out directory: " + dirPath );
-            
+
             throw new IllegalStateException( error );
         }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-starteam/src/main/java/org/apache/maven/scm/provider/starteam/command/diff/StarteamDiffConsumer.java
Sat Jan 14 19:57:37 2006
@@ -34,8 +34,6 @@
 public class StarteamDiffConsumer
     implements StreamConsumer
 {
-    private final static String FOLDER_TOKEN = "Folder: ";
-
     private final static String WORKING_DIR_TOKEN = "(working dir: ";
 
     private final static String PATCH_SEPARATOR_TOKEN = "--------------";
@@ -58,8 +56,6 @@
 
     private boolean revisionBlockStarted = false;
 
-    private File workingDirectory;
-
     private String currentFile;
 
     private StringBuffer currentDifference;
@@ -77,8 +73,6 @@
     public StarteamDiffConsumer( ScmLogger logger, File workingDirectory )
     {
         this.logger = logger;
-
-        this.workingDirectory = workingDirectory;
     }
 
     // ----------------------------------------------------------------------

Propchange: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/SvnScmProvider.java
Sat Jan 14 19:57:37 2006
@@ -159,8 +159,6 @@
     {
         ScmUrlParserResult result = new ScmUrlParserResult();
 
-        int at = scmSpecificUrl.indexOf( "@" );
-
         String url = scmSpecificUrl;
 
         String user = null;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
Sat Jan 14 19:57:37 2006
@@ -34,12 +34,12 @@
 public class SvnDiffConsumer
     implements StreamConsumer
 {
-//
-// Index: plugin.jelly
-// ===================================================================
-// --- plugin.jelly        (revision 124799)
-// +++ plugin.jelly        (working copy)
-//
+    //
+    // Index: plugin.jelly
+    // ===================================================================
+    // --- plugin.jelly        (revision 124799)
+    // +++ plugin.jelly        (working copy)
+    //
 
     private final static String INDEX_TOKEN = "Index: ";
 
@@ -49,10 +49,6 @@
 
     private final static String END_REVISION_TOKEN = "+++";
 
-    private final static String REVISION_TOKEN = "(revision";
-
-    private final static String WORKING_COPY_TOKEN = "(working copy";
-
     private final static String ADDED_LINE_TOKEN = "+";
 
     private final static String REMOVED_LINE_TOKEN = "-";
@@ -65,8 +61,6 @@
 
     private ScmLogger logger;
 
-    private File workingDirectory;
-
     private String currentFile;
 
     private StringBuffer currentDifference;
@@ -84,8 +78,6 @@
     public SvnDiffConsumer( ScmLogger logger, File workingDirectory )
     {
         this.logger = logger;
-
-        this.workingDirectory = workingDirectory;
     }
 
     // ----------------------------------------------------------------------
@@ -132,9 +124,9 @@
             // skip, though could parse to verify filename, end revision
             patch.append( line ).append( "\n" );
         }
-        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
) ||
-            line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
) ||
-            line.equals( NO_NEWLINE_TOKEN ) )
+        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
)
+            || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
)
+            || line.equals( NO_NEWLINE_TOKEN ) )
         {
             // add to buffer
             currentDifference.append( line ).append( "\n" );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/util/Entry.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/util/Entry.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/util/Entry.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/main/java/org/apache/maven/scm/provider/svn/util/Entry.java
Sat Jan 14 19:57:37 2006
@@ -1,25 +1,32 @@
-/*
- * $Id$
- */
-
 package org.apache.maven.scm.provider.svn.util;
 
-  //---------------------------------/
- //- Imported classes and packages -/
-//---------------------------------/
-
-import java.util.*;
+/*
+ * Copyright 2003-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 /**
  * Class Entry.
  * 
  * @version $Revision$ $Date$
  */
-public class Entry implements java.io.Serializable {
-
+public class Entry
+    implements java.io.Serializable
+{
 
-      //--------------------------/
-     //- Class/Member Variables -/
+    //--------------------------/
+    //- Class/Member Variables -/
     //--------------------------/
 
     /**
@@ -77,9 +84,8 @@
      */
     private String checksum;
 
-
-      //-----------/
-     //- Methods -/
+    //-----------/
+    //- Methods -/
     //-----------/
 
     /**
@@ -175,7 +181,7 @@
      * 
      * @param checksum
      */
-    public void setChecksum(String checksum)
+    public void setChecksum( String checksum )
     {
         this.checksum = checksum;
     } //-- void setChecksum(String) 
@@ -185,7 +191,7 @@
      * 
      * @param committedDate
      */
-    public void setCommittedDate(String committedDate)
+    public void setCommittedDate( String committedDate )
     {
         this.committedDate = committedDate;
     } //-- void setCommittedDate(String) 
@@ -195,7 +201,7 @@
      * 
      * @param committedRevision
      */
-    public void setCommittedRevision(int committedRevision)
+    public void setCommittedRevision( int committedRevision )
     {
         this.committedRevision = committedRevision;
     } //-- void setCommittedRevision(int) 
@@ -205,7 +211,7 @@
      * 
      * @param kind
      */
-    public void setKind(String kind)
+    public void setKind( String kind )
     {
         this.kind = kind;
     } //-- void setKind(String) 
@@ -215,7 +221,7 @@
      * 
      * @param lastAuthor
      */
-    public void setLastAuthor(String lastAuthor)
+    public void setLastAuthor( String lastAuthor )
     {
         this.lastAuthor = lastAuthor;
     } //-- void setLastAuthor(String) 
@@ -225,7 +231,7 @@
      * 
      * @param name
      */
-    public void setName(String name)
+    public void setName( String name )
     {
         this.name = name;
     } //-- void setName(String) 
@@ -235,7 +241,7 @@
      * 
      * @param propertyTime
      */
-    public void setPropertyTime(String propertyTime)
+    public void setPropertyTime( String propertyTime )
     {
         this.propertyTime = propertyTime;
     } //-- void setPropertyTime(String) 
@@ -245,7 +251,7 @@
      * 
      * @param revision
      */
-    public void setRevision(int revision)
+    public void setRevision( int revision )
     {
         this.revision = revision;
     } //-- void setRevision(int) 
@@ -255,7 +261,7 @@
      * 
      * @param textTime
      */
-    public void setTextTime(String textTime)
+    public void setTextTime( String textTime )
     {
         this.textTime = textTime;
     } //-- void setTextTime(String) 
@@ -265,7 +271,7 @@
      * 
      * @param url
      */
-    public void setUrl(String url)
+    public void setUrl( String url )
     {
         this.url = url;
     } //-- void setUrl(String) 
@@ -275,7 +281,7 @@
      * 
      * @param uuid
      */
-    public void setUuid(String uuid)
+    public void setUuid( String uuid )
     {
         this.uuid = uuid;
     } //-- void setUuid(String) 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/command/changelog/SvnChangeLogConsumerTest.java
Sat Jan 14 19:57:37 2006
@@ -57,11 +57,11 @@
         {
             ChangeSet entry = (ChangeSet) i.next();
 
-            System.out.println( entry.getAuthor() );
+            System.out.println( "Author:" + entry.getAuthor() );
 
-            System.out.println( entry.getDate() );
+            System.out.println( "Date:" + entry.getDate() );
 
-            System.out.println( entry.getComment() );
+            System.out.println( "Comment:" + entry.getComment() );
 
             List files = entry.getFiles();
 
@@ -69,7 +69,7 @@
             {
                 ChangeFile file = (ChangeFile) it.next();
 
-                System.out.println( file.getName() );
+                System.out.println( "File:" + file.getName() );
             }
 
             System.out.println( "==============================" );
@@ -100,11 +100,11 @@
         {
             ChangeSet entry = (ChangeSet) i.next();
 
-            System.out.println( entry.getAuthor() );
+            System.out.println( "Author:" + entry.getAuthor() );
 
-            System.out.println( entry.getDate() );
+            System.out.println( "Date:" + entry.getDate() );
 
-            System.out.println( entry.getComment() );
+            System.out.println( "Comment:" + entry.getComment() );
 
             List files = entry.getFiles();
 
@@ -112,7 +112,7 @@
             {
                 ChangeFile file = (ChangeFile) it.next();
 
-                System.out.println( file.getName() );
+                System.out.println( "File:" + file.getName() );
             }
 
             System.out.println( "==============================" );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
URL: http://svn.apache.org/viewcvs/maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java?rev=369175&r1=369174&r2=369175&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
(original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-svn/src/test/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepositoryTest.java
Sat Jan 14 19:57:37 2006
@@ -112,7 +112,7 @@
     {
         SvnScmProvider provider = new SvnScmProvider();
 
-        SvnScmProviderRepository repo = (SvnScmProviderRepository) provider.makeProviderScmRepository(
new File( getBasedir() ) );
+        provider.makeProviderScmRepository( new File( getBasedir() ) );
     }
 
     // ----------------------------------------------------------------------

Propchange: maven/scm/trunk/maven-scm-test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Jan 14 19:57:37 2006
@@ -6,3 +6,4 @@
 *.ipr
 *.iws
 *.iml
+.wtpmodules



Mime
View raw message