Author: jvanzyl
Date: Fri Jan 2 15:35:29 2009
New Revision: 730868
URL: http://svn.apache.org/viewvc?rev=730868&view=rev
Log:
o there is a subtle realm problem with plexus and under certain conditions
(release deploys) the wagon manager used to populate auth info is not the same
as used by the wagon manager. this is fixed in subsequent releases of plexus
but i'm not testing everything again so i'm using a static map as a work
around. when alpha-1 is released i'll bump the version of plexus and test again.
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=730868&r1=730867&r2=730868&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
Fri Jan 2 15:35:29 2009
@@ -84,14 +84,14 @@
private static final String MAVEN_ARTIFACT_PROPERTIES =
"META-INF/maven/org.apache.maven.artifact/maven-artifact/pom.properties";
private static int anonymousMirrorIdSeed = 0;
-
+
private PlexusContainer container;
// TODO: proxies, authentication and mirrors are via settings, and should
come in via an alternate method - perhaps
// attached to ArtifactRepository before the method is called (so AR would
be composed of WR, not inherit it)
private Map<String,ProxyInfo> proxies = new HashMap<String,ProxyInfo>();
- private Map<String,AuthenticationInfo> authenticationInfoMap = new
HashMap<String,AuthenticationInfo>();
+ private static Map<String,AuthenticationInfo> authenticationInfoMap = new
HashMap<String,AuthenticationInfo>();
private Map<String,RepositoryPermissions> serverPermissionsMap = new
HashMap<String,RepositoryPermissions>();
@@ -239,7 +239,9 @@
getLogger().debug( "not adding permissions to wagon
connection" );
}
- wagon.connect( artifactRepository, getAuthenticationInfo(
repository.getId() ), new ProxyInfoProvider()
+ AuthenticationInfo authenticationInfo = getAuthenticationInfo(
repository.getId() );
+
+ wagon.connect( artifactRepository, authenticationInfo, new
ProxyInfoProvider()
{
public ProxyInfo getProxyInfo( String protocol )
{
