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 br...@apache.org on 2005/04/19 04:46:13 UTC
cvs commit: maven-wagon/wagon-provider-test/src/main/java/org/apache/maven/wagon WagonTestCase.java
brett 2005/04/18 19:46:13
Modified: wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http
HttpWagon.java
wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh
ScpWagon.java SftpWagon.java
wagon-provider-api/src/main/java/org/apache/maven/wagon/events
TransferEvent.java
wagon-provider-api/src/main/java/org/apache/maven/wagon/observers
ChecksumObserver.java
wagon-provider-api/src/main/java/org/apache/maven/wagon
AbstractWagon.java
wagon-provider-api/src/test/java/org/apache/maven/wagon/events
TransferEventTest.java
wagon-provider-test/src/main/java/org/apache/maven/wagon
WagonTestCase.java
Log:
start some wagon clean up
Revision Changes Path
1.9 +4 -3 maven-wagon/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java
Index: HttpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-http/src/main/java/org/apache/maven/wagon/providers/http/HttpWagon.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- HttpWagon.java 15 Apr 2005 08:33:06 -0000 1.8
+++ HttpWagon.java 19 Apr 2005 02:46:12 -0000 1.9
@@ -33,6 +33,7 @@
import org.apache.maven.wagon.AbstractWagon;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
+import org.apache.maven.wagon.events.TransferEvent;
import org.apache.maven.wagon.authentication.AuthenticationInfo;
import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.resource.Resource;
@@ -152,7 +153,7 @@
}
catch ( FileNotFoundException e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
throw new ResourceDoesNotExistException( "Source file does not exist: " + source, e );
}
@@ -381,7 +382,7 @@
}
catch ( Exception e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_GET );
if ( destination.exists() )
{
1.17 +6 -6 maven-wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java
Index: ScpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/ScpWagon.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ScpWagon.java 24 Mar 2005 07:37:41 -0000 1.16
+++ ScpWagon.java 19 Apr 2005 02:46:13 -0000 1.17
@@ -468,7 +468,7 @@
}
catch ( IOException e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_GET );
shutdownStream( outputStream );
@@ -509,11 +509,11 @@
}
catch ( JSchException e )
{
- handleException( resource, e, destination );
+ handleGetException( resource, e, destination );
}
catch ( IOException e )
{
- handleException( resource, e, destination );
+ handleGetException( resource, e, destination );
}
finally
{
@@ -530,10 +530,10 @@
}
}
- private void handleException( Resource resource, Exception e, File destination )
+ private void handleGetException( Resource resource, Exception e, File destination )
throws TransferFailedException
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_GET );
if ( destination.exists() )
{
1.3 +2 -2 maven-wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java
Index: SftpWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-providers/wagon-ssh/src/main/java/org/apache/maven/wagon/providers/ssh/SftpWagon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SftpWagon.java 19 Mar 2005 02:47:59 -0000 1.2
+++ SftpWagon.java 19 Apr 2005 02:46:13 -0000 1.3
@@ -249,7 +249,7 @@
}
catch ( Exception e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_GET );
if ( destination.exists() )
{
1.10 +3 -20 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java
Index: TransferEvent.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/events/TransferEvent.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TransferEvent.java 19 Mar 2005 02:47:59 -0000 1.9
+++ TransferEvent.java 19 Apr 2005 02:46:13 -0000 1.10
@@ -90,19 +90,13 @@
}
- public TransferEvent( final Wagon wagon, final Resource resource, final Exception exception )
+ public TransferEvent( final Wagon wagon, final Resource resource, final Exception exception, final int requestType )
{
- super( wagon );
-
- this.resource = resource;
-
- setEventType( TRANSFER_ERROR );
+ this( wagon, resource, TRANSFER_ERROR, requestType );
this.exception = exception;
-
}
-
/**
* @return Returns the resource.
*/
@@ -189,17 +183,6 @@
}
/**
- * The
- *
- * @param exception The exception to set.
- */
- public void setException( final Exception exception )
- {
- this.exception = exception;
- }
-
-
- /**
* @param resource The resource to set.
*/
public void setResource( final Resource resource )
1.11 +13 -26 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java
Index: ChecksumObserver.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/ChecksumObserver.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChecksumObserver.java 12 Apr 2005 06:41:32 -0000 1.10
+++ ChecksumObserver.java 19 Apr 2005 02:46:13 -0000 1.11
@@ -42,10 +42,7 @@
public class ChecksumObserver
implements TransferListener
{
-
- private String algorithm;
-
- private MessageDigest digester;
+ private MessageDigest digester = null;
private String expectedChecksum;
@@ -53,9 +50,10 @@
private boolean transferingChecksum = false;
-
private static Map algorithmExtensionMap = new HashMap();
+ private final String extension;
+
static
{
algorithmExtensionMap.put( "MD5", ".md5" );
@@ -63,11 +61,10 @@
algorithmExtensionMap.put( "MD2", ".md2" );
algorithmExtensionMap.put( "SHA-1", ".sha1" );
-
}
-
public ChecksumObserver()
+ throws NoSuchAlgorithmException
{
this( "MD5" );
}
@@ -76,13 +73,15 @@
* @param algorithm One of the algorithms supported by JDK: MD5, MD2 or SHA-1
*/
public ChecksumObserver( String algorithm )
+ throws NoSuchAlgorithmException
{
- this.algorithm = algorithm;
-
if ( !algorithmExtensionMap.containsKey( algorithm ) )
{
- throw new IllegalArgumentException( "Unknown checksum algorithm: " + algorithm );
+ throw new NoSuchAlgorithmException( "Checksum algorithm not recognised by this class: " + algorithm );
}
+
+ digester = MessageDigest.getInstance( algorithm );
+ extension = (String) algorithmExtensionMap.get( algorithm );
}
public void transferInitiated( TransferEvent transferEvent )
@@ -105,15 +104,7 @@
actualChecksum = null;
- try
- {
- digester = MessageDigest.getInstance( algorithm );
- }
- catch ( NoSuchAlgorithmException e )
- {
-
- }
-
+ digester.reset();
}
/**
@@ -125,7 +116,6 @@
{
digester.update( buffer, 0, length );
}
-
}
public void transferCompleted( TransferEvent transferEvent )
@@ -151,8 +141,6 @@
String resource = transferEvent.getResource().getName();
- String extension = (String) algorithmExtensionMap.get( algorithm );
-
if ( type == TransferEvent.REQUEST_GET )
{
@@ -208,10 +196,9 @@
public void debug( String message )
{
-
+ // left intentionally blank
}
-
/**
* Returns the md5 checksum downloaded from the server
*
@@ -268,7 +255,7 @@
}
- public boolean cheksumIsValid()
+ public boolean checksumIsValid()
{
boolean retValue = false;
1.17 +5 -5 maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java
Index: AbstractWagon.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/AbstractWagon.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- AbstractWagon.java 19 Mar 2005 02:47:59 -0000 1.16
+++ AbstractWagon.java 19 Apr 2005 02:46:13 -0000 1.17
@@ -141,7 +141,7 @@
}
catch ( IOException e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_GET );
if ( destination.exists() )
{
@@ -189,7 +189,7 @@
}
catch ( IOException e )
{
- fireTransferError( resource, e );
+ fireTransferError( resource, e, TransferEvent.REQUEST_PUT );
String msg = "PUT request for: " + resource + " to " + source.getName() + "failed";
@@ -466,9 +466,9 @@
sessionEventSupport.removeSessionListener( listener );
}
- protected void fireTransferError( Resource resource, Exception e )
+ protected void fireTransferError( Resource resource, Exception e, int requestType )
{
- TransferEvent transferEvent = new TransferEvent( this, resource, e );
+ TransferEvent transferEvent = new TransferEvent( this, resource, e, requestType );
transferEventSupport.fireTransferError( transferEvent );
}
1.6 +4 -10 maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java
Index: TransferEventTest.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/TransferEventTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransferEventTest.java 13 Dec 2004 21:57:07 -0000 1.5
+++ TransferEventTest.java 19 Apr 2005 02:46:13 -0000 1.6
@@ -94,7 +94,7 @@
res.setName( "mm" );
- event = new TransferEvent( wagon, res, exception );
+ event = new TransferEvent( wagon, res, exception, TransferEvent.REQUEST_GET );
assertEquals( wagon, event.getWagon() );
@@ -104,6 +104,8 @@
assertEquals( TransferEvent.TRANSFER_ERROR, event.getEventType() );
+ assertEquals( TransferEvent.REQUEST_GET, event.getRequestType() );
+
assertEquals( exception, event.getException() );
@@ -118,14 +120,6 @@
assertEquals( "/foo/baa", event.getResource().getName() );
- event.setException( null );
-
- assertEquals( null, event.getException() );
-
- event.setException( exception );
-
- assertEquals( exception, event.getException() );
-
event.setTimestamp( timestamp );
assertEquals( timestamp, event.getTimestamp() );
1.4 +6 -3 maven-wagon/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java
Index: WagonTestCase.java
===================================================================
RCS file: /home/cvs/maven-wagon/wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WagonTestCase.java 8 Mar 2005 07:12:14 -0000 1.3
+++ WagonTestCase.java 19 Apr 2005 02:46:13 -0000 1.4
@@ -63,10 +63,13 @@
public WagonTestCase( String testName )
{
super( testName );
+ }
+ protected void setUp()
+ throws Exception
+ {
checksumObserver = new ChecksumObserver();
}
-
// ----------------------------------------------------------------------
// Methods that should be provided by subclasses for proper testing
// ----------------------------------------------------------------------
@@ -252,7 +255,7 @@
System.out.println( "expected:" + checksumObserver.getExpectedChecksum() );
- assertTrue( checksumObserver.cheksumIsValid() );
+ assertTrue( checksumObserver.checksumIsValid() );
compareContents( sourceFile, destFile );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-cvs-help@maven.apache.org