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 2007/08/13 05:20:50 UTC
svn commit: r565225 - in /maven/wagon/trunk/wagon-manager/src:
main/java/org/apache/maven/wagon/manager/MirroredWagon.java
test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
Author: brianf
Date: Sun Aug 12 20:20:49 2007
New Revision: 565225
URL: http://svn.apache.org/viewvc?view=rev&rev=565225
Log:
merged WAGON-73 branch.
Modified:
maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
Modified: maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java?view=diff&rev=565225&r1=565224&r2=565225
==============================================================================
--- maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java (original)
+++ maven/wagon/trunk/wagon-manager/src/main/java/org/apache/maven/wagon/manager/MirroredWagon.java Sun Aug 12 20:20:49 2007
@@ -96,6 +96,7 @@
try
{
this.impl.connect();
+ return;
}
catch ( ConnectionException e )
{
@@ -162,6 +163,7 @@
try
{
this.impl.get( resource, destination );
+ return;
}
catch ( TransferFailedException e )
{
Modified: maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java?view=diff&rev=565225&r1=565224&r2=565225
==============================================================================
--- maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java (original)
+++ maven/wagon/trunk/wagon-manager/src/test/java/org/apache/maven/wagon/manager/WagonManagerTest.java Sun Aug 12 20:20:49 2007
@@ -347,6 +347,29 @@
assertEquals( 272661, totals.getBytesTransferred() );
}
+ /**
+ * Tests #connect and #get on a Mirror.
+ */
+ public void testMirroredWagon() throws Exception
+ {
+ final Repository testRepo = createTestRepository();
+ wagonManager.addRepository( testRepo );
+ wagonManager.addRepositoryMirror( "testmirrorrepo", "testrepo", "http://localhost:" + HTTP_PORT + "/" );
+ final Wagon httpWagon = wagonManager.getWagon( "testmirrorrepo" );
+
+ try {
+ httpWagon.connect();
+
+ FileUtils.copyDirectory( testDataDir, httpRootDir );
+
+ final String destFilename = "daytrader-streamer-2.0-SNAPSHOT-javadoc.jar";
+ httpWagon.get( destFilename, new File( localDownloadDir, destFilename ));
+ } finally {
+ httpWagon.disconnect();
+ wagonManager.releaseWagon( httpWagon );
+ }
+ }
+
private Repository createDavRepository()
{
Repository repo = new Repository( "davrepo", "dav:http://localhost:" + DAV_PORT + DAV_CONTEXT + "/" );
---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org