You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/30 12:24:07 UTC
svn commit: r1307348 -
/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
Author: olamy
Date: Fri Mar 30 10:24:07 2012
New Revision: 1307348
URL: http://svn.apache.org/viewvc?rev=1307348&view=rev
Log:
take care of windows file format and replace for url fetching
see mail thread: http://markmail.org/message/izqupvyvwojdamk3
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1307348&r1=1307347&r2=1307348&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java Fri Mar 30 10:24:07 2012
@@ -51,7 +51,9 @@ import org.apache.archiva.scheduler.Arch
import org.apache.archiva.scheduler.repository.RepositoryTask;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.SystemUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.Wagon;
@@ -286,6 +288,12 @@ public class DefaultRepositoryProxyConne
String targetPath = targetRepository.toPath( artifact );
+ if ( SystemUtils.IS_OS_WINDOWS )
+ {
+ // toPath use system PATH_SEPARATOR so on windows url are \ which doesn't work very well :-)
+ targetPath = FilenameUtils.separatorsToUnix( targetPath );
+ }
+
try
{
File downloadedFile =