Author: epunzalan
Date: Thu Feb 16 23:19:44 2006
New Revision: 378453
URL: http://svn.apache.org/viewcvs?rev=378453&view=rev
Log:
PR: MRM-96
Enabled use of proxy and added import of proxy configuration from maven-proxy
configuration file.
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java?rev=378453&r1=378452&r2=378453&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
Thu Feb 16 23:19:44 2006
@@ -287,7 +287,7 @@
}
catch ( ResourceDoesNotExistException e )
{
- //@todo usage for cacheFailure
+ //@todo usage for cacheFailure
//do nothing, file not found in this repository
}
catch ( AuthorizationException e )
@@ -369,7 +369,7 @@
boolean connected = false;
try
{
- wagon.connect( repository );
+ wagon.connect( repository, repository.getProxy() );
connected = true;
}
catch ( ConnectionException e )
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java?rev=378453&r1=378452&r2=378453&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
Thu Feb 16 23:19:44 2006
@@ -171,6 +171,14 @@
repo.setCacheFailures( repoConfig.getCacheFailures() );
repo.setCachePeriod( repoConfig.getCachePeriod() );
+ if ( repoConfig instanceof HttpRepoConfiguration )
+ {
+ HttpRepoConfiguration httpRepo = (HttpRepoConfiguration)
repoConfig;
+ MavenProxyConfiguration httpProxy = httpRepo.getProxy();
+ repo.setProxy( httpProxy.getHost(), httpProxy.getPort(),
+ httpProxy.getUsername(),
httpProxy.getPassword() );
+ }
+
repoList.add( repo );
}
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java?rev=378453&r1=378452&r2=378453&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/repository/ProxyRepository.java
Thu Feb 16 23:19:44 2006
@@ -18,6 +18,7 @@
import org.apache.maven.artifact.repository.DefaultArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.wagon.proxy.ProxyInfo;
/**
* Class to represent the Proxy repository. Currently does not provide
additional methods from
@@ -33,6 +34,8 @@
private boolean cacheFailures = false;
+ private ProxyInfo proxy;
+
public ProxyRepository( String id, String url, ArtifactRepositoryLayout
layout, boolean cacheFailures,
long cachePeriod )
{
@@ -66,5 +69,53 @@
public void setCacheFailures( boolean cacheFailures )
{
this.cacheFailures = cacheFailures;
+ }
+
+ public boolean isProxied()
+ {
+ return ( proxy != null );
+ }
+
+ public ProxyInfo getProxy()
+ {
+ return proxy;
+ }
+
+ public void setProxy( String host, int port )
+ {
+ ProxyInfo proxyInfo = new ProxyInfo();
+ proxyInfo.setHost( host );
+ proxyInfo.setPort( port );
+
+ setProxy( proxyInfo );
+ }
+
+ public void setProxy( String host, int port, String username, String
password )
+ {
+ ProxyInfo proxyInfo = new ProxyInfo();
+ proxyInfo.setHost( host );
+ proxyInfo.setPort( port );
+ proxyInfo.setUserName( username );
+ proxyInfo.setPassword( password );
+
+ setProxy( proxyInfo );
+ }
+
+ public void setProxy( String host, int port, String username, String
password, String ntlmHost, String ntlmDomain )
+ {
+ ProxyInfo proxyInfo = new ProxyInfo();
+ proxyInfo.setHost( host );
+ proxyInfo.setPort( port );
+ proxyInfo.setUserName( username );
+ proxyInfo.setPassword( password );
+ proxyInfo.setNtlmHost( ntlmHost );
+ proxyInfo.setNtlmDomain( ntlmDomain );
+
+ setProxy( proxyInfo );
+ }
+
+ public void setProxy( ProxyInfo proxy )
+ {
+ this.proxy = proxy;
}
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java?rev=378453&r1=378452&r2=378453&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/test/java/org/apache/maven/repository/proxy/configuration/ProxyConfigurationTest.java
Thu Feb 16 23:19:44 2006
@@ -21,6 +21,7 @@
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout;
import org.apache.maven.repository.proxy.repository.ProxyRepository;
+import org.apache.maven.wagon.proxy.ProxyInfo;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
@@ -72,6 +73,7 @@
ProxyRepository repo2 = new ProxyRepository( "repo2",
"http://www.ibiblio.org/maven";, legacyLayout );
repo2.setCacheFailures( false );
repo2.setCachePeriod( 3600 );
+ repo2.setProxy( "some.local.proxy", 80, "username", "password" );
config.addRepository( repo2 );
assertEquals( 2, config.getRepositories().size() );
@@ -89,6 +91,13 @@
assertFalse( repo.isCacheFailures() );
assertEquals( 3600, repo.getCachePeriod() );
assertEquals( repo2, repo );
+ assertTrue( repo.isProxied() );
+ ProxyInfo proxyInfo = repo.getProxy();
+ assertNotNull( proxyInfo );
+ assertEquals( "some.local.proxy", proxyInfo.getHost() );
+ assertEquals( 80, proxyInfo.getPort() );
+ assertEquals( "username", proxyInfo.getUserName() );
+ assertEquals( "password", proxyInfo.getPassword() );
try
{
