Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java Wed Sep 3 16:54:44 2008 @@ -45,25 +45,25 @@ public class CvsListConsumer implements StreamConsumer { - private ScmLogger m_logger; + private ScmLogger logger; - private List m_entries; + private List entries; /** * @param logger is a logger */ public CvsListConsumer( ScmLogger logger ) { - m_logger = logger; - m_entries = new LinkedList(); + this.logger = logger; + this.entries = new LinkedList(); } /** [EMAIL PROTECTED] */ public void consumeLine( String i_line ) { - if ( m_logger.isDebugEnabled() ) + if ( logger.isDebugEnabled() ) { - m_logger.debug( i_line ); + logger.debug( i_line ); } String[] params = i_line.split( "/" ); @@ -71,15 +71,15 @@ { if ( StringUtils.isNotEmpty( i_line ) ) { - if ( m_logger.isWarnEnabled() ) + if ( logger.isWarnEnabled() ) { - m_logger.warn( "Unable to parse it as CVS/Entries format: " + i_line + "." ); + logger.warn( "Unable to parse it as CVS/Entries format: " + i_line + "." ); } } } else { - m_entries.add( new ScmFile( params[1], ScmFileStatus.UNKNOWN ) ); + entries.add( new ScmFile( params[1], ScmFileStatus.UNKNOWN ) ); } } @@ -88,6 +88,6 @@ */ public List getEntries() { - return m_entries; + return entries; } }
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java Wed Sep 3 16:54:44 2008 @@ -94,9 +94,11 @@ throw new ScmException( "cvsroot is required" ); } - logger.debug( "cvsRoot: " + cvsRoot ); - - logger.debug( "passFile: " + passFile ); + if ( logger.isDebugEnabled() ) + { + logger.debug( "cvsRoot: " + cvsRoot ); + logger.debug( "passFile: " + passFile ); + } BufferedReader reader = null; @@ -119,8 +121,11 @@ } else { - logger.debug( - "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() + ". SKIPPED." ); + if ( logger.isDebugEnabled() ) + { + logger.debug( "cvsroot " + cvsRoot + " already exist in " + passFile.getAbsolutePath() + + ". SKIPPED." ); + } return; } @@ -141,7 +146,10 @@ String pwdfile = buf.toString() + "/1 " + cvsRoot + " A" + mangle( password ); - logger.debug( "Writing -> " + pwdfile + " in " + passFile.getAbsolutePath() ); + if ( logger.isDebugEnabled() ) + { + logger.debug( "Writing -> " + pwdfile + " in " + passFile.getAbsolutePath() ); + } writer = new PrintWriter( new FileWriter( passFile ) ); Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusConsumer.java Wed Sep 3 16:54:44 2008 @@ -60,14 +60,20 @@ /** [EMAIL PROTECTED] */ public void consumeLine( String line ) { - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } if ( line.length() < 3 ) { if ( StringUtils.isNotEmpty( line ) ) { - logger.warn( - "Unable to parse output from command: line length must be bigger than 3. (" + line + ")." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unable to parse output from command: line length must be bigger than 3. (" + + line + ")." ); + } } return; } @@ -105,7 +111,10 @@ } else { - logger.info( "Unknown file status: '" + statusString + "'." ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Unknown file status: '" + statusString + "'." ); + } return; } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/tag/CvsTagConsumer.java Wed Sep 3 16:54:44 2008 @@ -47,14 +47,20 @@ /** [EMAIL PROTECTED] */ public void consumeLine( String line ) { - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } if ( line.length() < 3 ) { if ( StringUtils.isNotEmpty( line ) ) { - logger.warn( - "Unable to parse output from command: line length must be bigger than 3. (" + line + ")." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unable to parse output from command: line length must be bigger than 3. (" + + line + ")." ); + } } return; } @@ -69,7 +75,10 @@ } else { - logger.warn( "Unknown status: '" + status + "'." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unknown status: '" + status + "'." ); + } } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/update/CvsUpdateConsumer.java Wed Sep 3 16:54:44 2008 @@ -47,14 +47,20 @@ /** [EMAIL PROTECTED] */ public void consumeLine( String line ) { - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } if ( line.length() < 3 ) { if ( StringUtils.isNotEmpty( line ) ) { - logger.warn( - "Unable to parse output from command: line length must be bigger than 3. (" + line + ")." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unable to parse output from command: line length must be bigger than 3. (" + + line + ")." ); + } } return; } @@ -89,7 +95,10 @@ } else { - logger.warn( "Unknown status: '" + status + "' for file '" + file + "'." ); + if ( logger.isDebugEnabled() ) + { + logger.warn( "Unknown status: '" + status + "' for file '" + file + "'." ); + } } } Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvsjava/src/main/java/org/apache/maven/scm/provider/cvslib/cvsjava/util/CvsConnection.java Wed Sep 3 16:54:44 2008 @@ -291,7 +291,10 @@ } catch ( IOException e ) { - logger.warn( "Could not read password for '" + cvsRoot + "' from '" + passFile + "'", e ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Could not read password for '" + cvsRoot + "' from '" + passFile + "'", e ); + } return null; } finally @@ -304,13 +307,19 @@ } catch ( IOException e ) { - logger.error( "Warning: could not close password file." ); + if ( logger.isErrorEnabled() ) + { + logger.error( "Warning: could not close password file." ); + } } } } if ( password == null ) { - logger.error( "Didn't find password for CVSROOT '" + cvsRoot + "'." ); + if ( logger.isErrorEnabled() ) + { + logger.error( "Didn't find password for CVSROOT '" + cvsRoot + "'." ); + } } return password; } @@ -405,14 +414,20 @@ } catch ( IllegalArgumentException e ) { - logger.error( "Invalid argument: " + e ); + if ( logger.isErrorEnabled() ) + { + logger.error( "Invalid argument: " + e ); + } return false; } // if we don't have a CVS root by now, the user has messed up if ( globalOptions.getCVSRoot() == null ) { - logger.error( "No CVS root is set. Check your <repository> information in the POM." ); + if ( logger.isErrorEnabled() ) + { + logger.error( "No CVS root is set. Check your <repository> information in the POM." ); + } return false; } @@ -425,9 +440,12 @@ } catch ( IllegalArgumentException e ) { - logger.error( "Incorrect format for CVSRoot: " + cvsRoot + "\nThe correct format is: " - + "[:method:][[user][:[EMAIL PROTECTED]:[port]]/path/to/repository" - + "\nwhere \"method\" is pserver." ); + if ( logger.isErrorEnabled() ) + { + logger.error( "Incorrect format for CVSRoot: " + cvsRoot + "\nThe correct format is: " + + "[:method:][[user][:[EMAIL PROTECTED]:[port]]/path/to/repository" + + "\nwhere \"method\" is pserver." ); + } return false; } @@ -443,7 +461,10 @@ } catch ( IllegalArgumentException e ) { - logger.error( "Illegal argument: " + e.getMessage() ); + if ( logger.isErrorEnabled() ) + { + logger.error( "Illegal argument: " + e.getMessage() ); + } return false; } @@ -476,7 +497,10 @@ cvsCommand.connect( root, password ); cvsCommand.addListener( listener ); - logger.debug( "Executing CVS command: " + c.getCVSCommand() ); + if ( logger.isDebugEnabled() ) + { + logger.debug( "Executing CVS command: " + c.getCVSCommand() ); + } boolean result = cvsCommand.executeCommand( c ); cvsCommand.disconnect(); return result; Modified: maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java?rev=691832&r1=691831&r2=691832&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java (original) +++ maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/diff/GitDiffConsumer.java Wed Sep 3 16:54:44 2008 @@ -139,7 +139,10 @@ if ( currentFile == null ) { - logger.warn( "Unparseable line: '" + line + "'" ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unparseable line: '" + line + "'" ); + } patch.append( line ).append( "\n" ); return; } @@ -175,7 +178,10 @@ { // TODO: handle property differences - logger.warn( "Unparseable line: '" + line + "'" ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unparseable line: '" + line + "'" ); + } patch.append( line ).append( "\n" ); // skip to next file currentFile = 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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java?rev=691832&r1=691831&r2=691832&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/AbstractFileCheckingConsumer.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/AbstractFileCheckingConsumer.java Wed Sep 3 16:54:44 2008 @@ -59,7 +59,10 @@ return; } - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } parseLine( 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/GitCommandLineUtils.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/GitCommandLineUtils.java?rev=691832&r1=691831&r2=691832&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/GitCommandLineUtils.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/GitCommandLineUtils.java Wed Sep 3 16:54:44 2008 @@ -90,8 +90,11 @@ ScmLogger logger ) throws ScmException { - logger.info( "Executing: " + cl ); - logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Executing: " + cl ); + logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + } int exitCode; try @@ -110,8 +113,11 @@ CommandLineUtils.StringStreamConsumer stderr, ScmLogger logger ) throws ScmException { - logger.info( "Executing: " + cl ); - logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Executing: " + cl ); + logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + } int exitCode; try 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -87,7 +87,10 @@ } else { - logger.info( "could not parse line: " + line ); + if ( logger.isInfoEnabled() ) + { + logger.info( "could not parse line: " + line ); + } return; } 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -104,7 +104,10 @@ /** [EMAIL PROTECTED] */ public void consumeLine( String line ) { - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } if ( StringUtils.isEmpty( line ) ) { return; 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -108,7 +108,10 @@ if ( currentFile == null ) { - logger.warn( "Unparseable line: '" + line + "'" ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unparseable line: '" + line + "'" ); + } patch.append( line ).append( "\n" ); return; } @@ -140,7 +143,10 @@ { // TODO: handle property differences - logger.warn( "Unparseable line: '" + line + "'" ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unparseable line: '" + line + "'" ); + } patch.append( line ).append( "\n" ); // skip to next file currentFile = null; 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -60,7 +60,10 @@ return; } - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } parseLine( 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/SvnCommandLineUtils.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/SvnCommandLineUtils.java?rev=691832&r1=691831&r2=691832&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/SvnCommandLineUtils.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/SvnCommandLineUtils.java Wed Sep 3 16:54:44 2008 @@ -151,7 +151,10 @@ if ( exitCode != 0 && stderr.getOutput() != null && stderr.getOutput().indexOf( "'svn cleanup'" ) > 0 && stderr.getOutput().indexOf( "'svn help cleanup'" ) > 0 ) { - logger.info( "Svn command failed due to some locks in working copy. We try to run a 'svn cleanup'." ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Svn command failed due to some locks in working copy. We try to run a 'svn cleanup'." ); + } if ( executeCleanUp( cl.getWorkingDirectory(), consumer, stderr, logger ) == 0 ) { @@ -179,8 +182,11 @@ if ( logger != null ) { - logger.info( "Executing: " + SvnCommandLineUtils.cryptPassword( cl ) ); - logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Executing: " + SvnCommandLineUtils.cryptPassword( cl ) ); + logger.info( "Working directory: " + cl.getWorkingDirectory().getAbsolutePath() ); + } } return CommandLineUtils.executeCommandLine( cl, stdout, stderr ); 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -56,7 +56,10 @@ { if ( line.length() <= 3 ) { - logger.warn( "Unexpected input, the line must be at least three characters long. Line: '" + line + "'." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unexpected input, the line must be at least three characters long. Line: '" + line + "'." ); + } return; } @@ -73,7 +76,10 @@ } else { - logger.info( "Unknown file status: '" + statusString + "'." ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Unknown file status: '" + statusString + "'." ); + } return; } 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=691832&r1=691831&r2=691832&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 Sep 3 16:54:44 2008 @@ -95,7 +95,10 @@ } else { - logger.info( "Unknown line: '" + line + "'" ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Unknown line: '" + line + "'" ); + } return; } 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/remove/SvnRemoveConsumer.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/remove/SvnRemoveConsumer.java?rev=691832&r1=691831&r2=691832&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/remove/SvnRemoveConsumer.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/remove/SvnRemoveConsumer.java Wed Sep 3 16:54:44 2008 @@ -56,7 +56,10 @@ { if ( line.length() <= 3 ) { - logger.warn( "Unexpected input, the line must be at least three characters long. Line: '" + line + "'." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unexpected input, the line must be at least three characters long. Line: '" + line + "'." ); + } return; } @@ -73,7 +76,10 @@ } else { - logger.info( "Unknown file status: '" + statusString + "'." ); + if ( logger.isInfoEnabled() ) + { + logger.info( "Unknown file status: '" + statusString + "'." ); + } return; } 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/status/SvnStatusConsumer.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/status/SvnStatusConsumer.java?rev=691832&r1=691831&r2=691832&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/status/SvnStatusConsumer.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/status/SvnStatusConsumer.java Wed Sep 3 16:54:44 2008 @@ -60,7 +60,10 @@ /** [EMAIL PROTECTED] */ public void consumeLine( String line ) { - logger.debug( line ); + if ( logger.isDebugEnabled() ) + { + logger.debug( line ); + } if ( StringUtils.isEmpty( line.trim() ) ) { return; @@ -68,7 +71,10 @@ if ( line.length() <= 7 ) { - logger.warn( "Unexpected input, the line must be at least seven characters long. Line: '" + line + "'." ); + if ( logger.isWarnEnabled() ) + { + logger.warn( "Unexpected input, the line must be at least seven characters long. Line: '" + line + "'." ); + } return; }
