You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by hb...@apache.org on 2008/08/03 00:21:51 UTC

svn commit: r682071 - in /maven/wagon/trunk/wagon-providers: wagon-file/src/main/java/org/apache/maven/wagon/providers/file/ wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/ wagon-http-lightweight/src/main/java/org/apache/maven/wagon/provi...

Author: hboutemy
Date: Sat Aug  2 15:21:46 2008
New Revision: 682071

URL: http://svn.apache.org/viewvc?rev=682071&view=rev
Log:
fixed errors reported by Checkstyle

Modified:
    maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
    maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
    maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
    maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java
    maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
    maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
    maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
    maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
    maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/PathNavigatorTest.java

Modified: maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-file/src/main/java/org/apache/maven/wagon/providers/file/FileWagon.java Sat Aug  2 15:21:46 2008
@@ -125,7 +125,8 @@
         {
             if ( !basedir.mkdirs() )
             {
-                throw new ConnectionException( "Repository path " + basedir + " does not exist, and cannot be created." );
+                throw new ConnectionException( "Repository path " + basedir + " does not exist,"
+                                               + " and cannot be created." );
             }
         }
 

Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/src/main/java/org/apache/maven/wagon/providers/ftp/FtpWagon.java Sat Aug  2 15:21:46 2008
@@ -105,8 +105,8 @@
         String host = getRepository().getHost();
 
         ftp = new FTPClient();
-        ftp.setDefaultTimeout(getTimeout());
-        ftp.setDataTimeout(getTimeout());
+        ftp.setDefaultTimeout( getTimeout() );
+        ftp.setDataTimeout( getTimeout() );
         
         ftp.addProtocolCommandListener( new PrintCommandListener( this ) );
 
@@ -293,7 +293,7 @@
                 }
             }
 
-            // we come back to orginal basedir so
+            // we come back to original basedir so
             // FTP wagon is ready for next requests
             if ( !ftp.changeWorkingDirectory( getRepository().getBasedir() ) )
             {
@@ -304,8 +304,8 @@
 
             if ( os == null )
             {
-                String msg = "Cannot transfer resource:  '" + resource +
-                    "' Output stream is null. FTP Server response: " + ftp.getReplyString();
+                String msg = "Cannot transfer resource:  '" + resource
+                    + "'. Output stream is null. FTP Server response: " + ftp.getReplyString();
 
                 throw new TransferFailedException( msg );
 
@@ -394,7 +394,7 @@
     public class PrintCommandListener
         implements ProtocolCommandListener
     {
-        FtpWagon wagon;
+        private FtpWagon wagon;
 
         public PrintCommandListener( FtpWagon wagon )
         {
@@ -421,7 +421,7 @@
     public List getFileList( String destinationDirectory )
         throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException
     {
-        Resource resource = new Resource(destinationDirectory);
+        Resource resource = new Resource( destinationDirectory );
         
         try 
         {
@@ -436,13 +436,14 @@
             }
             
             List ret = new ArrayList();
-            for(int i=0; i<ftpFiles.length; i++)
+            for( int i=0; i < ftpFiles.length; i++ )
             {
-                ret.add(ftpFiles[i].getName());
+                ret.add( ftpFiles[i].getName() );
             }
             
             return ret;
-        } catch(IOException e)
+        }
+        catch ( IOException e )
         {
             throw new TransferFailedException( "Error transferring file via FTP", e );
         }
@@ -460,7 +461,8 @@
             String filename = PathUtils.filename( resource.getName() );
             int status = ftp.stat( filename );
 
-            return ( ( status == FTPReply.FILE_STATUS ) || ( status == FTPReply.FILE_STATUS_OK ) || ( status == FTPReply.SYSTEM_STATUS ) );
+            return ( ( status == FTPReply.FILE_STATUS ) || ( status == FTPReply.FILE_STATUS_OK )
+                            || ( status == FTPReply.SYSTEM_STATUS ) );
         }
         catch ( IOException e )
         {
@@ -509,6 +511,7 @@
         if ( sourceFile.isDirectory() )
         {
             if ( !fileName.equals( "." ) )
+            {
                 try
                 {
                     // change directory if it already exists.
@@ -523,6 +526,7 @@
                                 // This appears to be a conscious decision, based on other parts of this code.
                                 String group = permissions.getGroup();
                                 if ( group != null )
+                                {
                                     try
                                     {
                                         ftp.sendSiteCommand( "CHGRP " + permissions.getGroup() );
@@ -530,8 +534,10 @@
                                     catch ( IOException e )
                                     {
                                     }
+                                }
                                 String mode = permissions.getDirectoryMode();
                                 if ( mode != null )
+                                {
                                     try
                                     {
                                         ftp.sendSiteCommand( "CHMOD " + permissions.getDirectoryMode() );
@@ -539,6 +545,7 @@
                                     catch ( IOException e )
                                     {
                                     }
+                                }
                             }
 
                             if ( !ftp.changeWorkingDirectory( fileName ) )
@@ -559,6 +566,7 @@
                     throw new TransferFailedException( "IOException caught while processing path at "
                                     + sourceFile.getAbsolutePath(), e );
                 }
+            }
 
             File[] files = sourceFile.listFiles();
             if ( files != null && files.length > 0 )
@@ -589,9 +597,9 @@
             }
             catch ( IOException e )
             {
-                throw new TransferFailedException(
-                                                   "IOException caught while attempting to step up to parent directory after successfully processing "
-                                                                   + sourceFile.getAbsolutePath(), e );
+                throw new TransferFailedException( "IOException caught while attempting to step up to parent directory"
+                                                   + " after successfully processing " + sourceFile.getAbsolutePath(),
+                                                   e );
             }
         }
         else

Modified: maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-lightweight/src/main/java/org/apache/maven/wagon/providers/http/LightweightHttpWagon.java Sat Aug  2 15:21:46 2008
@@ -336,7 +336,8 @@
 
         if ( is == null )
         {
-            throw new TransferFailedException( url + " - Could not open input stream for resource: '" + resource + "'" );
+            throw new TransferFailedException( url + " - Could not open input stream for resource: '" + resource
+                                               + "'" );
         }
 
         return HtmlFileListParser.parseFileList( url, is );

Modified: maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java Sat Aug  2 15:21:46 2008
@@ -371,7 +371,7 @@
                     return true;
 
                 case SC_NULL:
-                    throw new TransferFailedException( "Failed to transfer file: " + url);
+                    throw new TransferFailedException( "Failed to transfer file: " + url );
 
                 case HttpStatus.SC_FORBIDDEN:
                     throw new AuthorizationException( "Access denied to: " + url );
@@ -397,16 +397,16 @@
         }
     }
 
-    protected int execute(HttpMethod httpMethod) throws HttpException, IOException
+    protected int execute( HttpMethod httpMethod ) throws HttpException, IOException
     {
         int statusCode = SC_NULL;
         httpMethod.getParams().setSoTimeout( getTimeout() );
-        setHeaders(httpMethod);
+        setHeaders( httpMethod );
         statusCode = client.executeMethod( httpMethod );
         return statusCode;
     }
 
-    protected void setHeaders(HttpMethod method)
+    protected void setHeaders( HttpMethod method )
     {
         // TODO: merge with the other headers and have some better defaults, unify with lightweight headers
         method.addRequestHeader( "Cache-control", "no-cache" );
@@ -436,11 +436,13 @@
         return repository.getUrl();
     }
 
-    protected HttpClient getClient() {
+    protected HttpClient getClient()
+    {
         return client;
     }
 
-    public void setConnectionManager(HttpConnectionManager connectionManager) {
+    public void setConnectionManager( HttpConnectionManager connectionManager )
+    {
         this.connectionManager = connectionManager;
     }
 

Modified: maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-scm/src/main/java/org/apache/maven/wagon/providers/scm/ScmWagon.java Sat Aug  2 15:21:46 2008
@@ -81,7 +81,7 @@
     /**
      * Get the {@link ScmManager} used in this Wagon
      *
-     * @return rhe {@link ScmManager}
+     * @return the {@link ScmManager}
      */
     public ScmManager getScmManager()
     {
@@ -310,7 +310,8 @@
                 }
             }
 
-            ScmResult result = scmProvider.checkIn( scmRepository, new ScmFileSet( checkoutDirectory ), (ScmVersion) null, msg );
+            ScmResult result = scmProvider.checkIn( scmRepository, new ScmFileSet( checkoutDirectory ),
+                                                    (ScmVersion) null, msg );
 
             checkScmResult( result );
         }
@@ -345,7 +346,8 @@
      * @return
      * @throws TransferFailedException
      */
-    private String checkOut( ScmProvider scmProvider, ScmRepository scmRepository, String targetName, Resource resource )
+    private String checkOut( ScmProvider scmProvider, ScmRepository scmRepository, String targetName,
+                             Resource resource )
         throws TransferFailedException
     {
         checkoutDirectory = createCheckoutDirectory();
@@ -356,7 +358,7 @@
 
         // totally ignore scmRepository parent stuff since that is not supported by all scms.
         // Instead, assume that that url exists. If not, then that's an error.
-        // Check wheter targetName, which is a relative path into the scm, exists.
+        // Check whether targetName, which is a relative path into the scm, exists.
         // If it doesn't, check the parent, etc.
 
         try
@@ -410,8 +412,8 @@
             File newDir = new File( checkoutDirectory, relPath );
             if ( !newDir.mkdirs() )
             {
-                throw new TransferFailedException( "Failed to create directory " + newDir.getAbsolutePath() +
-                    "; parent should exist: " + checkoutDirectory );
+                throw new TransferFailedException( "Failed to create directory " + newDir.getAbsolutePath()
+                    + "; parent should exist: " + checkoutDirectory );
             }
 
             try
@@ -515,8 +517,8 @@
     {
         if ( !result.isSuccess() )
         {
-            throw new ScmException( "Unable to commit file. " + result.getProviderMessage() + " " +
-                ( result.getCommandOutput() == null ? "" : result.getCommandOutput() ) );
+            throw new ScmException( "Unable to commit file. " + result.getProviderMessage() + " "
+                + ( result.getCommandOutput() == null ? "" : result.getCommandOutput() ) );
         }
     }
 
@@ -556,7 +558,8 @@
             fireGetStarted( resource, destination );
 
             // TODO: limitations:
-            // - destination filename must match that in the repository - should allow the "-d" CVS equiv to be passed in
+            // - destination filename must match that in the repository - should allow the "-d" CVS equiv to be passed
+            //   in
             // - we don't get granular exceptions from SCM (ie, auth, not found)
             // - need to make it non-recursive to save time
             // - exists() check doesn't test if it is in SCM already
@@ -575,7 +578,7 @@
             }
             else
             {
-                // TODO: this should be checking out a full hierachy (requires the -d equiv)
+                // TODO: this should be checking out a full hierarchy (requires the -d equiv)
                 basedir.mkdirs();
 
                 scmProvider.checkOut( scmRepository, new ScmFileSet( basedir ), (ScmVersion) null );
@@ -664,15 +667,15 @@
         }
     }
 
-    private String getFilename( String filename)
+    private String getFilename( String filename )
     {
-        String fname = StringUtils.replace( filename, "/", File.separator);
-        return FileUtils.filename( fname);
+        String fname = StringUtils.replace( filename, "/", File.separator );
+        return FileUtils.filename( fname );
     }
 
-    private String getDirname( String filename)
+    private String getDirname( String filename )
     {
-        String fname = StringUtils.replace( filename, "/", File.separator);
-        return FileUtils.dirname( fname);
+        String fname = StringUtils.replace( filename, "/", File.separator );
+        return FileUtils.dirname( fname );
     }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/src/main/java/org/apache/maven/wagon/providers/ssh/knownhost/KnownHostsProviderTestCase.java Sat Aug  2 15:21:46 2008
@@ -41,7 +41,10 @@
     private static final String CORRECT_KEY = TestData.getHostKey();
 
     private static final String CHANGED_KEY =
-        "AAAAB3NzaC1yc2EAAAABIwAAAQEA8VLKkfHl2CNqW+m0603z07dyweWzzdVGQlMPUX4z1264E7M/h+6lPKiOo+u49CL7eQVA+FtWTZoJ3oBAMABcKnHx41TnSpQUkbdR6rzyC6IG1lXiVtEjG2w7DUnxpCtVo5PaQuJobwoXv5NNL3vx03THPgcDJquLPWvGnDWhnXoEh3/6c7rprwT+PrjZ6LIT35ZCUGajoehhF151oNbFMQHllfR6EAiZIP0z0nIVI+Jiv6g+XZapumVPVYjdOfxvLKQope1H9HJamT3bDIm8mkebUB10DzQJYxFt4/0wiNH3L4jsIFn+CiW1/IQm5yyff1CUO87OqVbtp9BlaXZNmw==";
+        "AAAAB3NzaC1yc2EAAAABIwAAAQEA8VLKkfHl2CNqW+m0603z07dyweWzzdVGQlMPUX4z1264E7M/h+6lPKiOo+u49CL7eQVA+FtW"
+        + "TZoJ3oBAMABcKnHx41TnSpQUkbdR6rzyC6IG1lXiVtEjG2w7DUnxpCtVo5PaQuJobwoXv5NNL3vx03THPgcDJquLPWvGnDWhnXoEh"
+        + "3/6c7rprwT+PrjZ6LIT35ZCUGajoehhF151oNbFMQHllfR6EAiZIP0z0nIVI+Jiv6g+XZapumVPVYjdOfxvLKQope1H9HJamT3bDI"
+        + "m8mkebUB10DzQJYxFt4/0wiNH3L4jsIFn+CiW1/IQm5yyff1CUO87OqVbtp9BlaXZNmw==";
 
     /**
      * tests what happens if the remote host has a different key than the one

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/CommandExecutorStreamProcessor.java Sat Aug  2 15:21:46 2008
@@ -52,10 +52,10 @@
                 break;
             }
 
-            // TODO: I think we need to deal with exit codes instead, but IIRC there are some cases of errors that don't have exit codes
-            // ignore this error. TODO: output a warning
-            if ( !line.startsWith( "Could not chdir to home directory" ) &&
-                !line.endsWith( "ttyname: Operation not supported" ) )
+            // TODO: I think we need to deal with exit codes instead, but IIRC there are some cases of errors that
+            // don't have exit codes ignore this error. TODO: output a warning
+            if ( !line.startsWith( "Could not chdir to home directory" )
+                 && !line.endsWith( "ttyname: Operation not supported" ) )
             {
                 streams.setErr( streams.getErr() + line + "\n" );
             }

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common/src/main/java/org/apache/maven/wagon/providers/ssh/LSParser.java Sat Aug  2 15:21:46 2008
@@ -37,7 +37,8 @@
  */
 public class LSParser
 {
-    private Pattern PATTERN = Pattern.compile( ".+\\s+[0-9]+\\s+.+\\s+.+\\s+[0-9]+\\s+([0-9]{4}-[0-9]{2}-[0-9]{2}|.+\\s+[0-9]+)\\s+[0-9:]+\\s+(.+?)" );
+    private final static Pattern PATTERN = Pattern.compile( ".+\\s+[0-9]+\\s+.+\\s+.+\\s+[0-9]+\\s+"
+                                                   + "([0-9]{4}-[0-9]{2}-[0-9]{2}|.+\\s+[0-9]+)\\s+[0-9:]+\\s+(.+?)" );
     
     /**
      * Parse a raw "ls -la", and obtain the list of files.

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-external/src/main/java/org/apache/maven/wagon/providers/ssh/external/ScpExternalWagon.java Sat Aug  2 15:21:46 2008
@@ -312,7 +312,8 @@
                 }
                 else
                 {
-                    TransferFailedException e = new TransferFailedException( "Exit code: " + exitCode + " - " + err.getOutput() );
+                    TransferFailedException e = new TransferFailedException( "Exit code: " + exitCode + " - "
+                                                                             + err.getOutput() );
 
                     fireTransferError( resource, e, put ? TransferEvent.REQUEST_PUT : TransferEvent.REQUEST_GET );
 

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/AbstractJschWagon.java Sat Aug  2 15:21:46 2008
@@ -149,7 +149,7 @@
                 userName = System.getProperty( "user.name" );
             }
             session = sch.getSession( userName, host, port );
-            session.setTimeout(getTimeout());
+            session.setTimeout( getTimeout() );
         }
         catch ( JSchException e )
         {

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/ScpWagon.java Sat Aug  2 15:21:46 2008
@@ -43,7 +43,8 @@
  * Note that this implementation is <i>not</i> thread-safe, and multiple channels can not be used on the session at
  * the same time.
  * 
- * See <a href="http://blogs.sun.com/janp/entry/how_the_scp_protocol_works">http://blogs.sun.com/janp/entry/how_the_scp_protocol_works</a>
+ * See <a href="http://blogs.sun.com/janp/entry/how_the_scp_protocol_works">
+ * http://blogs.sun.com/janp/entry/how_the_scp_protocol_works</a>
  * for information on how the SCP protocol works.
  *
  * @version $Id$
@@ -386,8 +387,8 @@
         {
             fireTransferError( resource, e, TransferEvent.REQUEST_PUT );            
             
-            String msg = "Error occured while deploying '" + resourceName + "' to remote repository: " +
-                getRepository().getUrl() + ": " + e.getMessage();
+            String msg = "Error occured while deploying '" + resourceName + "' to remote repository: "
+                + getRepository().getUrl() + ": " + e.getMessage();
 
             throw new TransferFailedException( msg, e );
         }
@@ -408,8 +409,8 @@
         {
             fireTransferError( resource, e, TransferEvent.REQUEST_PUT );            
             
-            String msg = "Error occured while deploying '" + resource.getName() + "' to remote repository: " +
-                getRepository().getUrl() + ": " + e.getMessage();
+            String msg = "Error occured while deploying '" + resource.getName() + "' to remote repository: "
+                + getRepository().getUrl() + ": " + e.getMessage();
    
             throw new TransferFailedException( msg, e );
         }

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/SftpWagon.java Sat Aug  2 15:21:46 2008
@@ -89,7 +89,8 @@
         }
         catch ( JSchException e )
         {
-            throw new AuthenticationException( "Error connecting to remote repository: " + getRepository().getUrl(), e );
+            throw new AuthenticationException( "Error connecting to remote repository: " + getRepository().getUrl(),
+                                               e );
         }
     }
 

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/jsch/interactive/TraditionalUIKeyboardInteractive.java Sat Aug  2 15:21:46 2008
@@ -27,7 +27,7 @@
  * user interaction :). This implementation expects only one prompt with the
  * word password in it.
  * <p/>
- * <code>UIKeyboardInteractive</code> are usefull when you don't use user with
+ * <code>UIKeyboardInteractive</code> are useful when you don't use user with
  * password authentication with a server that use keyboard-interactive and
  * doesn't allow password method <code>PasswordAuthentication no</code>.
  *
@@ -61,8 +61,8 @@
 
         String[] ret;
 
-        if ( prompt.length == echo.length && prompt.length == 1 && !echo[0] &&
-            prompt[0].toLowerCase().indexOf( "password" ) > -1 )
+        if ( prompt.length == echo.length && prompt.length == 1 && !echo[0]
+             && prompt[0].toLowerCase().indexOf( "password" ) > -1 )
         {
 
             ret = new String[1];

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java Sat Aug  2 15:21:46 2008
@@ -31,7 +31,8 @@
  * MultiStatus representing the content of a multistatus response body and
  * allows to retrieve the Xml representation.
  */
-public class MultiStatus implements DavConstants, XmlSerializable {
+public class MultiStatus implements DavConstants, XmlSerializable
+{
 
     /**
      * Map collecting the responses for this multistatus, where every href must
@@ -57,13 +58,16 @@
      * @param propFindType
      * @param depth
      */
-    public void addResourceProperties(DavResource resource, DavPropertyNameSet propNameSet,
-                                      int propFindType, int depth) {
-        addResponse(new MultiStatusResponse(resource, propNameSet, propFindType));
-        if (depth > 0 && resource.isCollection()) {
+    public void addResourceProperties( DavResource resource, DavPropertyNameSet propNameSet, int propFindType,
+                                       int depth )
+    {
+        addResponse( new MultiStatusResponse( resource, propNameSet, propFindType ) );
+        if ( depth > 0 && resource.isCollection() )
+        {
             DavResourceIterator iter = resource.getMembers();
-            while (iter.hasNext()) {
-                addResourceProperties(iter.nextResource(), propNameSet, propFindType, depth-1);
+            while ( iter.hasNext() )
+            {
+                addResourceProperties( iter.nextResource(), propNameSet, propFindType, depth - 1 );
             }
         }
     }
@@ -80,9 +84,9 @@
      * @see #addResourceProperties(DavResource, DavPropertyNameSet, int, int) for
      * the corresponding method that allows to specify the type explicitely.
      */
-    public void addResourceProperties(DavResource resource, DavPropertyNameSet propNameSet,
-                                      int depth) {
-        addResourceProperties(resource, propNameSet, PROPFIND_BY_PROPERTY, depth);
+    public void addResourceProperties( DavResource resource, DavPropertyNameSet propNameSet, int depth )
+    {
+        addResourceProperties( resource, propNameSet, PROPFIND_BY_PROPERTY, depth );
     }
 
     /**
@@ -94,12 +98,15 @@
      * @param status
      * @param depth
      */
-    public void addResourceStatus(DavResource resource, int status, int depth) {
-        addResponse(new MultiStatusResponse(resource.getHref(), status));
-        if (depth > 0 && resource.isCollection()) {
+    public void addResourceStatus( DavResource resource, int status, int depth )
+    {
+        addResponse( new MultiStatusResponse( resource.getHref(), status ) );
+        if ( depth > 0 && resource.isCollection() )
+        {
             DavResourceIterator iter = resource.getMembers();
-            while (iter.hasNext()) {
-                addResourceStatus(iter.nextResource(), status, depth-1);
+            while ( iter.hasNext() )
+            {
+                addResourceStatus( iter.nextResource(), status, depth - 1 );
             }
         }
     }
@@ -109,8 +116,9 @@
      *
      * @param response
      */
-    public void addResponse(MultiStatusResponse response) {
-        responses.put(response.getHref(), response);
+    public void addResponse( MultiStatusResponse response )
+    {
+        responses.put( response.getHref(), response );
     }
 
     /**
@@ -119,8 +127,9 @@
      * @return array of all {@link MultiStatusResponse responses} present in this
      * multistatus.
      */
-    public MultiStatusResponse[] getResponses() {
-        return (MultiStatusResponse[]) responses.values().toArray(new MultiStatusResponse[responses.size()]);
+    public MultiStatusResponse[] getResponses()
+    {
+        return (MultiStatusResponse[]) responses.values().toArray( new MultiStatusResponse[responses.size()] );
     }
 
     /**
@@ -128,7 +137,8 @@
      *
      * @param responseDescription
      */
-    public void setResponseDescription(String responseDescription) {
+    public void setResponseDescription( String responseDescription )
+    {
         this.responseDescription = responseDescription;
     }
 
@@ -137,7 +147,8 @@
      *
      * @return responseDescription
      */
-    public String getResponseDescription() {
+    public String getResponseDescription()
+    {
         return responseDescription;
     }
 
@@ -147,15 +158,19 @@
      * @return Xml document
      * @param document
      */
-    public Element toXml(Document document) {
-        Element multistatus = DomUtil.createElement(document, XML_MULTISTATUS, NAMESPACE);
+    public Element toXml( Document document )
+    {
+        Element multistatus = DomUtil.createElement( document, XML_MULTISTATUS, NAMESPACE );
         Iterator it = responses.values().iterator();
-        while(it.hasNext()) {
-            multistatus.appendChild(((MultiStatusResponse)it.next()).toXml(document));
-        }
-        if (responseDescription != null) {
-            Element respDesc = DomUtil.createElement(document, XML_RESPONSEDESCRIPTION, NAMESPACE, responseDescription);
-            multistatus.appendChild(respDesc);
+        while ( it.hasNext() )
+        {
+            multistatus.appendChild( ( (MultiStatusResponse) it.next() ).toXml( document ) );
+        }
+        if ( responseDescription != null )
+        {
+            Element respDesc =
+                DomUtil.createElement( document, XML_RESPONSEDESCRIPTION, NAMESPACE, responseDescription );
+            multistatus.appendChild( respDesc );
         }
         return multistatus;
     }
@@ -168,22 +183,26 @@
      * @throws IllegalArgumentException if the given document is <code>null</code>
      * or does not provide the required element.
      */
-    public static MultiStatus createFromXml(Element multistatusElement) {
-        if (!DomUtil.matches(multistatusElement, XML_MULTISTATUS, NAMESPACE)) {
-            throw new IllegalArgumentException("DAV:multistatus element expected.");
+    public static MultiStatus createFromXml( Element multistatusElement )
+    {
+        if ( !DomUtil.matches( multistatusElement, XML_MULTISTATUS, NAMESPACE ) )
+        {
+            throw new IllegalArgumentException( "DAV:multistatus element expected." );
         }
 
         MultiStatus multistatus = new MultiStatus();
 
-        ElementIterator it = DomUtil.getChildren(multistatusElement, XML_RESPONSE, NAMESPACE);
-        while (it.hasNext()) {
+        ElementIterator it = DomUtil.getChildren( multistatusElement, XML_RESPONSE, NAMESPACE );
+        while ( it.hasNext() )
+        {
             Element respElem = it.nextElement();
-            MultiStatusResponse response = MultiStatusResponse.createFromXml(respElem);
-            multistatus.addResponse(response);
+            MultiStatusResponse response = MultiStatusResponse.createFromXml( respElem );
+            multistatus.addResponse( response );
         }
 
         // optional response description on the multistatus element
-        multistatus.setResponseDescription(DomUtil.getChildText(multistatusElement, XML_RESPONSEDESCRIPTION, NAMESPACE));
+        multistatus.setResponseDescription( DomUtil.getChildText( multistatusElement, XML_RESPONSEDESCRIPTION,
+                                                                  NAMESPACE ) );
         return multistatus;
     }
 }

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/jackrabbit/webdav/client/methods/XmlRequestEntity.java Sat Aug  2 15:21:46 2008
@@ -36,48 +36,55 @@
 /**
  * <code>XmlRequestEntity</code>...
  */
-public class XmlRequestEntity implements RequestEntity {
+public class XmlRequestEntity implements RequestEntity
+{
 
-    private static Logger log = LoggerFactory.getLogger(XmlRequestEntity.class);
+    private static Logger log = LoggerFactory.getLogger( XmlRequestEntity.class );
 
     private final RequestEntity delegatee;
 
-    public XmlRequestEntity(Document xmlDocument) throws IOException {
+    public XmlRequestEntity( Document xmlDocument ) throws IOException
+    {
         super();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
 
-        try {
+        try
+        {
             TransformerFactory factory = TransformerFactory.newInstance();
             Transformer transformer = factory.newTransformer();
-            transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            transformer.setOutputProperty(OutputKeys.INDENT, "no");
-            transformer.transform(
-                    new DOMSource(xmlDocument), new StreamResult(out));
-        } catch (TransformerException e) {
-            log.error("XML serialization failed", e);
-            IOException exception =
-                new IOException("XML serialization failed");
-            exception.initCause(e);
+            transformer.setOutputProperty( OutputKeys.METHOD, "xml" );
+            transformer.setOutputProperty( OutputKeys.ENCODING, "UTF-8" );
+            transformer.setOutputProperty( OutputKeys.INDENT, "no" );
+            transformer.transform( new DOMSource( xmlDocument ), new StreamResult( out ) );
+        }
+        catch ( TransformerException e )
+        {
+            log.error( "XML serialization failed", e );
+            IOException exception = new IOException( "XML serialization failed" );
+            exception.initCause( e );
             throw exception;
         }
 
-        delegatee = new StringRequestEntity(out.toString(), "text/xml", "UTF-8");
+        delegatee = new StringRequestEntity( out.toString(), "text/xml", "UTF-8" );
     }
 
-    public boolean isRepeatable() {
+    public boolean isRepeatable()
+    {
         return delegatee.isRepeatable();
     }
 
-    public String getContentType() {
+    public String getContentType()
+    {
         return delegatee.getContentType();
     }
 
-    public void writeRequest(OutputStream out) throws IOException {
-        delegatee.writeRequest(out);
+    public void writeRequest( OutputStream out ) throws IOException
+    {
+        delegatee.writeRequest( out );
     }
 
-    public long getContentLength() {
+    public long getContentLength()
+    {
         return delegatee.getContentLength();
     }
 }
\ No newline at end of file

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/PathNavigator.java Sat Aug  2 15:21:46 2008
@@ -33,27 +33,27 @@
 
     private int currentPosition;
 
-    public PathNavigator(String path)
+    public PathNavigator( String path )
     {
-        list = Arrays.asList(StringUtils.split(path, "/"));
+        list = Arrays.asList( StringUtils.split( path, "/" ) );
         currentPosition = list.size() + 1;
     }
 
     public String getPath()
     {
-        List currentPathList = list.subList(0, currentPosition);
+        List currentPathList = list.subList( 0, currentPosition );
         StringBuffer sb = new StringBuffer();
-        for (int i = 0; i < currentPathList.size(); i++)
+        for ( int i = 0; i < currentPathList.size(); i++ )
         {
-            sb.append(currentPathList.get(i));
-            sb.append('/');
+            sb.append( currentPathList.get( i ) );
+            sb.append( '/' );
         }
         return sb.toString();
     }
 
     public boolean backward()
     {
-        if (currentPosition - 1 == 0)
+        if ( currentPosition - 1 == 0 )
         {
             return false;
         }
@@ -63,7 +63,7 @@
 
     public boolean forward()
     {
-        if (currentPosition + 1 > list.size())
+        if ( currentPosition + 1 > list.size() )
         {
             return false;
         }

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Sat Aug  2 15:21:46 2008
@@ -135,23 +135,26 @@
         }
     }
 
-    private int doMkCol(String url) throws HttpException, IOException
+    private int doMkCol( String url ) throws HttpException, IOException
     {
         MkColMethod method = null;
         try
         {
-            method = new MkColMethod(url);
-            return execute(method);
+            method = new MkColMethod( url );
+            return execute( method );
         }
         finally
         {
-            if (method != null) method.releaseConnection();
+            if ( method != null )
+            {
+                method.releaseConnection();
+            }
         }
     }
 
-    private String getUrl(PathNavigator navigator)
+    private String getUrl( PathNavigator navigator )
     {
-        String url = getRepository().getUrl().replaceAll(getRepository().getBasedir(), "");
+        String url = getRepository().getUrl().replaceAll( getRepository().getBasedir(), "" );
         return url + '/' + navigator.getPath();
     }
 
@@ -188,30 +191,31 @@
     private boolean isDirectory( String url ) throws IOException, DavException
     {
         DavPropertyNameSet nameSet = new DavPropertyNameSet();
-        nameSet.add(DavPropertyName.create(DavConstants.PROPERTY_RESOURCETYPE));
+        nameSet.add( DavPropertyName.create( DavConstants.PROPERTY_RESOURCETYPE ) );
 
         PropFindMethod method = null;
         try
         {
-            method = new PropFindMethod(url, nameSet, DavConstants.DEPTH_0);
-            execute(method);
-            if (method.succeeded())
+            method = new PropFindMethod( url, nameSet, DavConstants.DEPTH_0 );
+            execute( method );
+            if ( method.succeeded() )
             {
                 MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
                 MultiStatusResponse response = multiStatus.getResponses()[0];
-                DavPropertySet propertySet = response.getProperties(HttpStatus.SC_OK);
-                DavProperty property = propertySet.get(DavConstants.PROPERTY_RESOURCETYPE);
-                if (property != null)
+                DavPropertySet propertySet = response.getProperties( HttpStatus.SC_OK );
+                DavProperty property = propertySet.get( DavConstants.PROPERTY_RESOURCETYPE );
+                if ( property != null )
                 {
-                    Node node = (Node)property.getValue();
-                    return node.getLocalName().equals(DavConstants.XML_COLLECTION);
+                    Node node = (Node) property.getValue();
+                    return node.getLocalName().equals( DavConstants.XML_COLLECTION );
                 }
             }
             return false;
         }
         finally
         {
-            if (method != null) method.releaseConnection();
+            if ( method != null )
+                method.releaseConnection();
         }
     }
 
@@ -222,49 +226,51 @@
         PropFindMethod method = null;
         try
         {
-            if (isDirectory(url))
+            if ( isDirectory( url ) )
             {
                 DavPropertyNameSet nameSet = new DavPropertyNameSet();
-                nameSet.add(DavPropertyName.create(DavConstants.PROPERTY_DISPLAYNAME));
+                nameSet.add( DavPropertyName.create( DavConstants.PROPERTY_DISPLAYNAME ) );
 
-                method = new PropFindMethod(url, nameSet, DavConstants.DEPTH_1);
-                int status = execute(method);
-                if (method.succeeded())
+                method = new PropFindMethod( url, nameSet, DavConstants.DEPTH_1 );
+                int status = execute( method );
+                if ( method.succeeded() )
                 {
                     ArrayList dirs = new ArrayList();
                     MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
 
-                    for (int i = 0; i < multiStatus.getResponses().length; i++)
+                    for ( int i = 0; i < multiStatus.getResponses().length; i++ )
                     {
                         MultiStatusResponse response = multiStatus.getResponses()[i];
-                        String fileName = PathUtils.filename(URLDecoder.decode( response.getHref()));
-                        if (!StringUtils.isEmpty(fileName))
+                        String fileName = PathUtils.filename( URLDecoder.decode( response.getHref() ) );
+                        if ( !StringUtils.isEmpty( fileName ) )
                         {
-                            dirs.add(fileName);
+                            dirs.add( fileName );
                         }
                     }
                     return dirs;
                 }
-                
-                if (status == HttpStatus.SC_NOT_FOUND)
+
+                if ( status == HttpStatus.SC_NOT_FOUND )
                 {
-                    throw new ResourceDoesNotExistException( "Destination directory does not exist: " + url ); 
+                    throw new ResourceDoesNotExistException( "Destination directory does not exist: " + url );
                 }
             }
         }
-        catch (DavException e)
+        catch ( DavException e )
         {
-            throw new TransferFailedException(e.getMessage(), e);
+            throw new TransferFailedException( e.getMessage(), e );
         }
-        catch (IOException e)
+        catch ( IOException e )
         {
-            throw new TransferFailedException(e.getMessage(), e); 
+            throw new TransferFailedException( e.getMessage(), e );
         }
         finally
         {
-            if (method != null) method.releaseConnection();
+            if ( method != null )
+                method.releaseConnection();
         }
-        throw new ResourceDoesNotExistException("Destination path exists but is not a " + "WebDAV collection (directory): " + url );
+        throw new ResourceDoesNotExistException( "Destination path exists but is not a "
+                        + "WebDAV collection (directory): " + url );
     }
     
     public String getURL( Repository repository )

Modified: maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/PathNavigatorTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/PathNavigatorTest.java?rev=682071&r1=682070&r2=682071&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/PathNavigatorTest.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav-jackrabbit/src/test/java/org/apache/maven/wagon/providers/webdav/PathNavigatorTest.java Sat Aug  2 15:21:46 2008
@@ -30,30 +30,30 @@
 
     public void testBackForwardBack()
     {
-        PathNavigator navigator = new PathNavigator(TEST_PATH);
+        PathNavigator navigator = new PathNavigator( TEST_PATH );
 
-        //Nav backward
-        assertTrue(navigator.backward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/maven/developer/", navigator.getPath());
+        // Nav backward
+        assertTrue( navigator.backward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/maven/developer/", navigator.getPath() );
 
-        assertTrue(navigator.backward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/maven/", navigator.getPath());
+        assertTrue( navigator.backward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/maven/", navigator.getPath() );
 
-        assertTrue(navigator.backward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath());
+        assertTrue( navigator.backward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath() );
 
-        assertTrue(navigator.backward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/", navigator.getPath());
+        assertTrue( navigator.backward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/", navigator.getPath() );
 
-        //Nav forward
-        assertTrue(navigator.forward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath());
+        // Nav forward
+        assertTrue( navigator.forward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath() );
 
-        assertTrue(navigator.forward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/maven/", navigator.getPath());
+        assertTrue( navigator.forward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/maven/", navigator.getPath() );
 
-        //Nav backward
-        assertTrue(navigator.backward());
-        assertEquals("the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath());
+        // Nav backward
+        assertTrue( navigator.backward() );
+        assertEquals( "the/quick/brown/fox/jumps/over/the/lazy/", navigator.getPath() );
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org