|
|
brett 2005/03/18 19:00:02
Modified: wagon-provider-api/src/main/java/org/apache/maven/wagon/observers
ChecksumObserver.java Debug.java
wagon-provider-api/src/test/java/org/apache/maven/wagon/events
MockTransferListener.java
Log:
implement interface change
Revision Changes Path
1.9 +88 -91
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChecksumObserver.java 8 Mar 2005 18:41:29 -0000 1.8
+++ ChecksumObserver.java 19 Mar 2005 03:00:02 -0000 1.9
@@ -33,53 +33,57 @@
/**
- *
* TransferListeners which computes MD5 checksum on the fly when files are
transfered.
- *
- * @author <a href="michal.maczka@xxxxxxxxxxxx">Michal Maczka</a>
- * @version $Id$
+ *
+ * @author <a href="michal.maczka@xxxxxxxxxxxx">Michal Maczka</a>
+ * @version $Id$
*/
-public class ChecksumObserver implements TransferListener
+public class ChecksumObserver
+ implements TransferListener
{
-
+
private String algorithm;
-
+
private MessageDigest digester;
-
+
private String expectedChecksum;
-
+
private String actualChecksum;
-
+
private boolean transferingMd5 = false;
-
-
+
+
private static Map algorithmExtensionMap = new HashMap();
-
+
static
{
- algorithmExtensionMap.put( "MD5", ".md5" );
-
- algorithmExtensionMap.put( "MD2", ".md2" );
-
- algorithmExtensionMap.put( "SHA-1", ".sha1" );
-
+ algorithmExtensionMap.put( "MD5", ".md5" );
+
+ algorithmExtensionMap.put( "MD2", ".md2" );
+
+ algorithmExtensionMap.put( "SHA-1", ".sha1" );
+
}
-
-
+
+
public ChecksumObserver()
{
- this( "MD5" );
+ this( "MD5" );
}
-
+
/**
- *
* @param algorithm One of the algorithms supported by JDK: MD5, MD2 or
SHA-1
*/
public ChecksumObserver( String algorithm )
{
- this.algorithm = algorithm;
+ this.algorithm = algorithm;
+ }
+
+ public void transferInitiated( TransferEvent transferEvent )
+ {
+ // This space left intentionally blank
}
-
+
/**
* @see
org.apache.maven.wagon.events.TransferListener#transferStarted(org.apache.maven.wagon.events.TransferEvent)
*/
@@ -88,23 +92,22 @@
if ( transferingMd5 )
{
- return;
+ return;
}
-
+
expectedChecksum = null;
-
+
actualChecksum = null;
-
-
+
try
{
digester = MessageDigest.getInstance( algorithm );
}
- catch ( NoSuchAlgorithmException e)
+ catch ( NoSuchAlgorithmException e )
{
-
+
}
-
+
}
/**
@@ -116,108 +119,106 @@
{
digester.update( buffer, 0, length );
}
-
+
}
public void transferCompleted( TransferEvent transferEvent )
{
-
+
if ( digester == null )
- {
+ {
return;
}
Wagon wagon = transferEvent.getWagon();
-
- actualChecksum = encode ( digester.digest() );
-
+
+ actualChecksum = encode( digester.digest() );
+
digester = null;
-
+
InputStream inputStream = null;
-
+
transferingMd5 = true;
-
+
try
{
int type = transferEvent.getRequestType();
-
+
String resource = transferEvent.getResource().getName();
-
- String extension = ( String ) algorithmExtensionMap.get(
algorithm );
-
- if ( type == TransferEvent.REQUEST_GET )
+
+ String extension = (String) algorithmExtensionMap.get( algorithm
);
+
+ if ( type == TransferEvent.REQUEST_GET )
{
-
+
//we will fetch md5 cheksum from server and
// read its content into memory
File artifactFile = transferEvent.getLocalFile();
-
+
File md5File = new File( artifactFile.getPath() + extension
);
-
- String md5Resource = resource + extension;
-
+
+ String md5Resource = resource + extension;
+
wagon.get( md5Resource, md5File );
-
- expectedChecksum = FileUtils.fileRead( md5File ).trim();
+
+ expectedChecksum = FileUtils.fileRead( md5File ).trim();
}
else
{
//It's PUT put request we will also put md5 checksum
// which was computed on the fly
- WagonUtils.fromString( resource + extension , wagon,
actualChecksum );
-
- }
-
+ WagonUtils.fromString( resource + extension, wagon,
actualChecksum );
+
+ }
+
}
catch ( Exception e )
{
// TODO: handle differently! No Exception catching....
e.printStackTrace();
- }
+ }
finally
{
IoUtils.close( inputStream );
transferingMd5 = false;
}
-
-
+
}
public void transferError( TransferEvent transferEvent )
- {
- digester = null;
+ {
+ digester = null;
}
public void debug( String message )
{
-
-
+
}
-
-
-
+
+
/**
* Returns the md5 checksum downloaded from the server
- *
+ *
* @return
*/
- public String getExpectedChecksum()
- {
- return expectedChecksum;
+ public String getExpectedChecksum()
+ {
+ return expectedChecksum;
}
-
-
+
+
/**
* Returns md5 checksum which was computed during transfer
+ *
* @return
*/
- public String getActualChecksum()
- {
- return actualChecksum;
+ public String getActualChecksum()
+ {
+ return actualChecksum;
}
-
-
+
+
/**
* Encodes a 128 bit (16 bytes) byte array into a 32 character String.
* XXX I think it should at least throw an IllegalArgumentException
rather than return null
@@ -250,23 +251,19 @@
return retValue.trim();
}
-
-
+
+
public boolean cheksumIsValid()
{
boolean retValue = false;
-
- if ( actualChecksum != null && expectedChecksum !=null )
+
+ if ( actualChecksum != null && expectedChecksum != null )
{
- retValue = actualChecksum.equals( expectedChecksum );
+ retValue = actualChecksum.equals( expectedChecksum );
}
-
+
return retValue;
}
-
-
-
-
-
+
}
1.7 +31 -49
maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java
Index: Debug.java
===================================================================
RCS file:
/home/cvs/maven-wagon/wagon-provider-api/src/main/java/org/apache/maven/wagon/observers/Debug.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Debug.java 20 Feb 2005 12:23:59 -0000 1.6
+++ Debug.java 19 Mar 2005 03:00:02 -0000 1.7
@@ -32,20 +32,20 @@
implements SessionListener, TransferListener
{
private PrintStream out;
-
+
long timestamp;
-
+
long transfer;
-
-
+
+
public Debug()
{
- this( System.out );
+ this( System.out );
}
-
+
public Debug( PrintStream out )
{
- this.out = out;
+ this.out = out;
}
/**
@@ -61,9 +61,7 @@
*/
public void sessionOpened( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Opened " );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Opened " );
}
/**
@@ -71,9 +69,7 @@
*/
public void sessionDisconnecting( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Disconnecting " );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Disconnecting " );
}
@@ -82,9 +78,7 @@
*/
public void sessionDisconnected( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Disconnected" );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Disconnected" );
}
/**
@@ -92,9 +86,7 @@
*/
public void sessionConnectionRefused( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Connection refused" );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Connection refused" );
}
@@ -103,9 +95,7 @@
*/
public void sessionLoggedIn( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Logged in" );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Logged in" );
}
@@ -114,9 +104,7 @@
*/
public void sessionLoggedOff( final SessionEvent sessionEvent )
{
- out.println(
- sessionEvent.getWagon().getRepository().getUrl() +
- " - Session: Logged off" );
+ out.println( sessionEvent.getWagon().getRepository().getUrl() + " -
Session: Logged off" );
}
@@ -129,35 +117,34 @@
}
+ public void transferInitiated( TransferEvent transferEvent )
+ {
+ // This space left intentionally blank
+ }
+
/**
* @see TransferListener#transferStarted(TransferEvent)
*/
public void transferStarted( final TransferEvent transferEvent )
{
timestamp = transferEvent.getTimestamp();
-
+
transfer = 0;
-
- if( transferEvent.getRequestType() == TransferEvent.REQUEST_GET )
+
+ if ( transferEvent.getRequestType() == TransferEvent.REQUEST_GET )
{
- final String message = "Downloading: " +
- transferEvent.getResource().getName() +
- " from " +
- transferEvent.getWagon().getRepository().getUrl();
-
+ final String message = "Downloading: " +
transferEvent.getResource().getName() + " from " +
transferEvent.getWagon().getRepository().getUrl();
+
out.println( message );
-
+
out.println( "" );
}
else
{
- final String message = "Uploading: " +
- transferEvent.getResource().getName() +
- " to " +
- transferEvent.getWagon().getRepository().getUrl();
-
+ final String message = "Uploading: " +
transferEvent.getResource().getName() + " to " +
transferEvent.getWagon().getRepository().getUrl();
+
out.println( message );
-
+
out.println( "" );
}
@@ -180,16 +167,11 @@
*/
public void transferCompleted( final TransferEvent transferEvent )
{
- final double duration =
- (double)( transferEvent.getTimestamp() - timestamp ) / 1000;
+ final double duration = (double) ( transferEvent.getTimestamp() -
timestamp ) / 1000;
out.println();
-
- final String message = "Transfer finished. " +
- transfer +
- " bytes copied in " +
- duration +
- " seconds";
+
+ final String message = "Transfer finished. " + transfer + " bytes
copied in " + duration + " seconds";
out.println( message );
1.4 +24 -3
maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/MockTransferListener.java
Index: MockTransferListener.java
===================================================================
RCS file:
/home/cvs/maven-wagon/wagon-provider-api/src/test/java/org/apache/maven/wagon/events/MockTransferListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MockTransferListener.java 7 Dec 2004 11:41:37 -0000 1.3
+++ MockTransferListener.java 19 Mar 2005 03:00:02 -0000 1.4
@@ -21,18 +21,33 @@
* @author <a href="michal.maczka@xxxxxxxxxxxx">Michal Maczka</a>
* @version $Id$
*/
-public class MockTransferListener implements TransferListener
+public class MockTransferListener
+ implements TransferListener
{
private String debugMessage;
+
private boolean debugCalled;
+
private TransferEvent transferEvent;
+
private boolean transferCompletedCalled;
+
private boolean transferProgressCalled;
+
private boolean transferStartedCalled;
+
private int numberOfProgressCalls;
+
private boolean transferErrorCalled;
+ private boolean transferInitiatedCalled;
+
+
+ public boolean isTransferInitiatedCalled()
+ {
+ return transferInitiatedCalled;
+ }
/**
* @return Returns the debugCalled.
@@ -74,6 +89,12 @@
return transferStartedCalled;
}
+ public void transferInitiated( TransferEvent transferEvent )
+ {
+ this.transferEvent = transferEvent;
+ transferInitiatedCalled = true;
+ }
+
/**
* @see
org.apache.maven.wagon.events.TransferListener#transferStarted(org.apache.maven.wagon.events.TransferEvent)
*/
@@ -116,7 +137,7 @@
}
/**
- * @return
+ * @return
*/
public String getDebugMessage()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-cvs-unsubscribe@xxxxxxxxxxxxxxxx
For additional commands, e-mail: wagon-cvs-help@xxxxxxxxxxxxxxxx
|
|