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/02/17 12:36:21 UTC
svn commit: r1245404 - in /archiva/trunk: ./
archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/
archiva-mo...
Author: olamy
Date: Fri Feb 17 11:36:20 2012
New Revision: 1245404
URL: http://svn.apache.org/viewvc?rev=1245404&view=rev
Log:
[MRM-1606] Upgrade to wagon 2.2.
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
archiva/trunk/pom.xml
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=1245404&r1=1245403&r2=1245404&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 Feb 17 11:36:20 2012
@@ -1109,7 +1109,9 @@ public class DefaultRepositoryProxyConne
// Convert seconds to milliseconds
int timeoutInMilliseconds = remoteRepository.getRepository().getTimeout() * 1000;
- // Set timeout
+ // Set timeout read and connect
+ // FIXME olamy having 2 config values
+ wagon.setReadTimeout( timeoutInMilliseconds );
wagon.setTimeout( timeoutInMilliseconds );
try
Modified: archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java?rev=1245404&r1=1245403&r2=1245404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java (original)
+++ archiva/trunk/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java Fri Feb 17 11:36:20 2012
@@ -41,8 +41,6 @@ import org.apache.maven.wagon.events.Tra
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
-import org.apache.maven.wagon.shared.http.HttpConfiguration;
-import org.apache.maven.wagon.shared.http.HttpMethodConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,7 +49,6 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.Method;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
@@ -132,7 +129,10 @@ public class DownloadRemoteIndexTask
&& this.networkProxy.isUseNtlm() ) ? "-ntlm" : "" );
final Wagon wagon = wagonFactory.getWagon( wagonProtocol );
- setupWagonReadTimeout( wagon );
+ int timeoutInMilliseconds = remoteRepository.getTimeout() * 1000;
+ // FIXME olamy having 2 config values
+ wagon.setReadTimeout( timeoutInMilliseconds );
+ wagon.setTimeout( timeoutInMilliseconds );
wagon.addTransferListener( new DownloadListener() );
ProxyInfo proxyInfo = null;
@@ -220,22 +220,6 @@ public class DownloadRemoteIndexTask
}
}
- private void setupWagonReadTimeout( Wagon wagon )
- {
- try
- {
- HttpConfiguration httpConfiguration = new HttpConfiguration().setAll(
- new HttpMethodConfiguration().setReadTimeout( remoteRepository.getRemoteDownloadTimeout() * 1000 ) );
- Method setHttpConfigurationMethod =
- wagon.getClass().getMethod( "setHttpConfiguration", HttpConfiguration.class );
- setHttpConfigurationMethod.invoke( wagon, httpConfiguration );
- }
- catch ( Exception e )
- {
- log.debug( "unable to set download remote time out for index {}", e.getMessage(), e );
- }
- }
-
public static class DownloadListener
implements TransferListener
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java?rev=1245404&r1=1245403&r2=1245404&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/RepositoryModelResolver.java Fri Feb 17 11:36:20 2012
@@ -309,8 +309,9 @@ public class RepositoryModelResolver
// Convert seconds to milliseconds
int timeoutInMilliseconds = remoteRepository.getTimeout() * 1000;
-
+ // FIXME olamy having 2 config values
// Set timeout
+ wagon.setReadTimeout( timeoutInMilliseconds );
wagon.setTimeout( timeoutInMilliseconds );
try
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1245404&r1=1245403&r2=1245404&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Feb 17 11:36:20 2012
@@ -72,7 +72,7 @@
<maven-dependency-tree.version>1.2</maven-dependency-tree.version>
<maven-model-converter.version>2.1</maven-model-converter.version>
<maven.indexer.version>4.1.2</maven.indexer.version>
- <wagon.version>2.0</wagon.version>
+ <wagon.version>2.2</wagon.version>
<redback.version>1.5-SNAPSHOT</redback.version>
<redback.cache.version>1.0</redback.cache.version>
<redback.quartz.version>1.0</redback.quartz.version>