Author: brett
Date: Mon Jun 13 17:42:59 2005
New Revision: 190539
URL: http://svn.apache.org/viewcvs?rev=190539&view=rev
Log:
PR: MNG-261
Submitted by: Rahul Thakur
Reviewed by: Brett Porter
Create artifact directories in the wagon so that they are only created when the
file will actually be downloaded.
Modified:
maven/components/trunk/maven-artifact/pom.xml
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Modified: maven/components/trunk/maven-artifact/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/pom.xml?rev=190539&r1=190538&r2=190539&view=diff
==============================================================================
--- maven/components/trunk/maven-artifact/pom.xml (original)
+++ maven/components/trunk/maven-artifact/pom.xml Mon Jun 13 17:42:59 2005
@@ -16,7 +16,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-alpha-3</version>
+ <version>1.0-alpha-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified:
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=190539&r1=190538&r2=190539&view=diff
==============================================================================
---
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Mon Jun 13 17:42:59 2005
@@ -299,12 +299,6 @@
wagon.addTransferListener( downloadMonitor );
}
- // TODO [BP]: do this handling in Wagon itself
- if ( !destination.getParentFile().exists() )
- {
- destination.getParentFile().mkdirs();
- }
-
// TODO: configure on repository
ChecksumObserver checksumObserver;
try
@@ -330,6 +324,7 @@
wagon.connect( repository, getAuthenticationInfo(
repository.getId() ), getProxy( protocol ) );
+ // This should take care of creating destination directory now on
wagon.get( remotePath, temp );
try
@@ -348,8 +343,8 @@
// TODO: optionally retry?
/* throw new ChecksumFailedException(
"Checksum failed on download: local = '" + actualChecksum +
- "';
remote = '" + expectedChecksum + "'" );
- */
+ "'; remote = '" + expectedChecksum + "'" );
+ */
}
}
catch ( ResourceDoesNotExistException e )
@@ -448,13 +443,13 @@
/**
* Set the proxy used for a particular protocol.
*
- * @param protocol the protocol (required)
- * @param host the proxy host name (required)
- * @param port the proxy port (required)
- * @param username the username for the proxy, or null if there is
none
- * @param password the password for the proxy, or null if there is
none
+ * @param protocol the protocol (required)
+ * @param host the proxy host name (required)
+ * @param port the proxy port (required)
+ * @param username the username for the proxy, or null if there is none
+ * @param password the password for the proxy, or null if there is none
* @param nonProxyHosts the set of hosts not to use the proxy for. Follows
Java system
- * property format: <code>*.foo.com|localhost</code>.
+ * property format: <code>*.foo.com|localhost</code>.
* @todo [BP] would be nice to configure this via plexus in some way
*/
public void addProxy( String protocol, String host, int port, String
username, String password,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
