diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-10-31 21:40:38 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-10-31 21:40:38 +0000 |
| commit | 27c8f4047caf10fa1a0db28e61f2170faa437785 (patch) | |
| tree | 5c217ce28db94f3212be0f80cf4a0bd334281002 /archiva-modules/archiva-scheduler | |
| parent | 94a06383442913ff468844b235b52a77d0a230b6 (diff) | |
| download | archiva-27c8f4047caf10fa1a0db28e61f2170faa437785.tar.gz archiva-27c8f4047caf10fa1a0db28e61f2170faa437785.zip | |
move ntlm wagon trick in wagonFactory to avoid duplicate code
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1404367 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-scheduler')
| -rw-r--r-- | archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java index 5c08d8d4b..eb8053c6f 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java @@ -132,12 +132,11 @@ public class DownloadRemoteIndexTask tempIndexDirectory.deleteOnExit(); String baseIndexUrl = indexingContext.getIndexUpdateUrl(); - String wagonProtocol = - new URL( this.remoteRepository.getUrl() ).getProtocol() + ( ( this.networkProxy != null - && this.networkProxy.isUseNtlm() ) ? "-ntlm" : "" ); + String wagonProtocol = new URL( this.remoteRepository.getUrl() ).getProtocol(); final StreamWagon wagon = (StreamWagon) wagonFactory.getWagon( - new WagonFactoryRequest( wagonProtocol, this.remoteRepository.getExtraHeaders() ) ); + new WagonFactoryRequest( wagonProtocol, this.remoteRepository.getExtraHeaders() ).networkProxy( + this.networkProxy ) ); int timeoutInMilliseconds = remoteRepository.getTimeout() * 1000; // FIXME olamy having 2 config values wagon.setReadTimeout( timeoutInMilliseconds ); |