Author: vsiveton Date: Wed Aug 13 06:28:43 2008 New Revision: 685542 URL: http://svn.apache.org/viewvc?rev=685542&view=rev Log: o first pass to try to fix Checkstyle
Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java Wed Aug 13 06:28:43 2008 @@ -166,6 +166,7 @@ */ private Map providerImplementations; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AddMojo.java Wed Aug 13 06:28:43 2008 @@ -28,6 +28,7 @@ /** * @author <a href="[EMAIL PROTECTED]">Julien Henry</a> + * @version $Id$ * @goal add * @aggregator * @description Add a files to the project @@ -35,6 +36,7 @@ public class AddMojo extends AbstractScmMojo { + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java Wed Aug 13 06:28:43 2008 @@ -71,6 +71,7 @@ */ private String goalsDirectory; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { @@ -78,7 +79,7 @@ if ( this.getCheckoutResult() != null ) { - runGoals( this.getCheckoutResult().getRelativePathProjectDirectory() ); + runGoals( this.getCheckoutResult().getRelativePathProjectDirectory() ); } } Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BranchMojo.java Wed Aug 13 06:28:43 2008 @@ -53,6 +53,7 @@ */ private String message; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ChangeLogMojo.java Wed Aug 13 06:28:43 2008 @@ -89,6 +89,7 @@ */ private String scmVersion; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckinMojo.java Wed Aug 13 06:28:43 2008 @@ -66,6 +66,7 @@ */ private String scmVersion; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java Wed Aug 13 06:28:43 2008 @@ -73,7 +73,8 @@ * allow extended mojo (ie BootStrap ) to see checkout result */ private CheckOutScmResult checkoutResult; - + + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { @@ -83,7 +84,7 @@ checkoutResult = null; if ( !getCheckoutDirectory().isDirectory() || !this.skipCheckoutIfExists ) { - checkoutResult = checkout(); + checkoutResult = checkout(); } } @@ -133,7 +134,7 @@ } } - protected CheckOutScmResult getCheckoutResult() + protected CheckOutScmResult getCheckoutResult() { return checkoutResult; } Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DefaultLog.java Wed Aug 13 06:28:43 2008 @@ -36,129 +36,97 @@ this.logger = logger; } - /** - * @see org.apache.maven.scm.log.ScmLogger#isDebugEnabled() - */ + /** [EMAIL PROTECTED] */ public boolean isDebugEnabled() { return logger.isDebugEnabled(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String) - */ + /** [EMAIL PROTECTED] */ public void debug( String content ) { logger.debug( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String,java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void debug( String content, Throwable error ) { logger.debug( content, error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void debug( Throwable error ) { logger.debug( error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#isInfoEnabled() - */ + /** [EMAIL PROTECTED] */ public boolean isInfoEnabled() { return logger.isInfoEnabled(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String) - */ + /** [EMAIL PROTECTED] */ public void info( String content ) { logger.info( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String,java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void info( String content, Throwable error ) { logger.info( content, error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void info( Throwable error ) { logger.info( error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#isWarnEnabled() - */ + /** [EMAIL PROTECTED] */ public boolean isWarnEnabled() { return logger.isWarnEnabled(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String) - */ + /** [EMAIL PROTECTED] */ public void warn( String content ) { logger.warn( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String,java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void warn( String content, Throwable error ) { logger.warn( content, error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void warn( Throwable error ) { logger.warn( error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#isErrorEnabled() - */ + /** [EMAIL PROTECTED] */ public boolean isErrorEnabled() { return logger.isErrorEnabled(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String) - */ + /** [EMAIL PROTECTED] */ public void error( String content ) { logger.error( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String,java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void error( String content, Throwable error ) { logger.error( content, error ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.Throwable) - */ + /** [EMAIL PROTECTED] */ public void error( Throwable error ) { logger.error( error ); Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/DiffMojo.java Wed Aug 13 06:28:43 2008 @@ -76,6 +76,7 @@ */ private File outputFile; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/EditMojo.java Wed Aug 13 06:28:43 2008 @@ -37,6 +37,7 @@ public class EditMojo extends AbstractScmMojo { + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java Wed Aug 13 06:28:43 2008 @@ -64,6 +64,7 @@ */ private String exportDirectory; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ListMojo.java Wed Aug 13 06:28:43 2008 @@ -1,16 +1,5 @@ package org.apache.maven.scm.plugin; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.scm.ScmException; -import org.apache.maven.scm.ScmFile; -import org.apache.maven.scm.ScmFileSet; -import org.apache.maven.scm.command.list.ListScmResult; -import org.apache.maven.scm.repository.ScmRepository; - -import java.io.File; -import java.io.IOException; -import java.util.Iterator; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -30,6 +19,17 @@ * under the License. */ +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.ScmFile; +import org.apache.maven.scm.ScmFileSet; +import org.apache.maven.scm.command.list.ListScmResult; +import org.apache.maven.scm.repository.ScmRepository; + +import java.io.File; +import java.io.IOException; +import java.util.Iterator; + /** * Get the list of project files. * @@ -63,6 +63,7 @@ */ private boolean recursive = true; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/StatusMojo.java Wed Aug 13 06:28:43 2008 @@ -42,6 +42,7 @@ public class StatusMojo extends AbstractScmMojo { + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java Wed Aug 13 06:28:43 2008 @@ -84,6 +84,7 @@ */ private String timestampPrefix; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UnEditMojo.java Wed Aug 13 06:28:43 2008 @@ -37,6 +37,7 @@ public class UnEditMojo extends AbstractScmMojo { + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateMojo.java Wed Aug 13 06:28:43 2008 @@ -77,6 +77,7 @@ */ private boolean runChangelog = false; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java?rev=685542&r1=685541&r2=685542&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java (original) +++ maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/UpdateSubprojectsMojo.java Wed Aug 13 06:28:43 2008 @@ -1,14 +1,5 @@ package org.apache.maven.scm.plugin; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.project.MavenProject; -import org.apache.maven.scm.ScmException; -import org.apache.maven.scm.command.update.UpdateScmResult; -import org.apache.maven.scm.command.update.UpdateScmResultWithRevision; -import org.apache.maven.scm.repository.ScmRepository; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -28,9 +19,21 @@ * under the License. */ +import org.apache.maven.plugin.MojoExecutionException; +import org.apache.maven.project.MavenProject; +import org.apache.maven.scm.ScmException; +import org.apache.maven.scm.command.update.UpdateScmResult; +import org.apache.maven.scm.command.update.UpdateScmResultWithRevision; +import org.apache.maven.scm.repository.ScmRepository; + +import java.io.IOException; + /** + * Updates all projects in a multi project build. This is useful for users who have adopted the flat project structure + * where the aggregator project is a sibling of the sub projects rather than sitting in the parent directory. + * * @goal update-subprojects - * @description Updates all projects in a multi project build. This is useful for users who have adopted the flat project structure where the aggregator project is a sibling of the sub projects rather than sitting in the parent directory. + * @version $Id$ */ public class UpdateSubprojectsMojo extends AbstractScmMojo @@ -65,6 +68,7 @@ */ private MavenProject project; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException { Modified: maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java?rev=685542&r1=685541&r2=685542&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 Wed Aug 13 06:28:43 2008 @@ -50,6 +50,7 @@ */ private String scmDeveloperConnection; + /** [EMAIL PROTECTED] */ public void execute() throws MojoExecutionException {