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 ca...@apache.org on 2006/06/13 00:14:37 UTC
svn commit: r413755 - in
/maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav:
CorrectedWebdavResource.java PutInputStream.java WebDavWagon.java
Author: carlos
Date: Mon Jun 12 15:14:37 2006
New Revision: 413755
URL: http://svn.apache.org/viewvc?rev=413755&view=rev
Log:
Refactor to fix PMD errors
Modified:
maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/CorrectedWebdavResource.java
maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/PutInputStream.java
maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/CorrectedWebdavResource.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/CorrectedWebdavResource.java?rev=413755&r1=413754&r2=413755&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/CorrectedWebdavResource.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/CorrectedWebdavResource.java Mon Jun 12 15:14:37 2006
@@ -123,11 +123,11 @@
* Execute the PUT method for the given path.
*
* @param path the server relative path to put the data
- * @param is The input stream.
+ * @param inputStream The input stream.
* @throws IOException
* @return true if the method is succeeded.
*/
- public boolean putMethod( String path, InputStream is, int contentLength )
+ public boolean putMethod( String path, InputStream inputStream, int contentLength )
throws IOException
{
@@ -139,7 +139,7 @@
method.setRequestHeader( "Content-Type", getGetContentType() );
}
method.setRequestContentLength( contentLength );
- method.setRequestBody( is );
+ method.setRequestBody( inputStream );
generateTransactionHeader( method );
generateAdditionalHeaders( method );
int statusCode = client.executeMethod( method );
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/PutInputStream.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/PutInputStream.java?rev=413755&r1=413754&r2=413755&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/PutInputStream.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/PutInputStream.java Mon Jun 12 15:14:37 2006
@@ -51,30 +51,30 @@
event.setLocalFile( file );
}
- public int read( byte b[] )
+ public int read( byte buffer[] )
throws IOException
{
- return read( b, 0, b.length );
+ return read( buffer, 0, buffer.length );
}
public int read()
throws IOException
{
- byte b[] = new byte[1];
+ byte buffer[] = new byte[1];
- return read( b );
+ return read( buffer );
}
- public int read( byte b[], int off, int len )
+ public int read( byte buffer[], int offset, int length )
throws IOException
{
- int retValue = super.read( b, off, len );
+ int retValue = super.read( buffer, offset, length );
if ( retValue > 0 )
{
event.setTimestamp( System.currentTimeMillis() );
- eventSupport.fireTransferProgress( event, b, retValue );
+ eventSupport.fireTransferProgress( event, buffer, retValue );
}
return retValue;
}
Modified: maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java?rev=413755&r1=413754&r2=413755&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java (original)
+++ maven/wagon/trunk/wagon-providers/wagon-webdav/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java Mon Jun 12 15:14:37 2006
@@ -22,6 +22,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
@@ -57,18 +58,23 @@
*
* @author <a href="mailto:hisidro@exist.com">Henry Isidro</a>
* @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @author <a href="mailto:carlos@apache.org">Carlos Sanchez</a>
*/
public class WebDavWagon
extends AbstractWagon
{
- private static final TimeZone GMT_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
-
- private CorrectedWebdavResource wdresource;
+ private static final TimeZone TIMESTAMP_TIME_ZONE = TimeZone.getTimeZone( "GMT" );
private static String wagonVersion;
+ private DateFormat dateFormat = new SimpleDateFormat( "EEE, dd-MMM-yy HH:mm:ss zzz", Locale.US );
+
+ private CorrectedWebdavResource webdavResource;
+
public WebDavWagon()
{
+ dateFormat.setTimeZone( TIMESTAMP_TIME_ZONE );
+
if ( wagonVersion == null )
{
URL pomUrl = this.getClass()
@@ -125,7 +131,7 @@
}
CorrectedWebdavResource.setDefaultAction( CorrectedWebdavResource.NOACTION );
- wdresource = new CorrectedWebdavResource( httpURL );
+ webdavResource = new CorrectedWebdavResource( httpURL );
}
catch ( HttpException he )
{
@@ -152,9 +158,9 @@
{
try
{
- if ( wdresource != null )
+ if ( webdavResource != null )
{
- wdresource.close();
+ webdavResource.close();
}
}
catch ( IOException ioe )
@@ -163,7 +169,7 @@
}
finally
{
- wdresource = null;
+ webdavResource = null;
}
}
@@ -200,7 +206,7 @@
}
firePutInitiated( resource, source );
- String oldpath = wdresource.getPath();
+ String oldpath = webdavResource.getPath();
String relpath = getPath( basedir, dir );
@@ -208,18 +214,18 @@
{
// Test if dest resource path exist.
String cdpath = checkUri( relpath + "/" );
- wdresource.setPath( cdpath );
+ webdavResource.setPath( cdpath );
- if ( wdresource.exists() && !wdresource.isCollection() )
+ if ( webdavResource.exists() && !webdavResource.isCollection() )
{
throw new TransferFailedException(
"Destination path exists and is not a WebDAV collection (directory): " + cdpath );
}
- wdresource.setPath( oldpath );
+ webdavResource.setPath( oldpath );
// if dest resource path does not exist, create it
- if ( !wdresource.exists() )
+ if ( !webdavResource.exists() )
{
// mkcolMethod() cannot create a directory hierarchy at once,
// it has to create each directory one at a time
@@ -232,9 +238,9 @@
for ( int count = 1; count < dirs.length; count++ )
{
createDir = createDir + "/" + dirs[count];
- wdresource.mkcolMethod( createDir );
+ webdavResource.mkcolMethod( createDir );
}
- wdresource.setPath( oldpath );
+ webdavResource.setPath( oldpath );
}
catch ( IOException ioe )
{
@@ -255,8 +261,8 @@
firePutStarted( resource, source );
InputStream is = new PutInputStream( source, resource, this, getTransferEventSupport() );
- boolean success = wdresource.putMethod( dest, is, (int) source.length() );
- int statusCode = wdresource.getStatusCode();
+ boolean success = webdavResource.putMethod( dest, is, (int) source.length() );
+ int statusCode = webdavResource.getStatusCode();
switch ( statusCode )
{
@@ -329,14 +335,14 @@
throws IOException
{
- if ( wdresource == null )
+ if ( webdavResource == null )
{
throw new IOException( "Not connected yet." );
}
if ( uri == null )
{
- uri = wdresource.getPath();
+ uri = webdavResource.getPath();
}
return FileUtils.normalize( uri );
@@ -375,26 +381,24 @@
String url = getRepository().getUrl() + "/" + resourceName;
- wdresource.addRequestHeader( "X-wagon-provider", "wagon-webdav" );
- wdresource.addRequestHeader( "X-wagon-version", wagonVersion );
+ webdavResource.addRequestHeader( "X-wagon-provider", "wagon-webdav" );
+ webdavResource.addRequestHeader( "X-wagon-version", wagonVersion );
- wdresource.addRequestHeader( "Cache-control", "no-cache" );
- wdresource.addRequestHeader( "Cache-store", "no-store" );
- wdresource.addRequestHeader( "Pragma", "no-cache" );
- wdresource.addRequestHeader( "Expires", "0" );
+ webdavResource.addRequestHeader( "Cache-control", "no-cache" );
+ webdavResource.addRequestHeader( "Cache-store", "no-store" );
+ webdavResource.addRequestHeader( "Pragma", "no-cache" );
+ webdavResource.addRequestHeader( "Expires", "0" );
if ( timestamp > 0 )
{
- SimpleDateFormat fmt = new SimpleDateFormat( "EEE, dd-MMM-yy HH:mm:ss zzz", Locale.US );
- fmt.setTimeZone( GMT_TIME_ZONE );
- wdresource.addRequestHeader( "If-Modified-Since", fmt.format( new Date( timestamp ) ) );
+ webdavResource.addRequestHeader( "If-Modified-Since", dateFormat.format( new Date( timestamp ) ) );
}
InputStream is = null;
OutputStream output = new LazyFileOutputStream( destination );
try
{
- is = wdresource.getMethodData( url );
+ is = webdavResource.getMethodData( url );
getTransfer( resource, destination, is );
}
catch ( HttpException e )
@@ -417,7 +421,7 @@
}
}
- int statusCode = wdresource.getStatusCode();
+ int statusCode = webdavResource.getStatusCode();
switch ( statusCode )
{
case HttpStatus.SC_NOT_MODIFIED:
@@ -446,7 +450,7 @@
IOUtil.close( output );
}
- int statusCode = wdresource.getStatusCode();
+ int statusCode = webdavResource.getStatusCode();
switch ( statusCode )
{
@@ -515,7 +519,7 @@
try
{
- wdresource.mkcolMethod( createPath );
+ webdavResource.mkcolMethod( createPath );
}
catch ( IOException e )
{
@@ -525,7 +529,7 @@
try
{
- wdresource.setPath( repository.getBasedir() );
+ webdavResource.setPath( repository.getBasedir() );
}
catch ( IOException e )
{
@@ -547,7 +551,7 @@
try
{
- wdresource.putMethod( target, listFiles[i] );
+ webdavResource.putMethod( target, listFiles[i] );
}
catch ( IOException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org