maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r685548 [6/7] - in /maven/scm/trunk/maven-scm-providers: maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/ maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/commands/add/ maven-scm-...
Date Wed, 13 Aug 2008 13:36:07 GMT
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/changelog/GitChangeLogConsumer.java Wed Aug 13 06:35:49 2008
@@ -33,6 +33,7 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitChangeLogConsumer
     extends AbstractConsumer
@@ -52,12 +53,12 @@
      * State machine constant: expecting author information
      */
     private static final int STATUS_GET_AUTHOR = 2;
-    
+
     /**
      * State machine constant: expecting date information
      */
     private static final int STATUS_GET_DATE = 3;
-    
+
     /**
      * State machine constant: expecting file information
      */
@@ -68,7 +69,7 @@
      */
     private static final int STATUS_GET_COMMENT = 5;
 
-    
+
     /**
      * The pattern used to match git header lines
      */
@@ -89,7 +90,7 @@
      */
 //X    private static final String FILE_PATTERN = "^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:]) (.*)";
     private static final String FILE_PATTERN = "^:\\d* \\d* [:xdigit:]*\\.* [:xdigit:]*\\.* ([:upper:])\\t(.*)";
-    
+
     /**
      * Current status of the parser
      */
@@ -124,18 +125,18 @@
      * The regular expression used to match author lines
      */
     private RE authorRegexp;
-    
+
     /**
      * The regular expression used to match date lines
      */
     private RE dateRegexp;
-    
+
     /**
      * The regular expression used to match file lines
      */
     private RE fileRegexp;
-    
-    
+
+
     private String userDateFormat;
 
     /**
@@ -164,9 +165,9 @@
 
     public List getModifications()
     {
-        // this is needed since the processFile does not always get a the end-sequence correctly. 
+        // this is needed since the processFile does not always get a the end-sequence correctly.
         processGetFile( "" );
-        
+
         return entries;
     }
 
@@ -174,6 +175,7 @@
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         switch ( status )
@@ -197,8 +199,8 @@
                 throw new IllegalStateException( "Unknown state: " + status );
         }
     }
-    
-      
+
+
 
     // ----------------------------------------------------------------------
     //
@@ -223,7 +225,7 @@
         currentRevision = headerRegexp.getParen( 1 );
 
         currentChange = new GitChangeSet();
-        
+
         status = STATUS_GET_AUTHOR;
     }
 
@@ -240,9 +242,9 @@
             return;
         }
         String author = authorRegexp.getParen( 1 );
-        
+
         currentChange.setAuthor( author );
-        
+
         status = STATUS_GET_DATE;
     }
 
@@ -258,13 +260,13 @@
         {
             return;
         }
-        
+
         String datestring = dateRegexp.getParen( 1 );
-      
+
         Date date = parseDate( datestring.trim() , userDateFormat, GIT_TIMESTAMP_PATTERN, locale );
-        
+
         currentChange.setDate( date );
-        
+
         status = STATUS_GET_COMMENT;
     }
 
@@ -288,12 +290,12 @@
                 status = STATUS_GET_FILE;
             }
         }
-        else 
+        else
         {
             if ( currentComment.length() > 0 ) {
                 currentComment.append( '\n' );
             }
-            
+
             currentComment.append( line.substring( 4 ) );
         }
     }
@@ -314,9 +316,9 @@
             {
                 entries.add( currentChange );
             }
-            
+
             resetChangeLog();
-            
+
             status = STATUS_GET_HEADER;
         }
         else
@@ -327,15 +329,15 @@
             }
             // String action = fileRegexp.getParen( 1 );
             // action is currently not used
-            
+
             String name = fileRegexp.getParen( 2 );
-            
+
             currentChange.addFile( new ChangeFile( name, currentRevision ) );
         }
     }
 
     private void resetChangeLog() {
-    	currentComment = null;
-    	currentChange = null;
+        currentComment = null;
+        currentChange = null;
     }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkin/GitCheckInCommand.java Wed Aug 13 06:35:49 2008
@@ -46,14 +46,16 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitCheckInCommand extends AbstractCheckInCommand implements GitCommand
 {
+    /** {@inheritDoc} */
     protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
                                                       ScmVersion version )
         throws ScmException
     {
-    	GitScmProviderRepository repository = (GitScmProviderRepository) repo;
+        GitScmProviderRepository repository = (GitScmProviderRepository) repo;
 
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
         CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
@@ -79,21 +81,21 @@
                 // otherwise we will use 'git-commit -a' later
 
                 Commandline clAdd = GitAddCommand.createCommandLine( fileSet.getBasedir(), fileSet.getFileList() );
-                
+
                 exitCode = GitCommandLineUtils.execute( clAdd, stdout, stderr, getLogger() );
-                
+
                 if ( exitCode != 0 )
                 {
                     return new CheckInScmResult( clAdd.toString(), "The git-add command failed.", stderr.getOutput(), false );
                 }
 
             }
-            
+
             // git-commit doesn't show single files, but only summary :/
             // so we must run git-status and consume the output
             // borrow a few things from the git-status command
             Commandline clStatus = GitStatusCommand.createCommandLine( repository, fileSet );
-            
+
             GitStatusConsumer statusConsumer = new GitStatusConsumer( getLogger(), fileSet.getBasedir() );
             exitCode = GitCommandLineUtils.execute( clStatus, statusConsumer, stderr, getLogger() );
             if ( exitCode != 0 )
@@ -101,49 +103,49 @@
                 // git-status returns non-zero if nothing to do
                 getLogger().info( "nothing added to commit but untracked files present (use \"git add\" to track)" );
             }
-            
-        	Commandline clCommit = createCommitCommandLine(repository, fileSet, messageFile);
-        	
+
+            Commandline clCommit = createCommitCommandLine(repository, fileSet, messageFile);
+
             exitCode = GitCommandLineUtils.execute( clCommit, stdout, stderr, getLogger() );
-	        if ( exitCode != 0 )
-	        {
-	            return new CheckInScmResult( clCommit.toString(), "The git-commit command failed.", stderr.getOutput(), false );
-	        }
-	        
-	        Commandline cl = createPushCommandLine( repository, fileSet, version );
-	
+            if ( exitCode != 0 )
+            {
+                return new CheckInScmResult( clCommit.toString(), "The git-commit command failed.", stderr.getOutput(), false );
+            }
+
+            Commandline cl = createPushCommandLine( repository, fileSet, version );
+
             exitCode = GitCommandLineUtils.execute( cl, stdout, stderr, getLogger() );
-	        if ( exitCode != 0 )
-	        {
-	            return new CheckInScmResult( cl.toString(), "The git-push command failed.", stderr.getOutput(), false );
-	        }
-
-	        List checkedInFiles = new ArrayList( statusConsumer.getChangedFiles().size() );
-	        
-	        // rewrite all detected files to now have status 'checked_in'
-	        for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); )
-	        {
-	            ScmFile scmfile = new ScmFile( ((ScmFile) it.next()).getPath(), ScmFileStatus.CHECKED_IN );
-	            
-	            if ( fileSet.getFileList().isEmpty() ) {
-	                checkedInFiles.add( scmfile );	                
-	            }
-	            else
-	            {
-	                // if a specific fileSet is given, we have to check if the file is really tracked
-	                for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); )
-	                {
-	                    File f = (File) itfl.next();
-	                    if ( f.toString().equals( scmfile.getPath() )) 
-	                    {
-	                        checkedInFiles.add( scmfile );                  
-	                    }
-
-	                }
-	            }
-	        }
-	        
-	        return new CheckInScmResult( cl.toString(), checkedInFiles );
+            if ( exitCode != 0 )
+            {
+                return new CheckInScmResult( cl.toString(), "The git-push command failed.", stderr.getOutput(), false );
+            }
+
+            List checkedInFiles = new ArrayList( statusConsumer.getChangedFiles().size() );
+
+            // rewrite all detected files to now have status 'checked_in'
+            for ( Iterator it = statusConsumer.getChangedFiles().iterator(); it.hasNext(); )
+            {
+                ScmFile scmfile = new ScmFile( ((ScmFile) it.next()).getPath(), ScmFileStatus.CHECKED_IN );
+
+                if ( fileSet.getFileList().isEmpty() ) {
+                    checkedInFiles.add( scmfile );
+                }
+                else
+                {
+                    // if a specific fileSet is given, we have to check if the file is really tracked
+                    for ( Iterator itfl = fileSet.getFileList().iterator(); itfl.hasNext(); )
+                    {
+                        File f = (File) itfl.next();
+                        if ( f.toString().equals( scmfile.getPath() ))
+                        {
+                            checkedInFiles.add( scmfile );
+                        }
+
+                    }
+                }
+            }
+
+            return new CheckInScmResult( cl.toString(), checkedInFiles );
         }
         finally
         {
@@ -164,16 +166,16 @@
     // ----------------------------------------------------------------------
 
     public static Commandline createPushCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet,
-    		                                         ScmVersion version )
+                                                     ScmVersion version )
         throws ScmException
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "push");
 
         //X TODO handle version
-        
+
         return cl;
     }
-    
+
     public static Commandline createCommitCommandLine( GitScmProviderRepository repository, ScmFileSet fileSet,
                                                        File messageFile )
         throws ScmException
@@ -193,7 +195,7 @@
         }
         else
         {
-            // specify exactly which files to commit 
+            // specify exactly which files to commit
             GitCommandLineUtils.addTarget( cl, fileSet.getFileList() );
         }
 

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/checkout/GitCheckOutCommand.java Wed Aug 13 06:35:49 2008
@@ -40,6 +40,7 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitCheckOutCommand extends AbstractCheckOutCommand implements GitCommand
 {
@@ -47,8 +48,9 @@
      * For git, the given repository is a remote one.
      * We have to clone it first if the working directory does not contain a git repo yet,
      * otherwise we have to git-pull it.
-     * 
+     *
      * TODO We currently assume a '.git' directory, so this does not work for --bare repos
+     * {@inheritDoc}
      */
     protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                         ScmVersion version )
@@ -57,7 +59,7 @@
         GitScmProviderRepository repository = (GitScmProviderRepository) repo;
 
         if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) &&
-             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) 
+             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 )
         {
             throw new ScmException( "remote repository must not be the working directory" );
         }
@@ -66,20 +68,20 @@
 
         CommandLineUtils.StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer();
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-        
 
-        if ( !fileSet.getBasedir().exists() || 
+
+        if ( !fileSet.getBasedir().exists() ||
              !( new File( fileSet.getBasedir(), ".git" ).exists() ) )
         {
-            if ( fileSet.getBasedir().exists() ) 
+            if ( fileSet.getBasedir().exists() )
             {
                 // git refuses to clone otherwise
                 fileSet.getBasedir().delete();
             }
-            
+
             // no git repo seems to exist, let's clone the original repo
             Commandline clClone = createCloneCommand( repository, fileSet.getBasedir() );
-            
+
             exitCode = GitCommandLineUtils.execute( clClone, stdout, stderr, getLogger() );
             if ( exitCode != 0 )
             {
@@ -87,19 +89,19 @@
             }
         }
 
-        if ( fileSet.getBasedir().exists() && 
-             new File( fileSet.getBasedir(), ".git" ).exists() ) 
+        if ( fileSet.getBasedir().exists() &&
+             new File( fileSet.getBasedir(), ".git" ).exists() )
         {
             // git repo exists, so we must git-pull the changes
             Commandline clPull = createPullCommand( repository, fileSet.getBasedir(), version );
-            
+
             exitCode = GitCommandLineUtils.execute( clPull, stdout, stderr, getLogger() );
             if ( exitCode != 0 )
             {
                 return new CheckOutScmResult( clPull.toString(), "The git-pull command failed.", stderr.getOutput(), false );
             }
         }
-        
+
         // and now lets do the git-checkout itself
         Commandline cl = createCommandLine( repository, fileSet.getBasedir(), version );
 
@@ -111,11 +113,11 @@
 
         // and now search for the files
         GitListConsumer listConsumer = new GitListConsumer( getLogger()
-        		                                          , fileSet.getBasedir()
-        		                                          , ScmFileStatus.CHECKED_IN);
+                                                          , fileSet.getBasedir()
+                                                          , ScmFileStatus.CHECKED_IN);
 
         Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() );
-        
+
         exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() );
         if ( exitCode != 0 )
         {
@@ -134,7 +136,7 @@
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "checkout" );
 
-        
+
         if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
         {
             cl.createArgument().setValue( version.getName() );
@@ -142,46 +144,46 @@
 
         return cl;
     }
-    
+
     /**
-     * create a git-clone repository command 
+     * create a git-clone repository command
      */
     private Commandline createCloneCommand( GitScmProviderRepository repository, File workingDirectory )
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory.getParentFile(), "clone" );
-        
+
         cl.createArgument().setValue( repository.getUrl() );
-        
+
         cl.createArgument().setFile( workingDirectory );
-        
+
         return cl;
     }
-    
+
     /**
-     * create a git-pull repository command 
+     * create a git-pull repository command
      */
     private Commandline createPullCommand( GitScmProviderRepository repository, File workingDirectory,
                                            ScmVersion version )
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "pull" );
-        
+
         cl.createArgument().setValue( repository.getUrl() );
-        
+
         if ( version != null && StringUtils.isNotEmpty( version.getName() ) )
         {
             if ( version instanceof ScmTag )
             {
-            	cl.createArgument().setValue( "tag" );
-            	cl.createArgument().setValue( version.getName() );
+                cl.createArgument().setValue( "tag" );
+                cl.createArgument().setValue( version.getName() );
             }
             else
             {
-            	cl.createArgument().setValue( version.getName() + ":" + version.getName() );
+                cl.createArgument().setValue( version.getName() + ":" + version.getName() );
             }
         }
         else {
-        	cl.createArgument().setValue( "master" );
+            cl.createArgument().setValue( "master" );
         }
         return cl;
-    }    
+    }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/diff/GitDiffCommand.java Wed Aug 13 06:35:49 2008
@@ -36,9 +36,11 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitDiffCommand extends AbstractDiffCommand implements GitCommand
 {
+    /** {@inheritDoc} */
     protected DiffScmResult executeDiffCommand( ScmProviderRepository repo, ScmFileSet fileSet, ScmVersion startVersion,
                                                 ScmVersion endVersion )
         throws ScmException
@@ -79,7 +81,7 @@
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "diff" );
 
         if ( cached ) {
-        	cl.createArgument().setValue( "--cached" );
+            cl.createArgument().setValue( "--cached" );
         }
 
         if ( startVersion != null && StringUtils.isNotEmpty( startVersion.getName() ) )

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListCommand.java Wed Aug 13 06:35:49 2008
@@ -37,10 +37,11 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitListCommand extends AbstractListCommand implements GitCommand
 {
-
+    /** {@inheritDoc} */
     protected ListScmResult executeListCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                 boolean recursive, ScmVersion scmVersion )
         throws ScmException
@@ -48,7 +49,7 @@
         GitScmProviderRepository repository = (GitScmProviderRepository) repo;
 
         if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) &&
-             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) 
+             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 )
         {
             throw new ScmException( "remote repository must not be the working directory" );
         }
@@ -57,9 +58,9 @@
 
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
         GitListConsumer consumer = new GitListConsumer( getLogger()
-        		                                      , fileSet.getBasedir().getParentFile()
-        		                                      , ScmFileStatus.CHECKED_IN );
-        
+                                                      , fileSet.getBasedir().getParentFile()
+                                                      , ScmFileStatus.CHECKED_IN );
+
         Commandline cl = createCommandLine( repository, fileSet.getBasedir() );
 
         exitCode = GitCommandLineUtils.execute( cl, consumer, stderr, getLogger() );
@@ -78,8 +79,8 @@
     public static Commandline createCommandLine( GitScmProviderRepository repository, File workingDirectory )
     {
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "ls-files" );
-        
+
         return cl;
     }
-    
+
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/list/GitListConsumer.java Wed Aug 13 06:35:49 2008
@@ -29,24 +29,26 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitListConsumer
     extends AbstractFileCheckingConsumer
 {
-	private ScmFileStatus fileStatus; 
+    private ScmFileStatus fileStatus;
 
-	/**
-	 * @param logger
-	 * @param workingDirectory
-	 * @param fileStatus will be used for each file found
-	 */
+    /**
+     * @param logger
+     * @param workingDirectory
+     * @param fileStatus will be used for each file found
+     */
     public GitListConsumer( ScmLogger logger, File workingDirectory, ScmFileStatus fileStatus )
     {
         super( logger, workingDirectory );
-        
+
         this.fileStatus = fileStatus;
     }
 
+    /** {@inheritDoc} */
     protected void parseLine( String line )
     {
         String file = line;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveCommand.java Wed Aug 13 06:35:49 2008
@@ -36,9 +36,11 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitRemoveCommand extends AbstractRemoveCommand implements GitCommand
 {
+    /** {@inheritDoc} */
     protected ScmResult executeRemoveCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message )
         throws ScmException
     {
@@ -50,7 +52,7 @@
         }
 
         Commandline cl = createCommandLine( fileSet.getBasedir(), fileSet.getFileList() );
-        
+
         GitRemoveConsumer consumer = new GitRemoveConsumer( getLogger() );
 
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
@@ -68,12 +70,12 @@
 
     public static Commandline createCommandLine( File workingDirectory, List/*File*/ files )
     throws ScmException
-	{
-	    Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "rm" );
-	
-	    GitCommandLineUtils.addTarget( cl, files );
-	
-	    return cl;
-	}
+    {
+        Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( workingDirectory, "rm" );
+
+        GitCommandLineUtils.addTarget( cl, files );
+
+        return cl;
+    }
 
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/remove/GitRemoveConsumer.java Wed Aug 13 06:35:49 2008
@@ -31,6 +31,7 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitRemoveConsumer implements StreamConsumer
 {
@@ -64,13 +65,14 @@
             throw new RuntimeException(
                 "INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't happen. Something is probably wrong with the oro installation.",
                 ex );
-        }        
+        }
     }
 
     // ----------------------------------------------------------------------
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         if ( line.length() <= 2 )
@@ -78,9 +80,9 @@
             return;
         }
 
-        if ( removedRegexp.match( line ) ) 
+        if ( removedRegexp.match( line ) )
         {
-        	String file = removedRegexp.getParen( 1 );
+            String file = removedRegexp.getParen( 1 );
             removedFiles.add( new ScmFile( file, ScmFileStatus.DELETED ) );
         }
         else

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusCommand.java Wed Aug 13 06:35:49 2008
@@ -38,6 +38,7 @@
     extends AbstractStatusCommand
     implements GitCommand
 {
+    /** {@inheritDoc} */
     protected StatusScmResult executeStatusCommand( ScmProviderRepository repo, ScmFileSet fileSet )
         throws ScmException
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java Wed Aug 13 06:35:49 2008
@@ -33,6 +33,7 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitStatusConsumer
     implements StreamConsumer
@@ -46,12 +47,12 @@
      * The pattern used to match modified file lines
      */
     private static final String MODIFIED_PATTERN = "^#\\s*modified:\\s*(.*)";
-    
+
     /**
      * The pattern used to match deleted file lines
      */
     private static final String DELETED_PATTERN = "^#\\s*deleted:\\s*(.*)";
-    
+
     /**
      * @see #ADDED_PATTERN
      */
@@ -61,12 +62,12 @@
      * @see #MODIFIED_PATTERN
      */
     private RE modifiedRegexp;
-    
+
     /**
      * @see #DELETED_PATTERN
      */
     private RE deletedRegexp;
-    
+
     private ScmLogger logger;
 
     private File workingDirectory;
@@ -81,7 +82,7 @@
     {
         this.logger = logger;
         this.workingDirectory = workingDirectory;
-        
+
         try
         {
             addedRegexp    = new RE( ADDED_PATTERN    );
@@ -93,13 +94,14 @@
             throw new RuntimeException(
                 "INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't happen. Something is probably wrong with the oro installation.",
                 ex );
-        }        
+        }
     }
 
     // ----------------------------------------------------------------------
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         logger.debug( line );
@@ -107,27 +109,27 @@
         {
             return;
         }
-        
+
         ScmFileStatus status = null;
-        
+
         String file = null;
 
-        if ( addedRegexp.match( line ) ) 
+        if ( addedRegexp.match( line ) )
         {
             status = ScmFileStatus.ADDED;
             file = addedRegexp.getParen( 1 );
-        } 
-        else if ( modifiedRegexp.match( line ) ) 
+        }
+        else if ( modifiedRegexp.match( line ) )
         {
             status = ScmFileStatus.MODIFIED;
             file = modifiedRegexp.getParen( 1 );
         }
-        else if ( deletedRegexp.match( line ) ) 
+        else if ( deletedRegexp.match( line ) )
         {
             status = ScmFileStatus.DELETED;
             file = deletedRegexp.getParen( 1 );
         }
-        
+
         // If the file isn't a file; don't add it.
         if ( file != null )
         {
@@ -135,11 +137,11 @@
             {
                 return;
             }
-            
+
             changedFiles.add( new ScmFile( file, status ) );
         }
 
-        
+
     }
 
     public List getChangedFiles()

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/tag/GitTagCommand.java Wed Aug 13 06:35:49 2008
@@ -42,9 +42,11 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitTagCommand extends AbstractTagCommand implements GitCommand
 {
+    /** {@inheritDoc} */
     public ScmResult executeTagCommand( ScmProviderRepository repo, ScmFileSet fileSet, String tag, String message )
         throws ScmException
     {
@@ -91,7 +93,7 @@
 
             // and now push the tag to the origin repository
             Commandline clPush = createPushCommandLine( repository, fileSet, tag );
-            
+
             exitCode = GitCommandLineUtils.execute( clPush, stdout, stderr, getLogger() );
             if ( exitCode != 0 )
             {
@@ -100,11 +102,11 @@
 
             // plus search for the tagged files
             GitListConsumer listConsumer = new GitListConsumer( getLogger()
-            		                                          , fileSet.getBasedir()
-            		                                          , ScmFileStatus.TAGGED );
+                                                              , fileSet.getBasedir()
+                                                              , ScmFileStatus.TAGGED );
 
             Commandline clList = GitListCommand.createCommandLine( repository, fileSet.getBasedir() );
-            
+
             exitCode = GitCommandLineUtils.execute( clList, listConsumer, stderr, getLogger() );
             if ( exitCode != 0 )
             {
@@ -153,8 +155,8 @@
 
           cl.createArgument().setValue( "origin" );
           cl.createArgument().setValue( tag );
-          
+
           return cl;
       }
-      
+
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java Wed Aug 13 06:35:49 2008
@@ -1,21 +1,5 @@
 package org.apache.maven.scm.provider.git.gitexe.command.update;
 
-import java.util.Collections;
-
-import org.apache.maven.scm.ScmException;
-import org.apache.maven.scm.ScmFileSet;
-import org.apache.maven.scm.ScmVersion;
-import org.apache.maven.scm.command.changelog.ChangeLogCommand;
-import org.apache.maven.scm.command.update.AbstractUpdateCommand;
-import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
-import org.apache.maven.scm.provider.ScmProviderRepository;
-import org.apache.maven.scm.provider.git.command.GitCommand;
-import org.apache.maven.scm.provider.git.gitexe.command.GitCommandLineUtils;
-import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -35,14 +19,28 @@
  * under the License.
  */
 
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.ScmVersion;
+import org.apache.maven.scm.command.changelog.ChangeLogCommand;
+import org.apache.maven.scm.command.update.AbstractUpdateCommand;
+import org.apache.maven.scm.command.update.UpdateScmResult;
+import org.apache.maven.scm.command.update.UpdateScmResultWithRevision;
+import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.provider.git.command.GitCommand;
+import org.apache.maven.scm.provider.git.gitexe.command.GitCommandLineUtils;
+import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
+
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
- * @since 10 août 2008
+ * @since 10 august 2008
  * @version $Id$
  */
 public class GitUpdateCommand extends AbstractUpdateCommand implements GitCommand
 {
-
+    /** {@inheritDoc} */
     protected UpdateScmResult executeUpdateCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                     ScmVersion scmVersion )
         throws ScmException
@@ -50,7 +48,7 @@
         GitScmProviderRepository repository = (GitScmProviderRepository) repo;
 
         if ( GitScmProviderRepository.PROTOCOL_FILE.equals( repository.getProtocol() ) &&
-             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 ) 
+             repository.getUrl().indexOf( fileSet.getBasedir().getPath() ) >= 0 )
         {
             throw new ScmException( "remote repository must not be the working directory" );
         }
@@ -59,9 +57,9 @@
 
         GitUpdateCommandConsumer consumer = new GitUpdateCommandConsumer( getLogger(), fileSet
             .getBasedir() );
-        
+
         CommandLineUtils.StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer();
-        
+
         Commandline cl = GitCommandLineUtils.getBaseGitCommandLine( fileSet.getBasedir(), "pull" );
         cl.createArg().setLine( "origin" );
         cl.createArg().setLine( "master" );
@@ -71,15 +69,13 @@
             getLogger().warn( "failed to update git, return code " + exitCode );
             return new UpdateScmResult( cl.toString(), "The git-pull origin master command failed.", stderr.getOutput(), false );
         }
-        return new UpdateScmResultWithRevision( cl.toString(), consumer.getUpdatedFiles(), null );        
+        return new UpdateScmResultWithRevision( cl.toString(), consumer.getUpdatedFiles(), null );
     }
 
+    /** {@inheritDoc} */
     protected ChangeLogCommand getChangeLogCommand()
     {
         // TODO Auto-generated method stub
         return null;
     }
-
-    
-
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommandConsumer.java Wed Aug 13 06:35:49 2008
@@ -1,17 +1,5 @@
 package org.apache.maven.scm.provider.git.gitexe.command.update;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileStatus;
-import org.apache.maven.scm.log.ScmLogger;
-import org.apache.maven.scm.util.AbstractConsumer;
-import org.codehaus.plexus.util.StringUtils;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -31,6 +19,18 @@
  * under the License.
  */
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.scm.ScmFile;
+import org.apache.maven.scm.ScmFileStatus;
+import org.apache.maven.scm.log.ScmLogger;
+import org.apache.maven.scm.util.AbstractConsumer;
+import org.codehaus.plexus.util.StringUtils;
+
 /**
  * @author <a href="mailto:olamy@apache.org">olamy</a>
  * @version $Id$
@@ -38,7 +38,7 @@
 public class GitUpdateCommandConsumer
     extends AbstractConsumer
 {
-    
+
     private boolean updatingFound;
 
     private boolean summaryFound;
@@ -50,6 +50,7 @@
         super( logger );
     }
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         getLogger().debug( "GitUpdateCommandConsumer consumeLine : " + line );
@@ -74,7 +75,7 @@
         }
         if ( updatingFound && !summaryFound )
         {
-            // test format : pom.xml\u2190[m |    
+            // test format : pom.xml\u2190[m |
             int index = line.indexOf( "\u2190[" );
 
             if ( index >= 0 )
@@ -130,5 +131,5 @@
     {
         getLogger().debug( " updatedFiles size " + scmFiles.size() );
         return new ArrayList( scmFiles.values() );
-    }    
+    }
 }

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/branch/GitBranchCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitBranchCommandTckTest
     extends BranchCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkin/GitCheckInCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitCheckInCommandTckTest
     extends CheckInCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/checkout/GitCheckOutCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitCheckOutCommandTckTest
     extends CheckOutCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitDiffCommandTckTest
     extends DiffCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/list/GitListCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitListCommandTckTest
     extends ListCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/status/GitStatusCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,17 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitStatusCommandTckTest
     extends StatusCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
-
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/tag/GitTagCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitTagCommandTckTest
     extends TagCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gittest/src/main/java/org/apache/maven/scm/provider/git/command/update/GitUpdateCommandTckTest.java Wed Aug 13 06:35:49 2008
@@ -24,16 +24,19 @@
 
 /**
  * @author <a href="mailto:struberg@yahoo.de">Mark Struberg</a>
+ * @version $Id$
  */
 public class GitUpdateCommandTckTest
     extends UpdateCommandTckTest
 {
+    /** {@inheritDoc} */
     public String getScmUrl()
         throws Exception
     {
         return GitScmTestUtils.getScmUrl( getRepositoryRoot() );
     }
 
+    /** {@inheritDoc} */
     public void initRepo()
         throws Exception
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/AbstractSvnScmProvider.java Wed Aug 13 06:35:49 2008
@@ -73,11 +73,13 @@
     // ScmProvider Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public String getScmSpecificFilename()
     {
         return ".svn";
     }
 
+    /** {@inheritDoc} */
     public ScmProviderRepository makeProviderScmRepository( String scmSpecificUrl, char delimiter )
         throws ScmRepositoryException
     {
@@ -91,9 +93,7 @@
         return result.repository;
     }
 
-    /**
-     * @see org.apache.maven.scm.provider.AbstractScmProvider#makeProviderScmRepository(java.io.File)
-     */
+    /** {@inheritDoc} */
     public ScmProviderRepository makeProviderScmRepository( File path )
         throws ScmRepositoryException, UnknownRepositoryStructure
     {
@@ -126,6 +126,7 @@
     protected abstract String getRepositoryURL( File path )
         throws ScmException;
 
+    /** {@inheritDoc} */
     public List validateScmUrl( String scmSpecificUrl, char delimiter )
     {
         List messages = new ArrayList();
@@ -140,6 +141,7 @@
         return messages;
     }
 
+    /** {@inheritDoc} */
     public String getScmType()
     {
         return "svn";
@@ -241,9 +243,7 @@
 
     protected abstract SvnCommand getAddCommand();
 
-    /**
-     * @see AbstractScmProvider#add(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public AddScmResult add( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -252,9 +252,7 @@
 
     protected abstract SvnCommand getBranchCommand();
 
-    /**
-     * @see AbstractScmProvider#branch(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     protected BranchScmResult branch( ScmProviderRepository repository, ScmFileSet fileSet,
                                       CommandParameters parameters )
         throws ScmException
@@ -264,9 +262,7 @@
 
     protected abstract SvnCommand getChangeLogCommand();
 
-    /**
-     * @see AbstractScmProvider#changelog(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public ChangeLogScmResult changelog( ScmProviderRepository repository, ScmFileSet fileSet,
                                          CommandParameters parameters )
         throws ScmException
@@ -276,9 +272,7 @@
 
     protected abstract SvnCommand getCheckInCommand();
 
-    /**
-     * @see AbstractScmProvider#checkin(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public CheckInScmResult checkin( ScmProviderRepository repository, ScmFileSet fileSet,
                                      CommandParameters parameters )
         throws ScmException
@@ -288,9 +282,7 @@
 
     protected abstract SvnCommand getCheckOutCommand();
 
-    /**
-     * @see AbstractScmProvider#checkout(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
                                        CommandParameters parameters )
         throws ScmException
@@ -300,9 +292,7 @@
 
     protected abstract SvnCommand getDiffCommand();
 
-    /**
-     * @see AbstractScmProvider#diff(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public DiffScmResult diff( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -311,6 +301,7 @@
 
     protected abstract SvnCommand getExportCommand();
 
+    /** {@inheritDoc} */
     protected ExportScmResult export( ScmProviderRepository repository, ScmFileSet fileSet,
                                       CommandParameters parameters )
         throws ScmException
@@ -320,9 +311,7 @@
 
     protected abstract SvnCommand getRemoveCommand();
 
-    /**
-     * @see AbstractScmProvider#remove(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -331,9 +320,7 @@
 
     protected abstract SvnCommand getStatusCommand();
 
-    /**
-     * @see AbstractScmProvider#status(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -342,9 +329,7 @@
 
     protected abstract SvnCommand getTagCommand();
 
-    /**
-     * @see AbstractScmProvider#tag(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public TagScmResult tag( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -353,9 +338,7 @@
 
     protected abstract SvnCommand getUpdateCommand();
 
-    /**
-     * @see AbstractScmProvider#update(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {
@@ -373,9 +356,7 @@
 
     protected abstract SvnCommand getListCommand();
 
-    /**
-     * @see AbstractScmProvider#list(ScmProviderRepository,ScmFileSet,CommandParameters)
-     */
+    /** {@inheritDoc} */
     public ListScmResult list( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
         throws ScmException
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnChangeSet.java Wed Aug 13 06:35:49 2008
@@ -51,6 +51,7 @@
         super( date, comment, author, files );
     }
 
+    /** {@inheritDoc} */
     public boolean containsFilename( String filename, ScmProviderRepository repository )
     {
         SvnScmProviderRepository repo = (SvnScmProviderRepository) repository;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/SvnTagBranchUtils.java Wed Aug 13 06:35:49 2008
@@ -25,18 +25,21 @@
 import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
 import org.codehaus.plexus.util.StringUtils;
 
+/**
+ * @version $Id$
+ */
 public class SvnTagBranchUtils
 {
 
-    public final static String[] REVISION_SPECIFIERS = new String[]{"HEAD", "BASE", "COMMITTED", "PREV"};
+    public static final String[] REVISION_SPECIFIERS = new String[]{"HEAD", "BASE", "COMMITTED", "PREV"};
 
-    public final static String SVN_TRUNK = "trunk";
+    public static final String SVN_TRUNK = "trunk";
 
-    public final static String SVN_BRANCHES = "branches";
+    public static final String SVN_BRANCHES = "branches";
 
-    public final static String SVN_TAGS = "tags";
+    public static final String SVN_TAGS = "tags";
 
-    public final static String[] SVN_BASE_DIRS = new String[]{SVN_TRUNK, SVN_BRANCHES, SVN_TAGS};
+    public static final String[] SVN_BASE_DIRS = new String[]{SVN_TRUNK, SVN_BRANCHES, SVN_TAGS};
 
     /**
      * Simple helper function to concatenate two paths together with a "/".
@@ -211,7 +214,7 @@
 
         if ( branchTagName.indexOf( "://" ) >= 0 )
         {
-            // branch/tag is already an absolute url so just return it. 
+            // branch/tag is already an absolute url so just return it.
             return branchTagName;
         }
 
@@ -235,7 +238,7 @@
         return addSuffix( appendPath( appendPath( projectRoot, subdir ), branchTagName ), queryString );
     }
 
-    /* Helper function that does the checking for {@link #isRevisionSpecifier} 
+    /* Helper function that does the checking for {@link #isRevisionSpecifier}
      */
     private static boolean checkRevisionArg( String arg )
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/diff/SvnDiffConsumer.java Wed Aug 13 06:35:49 2008
@@ -44,23 +44,23 @@
     // +++ plugin.jelly        (working copy)
     //
 
-    private final static String INDEX_TOKEN = "Index: ";
+    private static final String INDEX_TOKEN = "Index: ";
 
-    private final static String FILE_SEPARATOR_TOKEN = "===";
+    private static final String FILE_SEPARATOR_TOKEN = "===";
 
-    private final static String START_REVISION_TOKEN = "---";
+    private static final String START_REVISION_TOKEN = "---";
 
-    private final static String END_REVISION_TOKEN = "+++";
+    private static final String END_REVISION_TOKEN = "+++";
 
-    private final static String ADDED_LINE_TOKEN = "+";
+    private static final String ADDED_LINE_TOKEN = "+";
 
-    private final static String REMOVED_LINE_TOKEN = "-";
+    private static final String REMOVED_LINE_TOKEN = "-";
 
-    private final static String UNCHANGED_LINE_TOKEN = " ";
+    private static final String UNCHANGED_LINE_TOKEN = " ";
 
-    private final static String CHANGE_SEPARATOR_TOKEN = "@@";
+    private static final String CHANGE_SEPARATOR_TOKEN = "@@";
 
-    private final static String NO_NEWLINE_TOKEN = "\\ No newline at end of file";
+    private static final String NO_NEWLINE_TOKEN = "\\ No newline at end of file";
 
     private ScmLogger logger;
 
@@ -87,6 +87,7 @@
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         if ( line.startsWith( INDEX_TOKEN ) )

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java Wed Aug 13 06:35:49 2008
@@ -21,8 +21,7 @@
 
 /**
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *         <p/>
- *         $Id$
+ * @version $Id$
  */
 public class SvnInfoItem
 {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java Wed Aug 13 06:35:49 2008
@@ -26,8 +26,7 @@
 
 /**
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
- *         <p/>
- *         $Id$
+ * @version $Id$
  */
 public class SvnInfoScmResult
     extends ScmResult

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/repository/SvnScmProviderRepository.java Wed Aug 13 06:35:49 2008
@@ -208,11 +208,7 @@
         }
     }
 
-    /**
-     * A ScmProviderRepository like this but with the parent url (stripping the last directory)
-     *
-     * @return the parent repository or <code>null</null> if this is the top level repository
-     */
+    /** {@inheritDoc} */
     public ScmProviderRepository getParent()
     {
         String newUrl = getUrl().substring( getProtocol().length() );
@@ -238,9 +234,7 @@
         return new SvnScmProviderRepository( getProtocol() + newUrl, getUser(), getPassword() );
     }
 
-    /**
-     * Get the relative path from the ancestor to this repository
-     */
+    /** {@inheritDoc} */
     public String getRelativePath( ScmProviderRepository ancestor )
     {
         if ( ancestor instanceof SvnScmProviderRepository )
@@ -257,6 +251,7 @@
         return null;
     }
 
+    /** {@inheritDoc} */
     public String toString()
     {
         return getUrl();

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/SvnExeScmProvider.java Wed Aug 13 06:35:49 2008
@@ -50,61 +50,73 @@
 public class SvnExeScmProvider
     extends AbstractSvnScmProvider
 {
+    /** {@inheritDoc} */
     protected SvnCommand getAddCommand()
     {
         return new SvnAddCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getBranchCommand()
     {
         return new SvnBranchCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getChangeLogCommand()
     {
         return new SvnChangeLogCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getCheckInCommand()
     {
         return new SvnCheckInCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getCheckOutCommand()
     {
         return new SvnCheckOutCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getDiffCommand()
     {
         return new SvnDiffCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getExportCommand()
     {
         return new SvnExeExportCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getRemoveCommand()
     {
         return new SvnRemoveCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getStatusCommand()
     {
         return new SvnStatusCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getTagCommand()
     {
         return new SvnTagCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getUpdateCommand()
     {
         return new SvnUpdateCommand();
     }
 
+    /** {@inheritDoc} */
     protected SvnCommand getListCommand()
     {
         return new SvnListCommand();
@@ -115,9 +127,7 @@
         return new SvnInfoCommand();
     }
 
-    /**
-     * Implements retrieving the repository url for a certain path using the 'svn info' command.
-     */
+    /** {@inheritDoc} */
     protected String getRepositoryURL( File path )
         throws ScmException
     {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/AbstractFileCheckingConsumer.java Wed Aug 13 06:35:49 2008
@@ -31,6 +31,7 @@
 
 /**
  * @author <a href="mailto:kenney@apache.org">Kenney Westerhof</a>
+ * @version $Id$
  */
 public abstract class AbstractFileCheckingConsumer
     implements StreamConsumer
@@ -51,6 +52,7 @@
         this.workingDirectory = workingDirectory;
     }
 
+    /** {@inheritDoc} */
     public final void consumeLine( String line )
     {
         if ( line.length() <= 3 )

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddCommand.java Wed Aug 13 06:35:49 2008
@@ -43,6 +43,7 @@
     extends AbstractAddCommand
     implements SvnCommand
 {
+    /** {@inheritDoc} */
     protected ScmResult executeAddCommand( ScmProviderRepository repository, ScmFileSet fileSet, String message,
                                            boolean binary )
         throws ScmException

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/add/SvnAddConsumer.java Wed Aug 13 06:35:49 2008
@@ -51,6 +51,7 @@
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         if ( line.length() <= 3 )

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/branch/SvnBranchCommand.java Wed Aug 13 06:35:49 2008
@@ -54,6 +54,7 @@
     extends AbstractBranchCommand
     implements SvnCommand
 {
+    /** {@inheritDoc} */
     public ScmResult executeBranchCommand( ScmProviderRepository repo, ScmFileSet fileSet, String branch,
                                            String message )
         throws ScmException

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogCommand.java Wed Aug 13 06:35:49 2008
@@ -50,8 +50,9 @@
     extends AbstractChangeLogCommand
     implements SvnCommand
 {
-    private final static String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";
+    private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss Z";
 
+    /** {@inheritDoc} */
     protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                           ScmVersion startVersion, ScmVersion endVersion,
                                                           String datePattern )
@@ -60,6 +61,7 @@
         return executeChangeLogCommand( repo, fileSet, null, null, null, datePattern, startVersion, endVersion );
     }
 
+    /** {@inheritDoc} */
     protected ChangeLogScmResult executeChangeLogCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                           Date startDate, Date endDate, ScmBranch branch,
                                                           String datePattern )
@@ -164,7 +166,7 @@
 
         if ( branch != null && StringUtils.isNotEmpty( branch.getName() ) )
         {
-            // By specifying a branch and this repository url below, subversion should show 
+            // By specifying a branch and this repository url below, subversion should show
             // the changelog of that branch, but limit it to paths that also occur in this repository.
             if ( branch instanceof ScmTag )
             {

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/changelog/SvnChangeLogConsumer.java Wed Aug 13 06:35:49 2008
@@ -158,6 +158,7 @@
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     public void consumeLine( String line )
     {
         getLogger().debug( line );

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInCommand.java Wed Aug 13 06:35:49 2008
@@ -45,6 +45,7 @@
     extends AbstractCheckInCommand
     implements SvnCommand
 {
+    /** {@inheritDoc} */
     protected CheckInScmResult executeCheckInCommand( ScmProviderRepository repo, ScmFileSet fileSet, String message,
                                                       ScmVersion version )
         throws ScmException

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkin/SvnCheckInConsumer.java Wed Aug 13 06:35:49 2008
@@ -34,17 +34,17 @@
 public class SvnCheckInConsumer
     extends AbstractFileCheckingConsumer
 {
-    private final static String SENDING_TOKEN = "Sending        ";
+    private static final String SENDING_TOKEN = "Sending        ";
 
-    private final static String ADDING_TOKEN = "Adding         ";
+    private static final String ADDING_TOKEN = "Adding         ";
 
-    private final static String ADDING_BIN_TOKEN = "Adding  (bin)  ";
+    private static final String ADDING_BIN_TOKEN = "Adding  (bin)  ";
 
-    private final static String DELETING_TOKEN = "Deleting       ";
+    private static final String DELETING_TOKEN = "Deleting       ";
 
-    private final static String TRANSMITTING_TOKEN = "Transmitting file data";
+    private static final String TRANSMITTING_TOKEN = "Transmitting file data";
 
-    private final static String COMMITTED_REVISION_TOKEN = "Committed revision";
+    private static final String COMMITTED_REVISION_TOKEN = "Committed revision";
 
     // ----------------------------------------------------------------------
     //
@@ -59,6 +59,7 @@
     // StreamConsumer Implementation
     // ----------------------------------------------------------------------
 
+    /** {@inheritDoc} */
     protected void parseLine( String line )
     {
         String file;

Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java?rev=685548&r1=685547&r2=685548&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svnexe/src/main/java/org/apache/maven/scm/provider/svn/svnexe/command/checkout/SvnCheckOutCommand.java Wed Aug 13 06:35:49 2008
@@ -48,6 +48,7 @@
     extends AbstractCheckOutCommand
     implements SvnCommand
 {
+    /** {@inheritDoc} */
     protected CheckOutScmResult executeCheckOutCommand( ScmProviderRepository repo, ScmFileSet fileSet,
                                                         ScmVersion version )
         throws ScmException



Mime
View raw message