michal 2004/05/20 09:09:11
Modified: maven-project/src/main/java/org/apache/maven/artifact/downloader
DefaultArtifactDownloader.java
maven-project/src/main/java/org/apache/maven/artifact/collector
DefaultArtifactCollector.java
maven-project/src/main/java/org/apache/maven/artifact/snapshot
DefaultSnapshotResolver.java
Log:
Experimnets with wagon-api. I want to move more code to wagon and have simpler code
in components which are using wagon and repositories
Revision Changes Path
1.4 +26 -45
maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java
Index: DefaultArtifactDownloader.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/downloader/DefaultArtifactDownloader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultArtifactDownloader.java 16 May 2004 17:26:11 -0000 1.3
+++ DefaultArtifactDownloader.java 20 May 2004 16:09:11 -0000 1.4
@@ -6,14 +6,14 @@
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.artifact.factory.MavenArtifactFactory;
+import org.apache.maven.wagon.ResourceDoesNotExistException;
+import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.manager.WagonManager;
import org.apache.maven.wagon.observers.Md5SumObserver;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.FileUtils;
-
-
/**
@@ -25,7 +25,6 @@
*/
public class DefaultArtifactDownloader extends AbstractLogEnabled implements
ArtifactDownloader
{
-
private WagonManager wagonManager;
@@ -140,56 +139,38 @@
{
wagon.get( source, file );
}
- catch( Exception e)
+ catch ( TransferFailedException e )
{
+ getLogger().info( "IO error occred while transfering " +
artifact.getUrlPath() + " from " + wagon.getRepository().getUrl() );
+
+ return false;
+ }
+ catch ( ResourceDoesNotExistException e )
+ {
+
getLogger().info( artifact.getUrlPath() + " was not found in " +
wagon.getRepository().getUrl() );
-
+
return false;
+
}
- finally
+ catch ( AuthorizationException e )
{
- wagon.removeTransferListener( md5SumObserver );
- }
-
- getLogger().info( artifact.getUrlPath() + " was found in " +
wagon.getRepository().getUrl() );
-
- String actualMd5 = md5SumObserver.getMd5Sum();
-
- getLogger().info( "Actual MD5 checksum: " + actualMd5 );
-
- String checksum = artifact.getChecksumUrlPath();
-
- File checksumFile = artifact.getChecksumFile( );
-
-
- try
- {
- getLogger().info( "Trying to download md5 cheksum: " +
artifact.getChecksumUrlPath() + " from " + wagon.getRepository().getUrl() );
-
- wagon.get( checksum, checksumFile );
-
- // we've got the checksum file so we can use it for checking integrity
-
- String expectedMd5 = FileUtils.fileRead( checksumFile );
-
- getLogger().info( "Expected MD5 checksum: " + expectedMd5 );
-
- boolean valid = actualMd5.trim() .equals( expectedMd5.trim() );
-
- getLogger().info( "Checksum verification: " + valid );
-
-
+ getLogger().info( "Np permission for dowloading: " +
artifact.getUrlPath() + " from " + wagon.getRepository().getUrl() );
- }
- catch ( Exception e )
+ return false;
+ }
+ finally
{
-
- //we can live without md5 checksum file
-
+ wagon.removeTransferListener( md5SumObserver );
}
-
+ getLogger().info( "Actual md5: " + md5SumObserver.getActualMd5Sum() );
+
+ getLogger().info( "Expected md5: " + md5SumObserver.getExpectedMd5Sum() );
+ getLogger().info( "md5 is valid: " + md5SumObserver.cheksumIsValid() );
+
+ md5SumObserver.writeToFile( artifact.getChecksumFile() );
return true;
1.7 +3 -1
maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java
Index: DefaultArtifactCollector.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/collector/DefaultArtifactCollector.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultArtifactCollector.java 18 May 2004 20:09:17 -0000 1.6
+++ DefaultArtifactCollector.java 20 May 2004 16:09:11 -0000 1.7
@@ -118,6 +118,8 @@
queue.add( referencedProject );
}
+
+
}
}
1.5 +7 -29
maven-components/maven-project/src/main/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolver.java
Index: DefaultSnapshotResolver.java
===================================================================
RCS file:
/home/cvs/maven-components/maven-project/src/main/java/org/apache/maven/artifact/snapshot/DefaultSnapshotResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultSnapshotResolver.java 19 May 2004 23:46:42 -0000 1.4
+++ DefaultSnapshotResolver.java 20 May 2004 16:09:11 -0000 1.5
@@ -8,6 +8,7 @@
import org.apache.maven.artifact.MavenArtifact;
import org.apache.maven.artifact.downloader.ArtifactDownloader;
import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.WagonUtils;
import org.apache.maven.wagon.manager.WagonManager;
import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.util.FileUtils;
@@ -44,8 +45,6 @@
{
Repository repository = ( Repository ) iter.next();
- System.out.println( "Checking in repository: " + repository.getUrl() );
-
Wagon wagon = null;
try
@@ -56,8 +55,6 @@
Date remoteVersion = getRemoteVersion( artifact, wagon );
- System.out.println( "Remote version: " + remoteVersion );
-
if ( remoteVersion != null )
{
//if local version is unknown (null) it means that
@@ -133,34 +130,15 @@
private Date getRemoteVersion( MavenArtifact artifact, Wagon wagon )
throws Exception
{
-
- File file = null;
-
+
Date retValue = null;
- try
- {
-
- // @todo - here I need to create temporary file.
- // I would really prefer to have input stream from wagon and do not
need to
- // create/delete file and handle all error which may appear.
- file = File.createTempFile( "maven", "tmp" );
-
- wagon.get( artifact.getSnapshotVersionUrlPath(), file );
-
- String timestamp = FileUtils.fileRead( file );
+ String timestamp = WagonUtils.toString(
artifact.getSnapshotVersionUrlPath(), wagon );
- retValue = SnapshotUtils.parseTimestamp( timestamp );
+ retValue = SnapshotUtils.parseTimestamp( timestamp );
- return retValue;
- }
- finally
- {
- if ( file != null )
- {
- file.delete();
- }
- }
+ return retValue;
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
