You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2015/06/17 10:07:49 UTC
archiva git commit: [MRM-1861] Proxy behaviour issue migrating from
1.3.x to 2.x
Repository: archiva
Updated Branches:
refs/heads/master 67e9340da -> 01f9aad61
[MRM-1861] Proxy behaviour issue migrating from 1.3.x to 2.x
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/01f9aad6
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/01f9aad6
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/01f9aad6
Branch: refs/heads/master
Commit: 01f9aad6176656bf6a0bf010c65cd265c87cf62b
Parents: 67e9340
Author: Eduardo Souza <ed...@gmail.com>
Authored: Thu Jun 11 20:18:45 2015 -0300
Committer: Eduardo Souza <ed...@gmail.com>
Committed: Thu Jun 11 20:18:45 2015 -0300
----------------------------------------------------------------------
.../scheduler/indexing/DownloadRemoteIndexTask.java | 1 +
.../services/DefaultRemoteRepositoriesService.java | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/01f9aad6/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DownloadRemoteIndexTask.java
----------------------------------------------------------------------
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 6a9a396..f8fd42a 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
@@ -156,6 +156,7 @@ public class DownloadRemoteIndexTask
if ( this.networkProxy != null )
{
proxyInfo = new ProxyInfo();
+ proxyInfo.setType( this.networkProxy.getProtocol() );
proxyInfo.setHost( this.networkProxy.getHost() );
proxyInfo.setPort( this.networkProxy.getPort() );
proxyInfo.setUserName( this.networkProxy.getUsername() );
http://git-wip-us.apache.org/repos/asf/archiva/blob/01f9aad6/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
index 64b8043..c3528eb 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
@@ -34,6 +34,7 @@ import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.providers.http.AbstractHttpClientWagon;
import org.apache.maven.wagon.providers.http.HttpConfiguration;
import org.apache.maven.wagon.providers.http.HttpMethodConfiguration;
+import org.apache.maven.wagon.proxy.ProxyInfo;
import org.apache.maven.wagon.repository.Repository;
import org.springframework.stereotype.Service;
@@ -182,8 +183,19 @@ public class DefaultRemoteRepositoriesService
HttpConfiguration httpConfiguration = new HttpConfiguration().setGet( httpMethodConfiguration );
AbstractHttpClientWagon.class.cast( wagon ).setHttpConfiguration( httpConfiguration );
}
-
- wagon.connect( new Repository( remoteRepository.getId(), remoteRepository.getUrl() ) );
+
+ ProxyInfo proxyInfo = null;
+ if ( networkProxy != null )
+ {
+ proxyInfo = new ProxyInfo();
+ proxyInfo.setType( networkProxy.getProtocol() );
+ proxyInfo.setHost( networkProxy.getHost() );
+ proxyInfo.setPort( networkProxy.getPort() );
+ proxyInfo.setUserName( networkProxy.getUsername() );
+ proxyInfo.setPassword( networkProxy.getPassword() );
+ }
+
+ wagon.connect( new Repository( remoteRepository.getId(), remoteRepository.getUrl() ), proxyInfo );
// we only check connectivity as remote repo can be empty
wagon.getFileList( "/" );