Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o remove wagon manager from the request populator 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@746531 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-02-21 16:15:26 +00:00
parent 8cb5aa6172
commit 69777c2ea2
1 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
View File

@ -28,7 +28,6 @@ import java.util.Properties;
import org.apache.maven.Maven; import org.apache.maven.Maven;
import org.apache.maven.RepositorySystem; import org.apache.maven.RepositorySystem;
import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.embedder.Configuration; import org.apache.maven.embedder.Configuration;
@ -414,10 +413,6 @@ public class DefaultMavenExecutionRequestPopulator
private void resolveParameters( Settings settings ) private void resolveParameters( Settings settings )
throws ComponentLookupException, ComponentLifecycleException, SettingsConfigurationException throws ComponentLookupException, ComponentLifecycleException, SettingsConfigurationException
{ {
WagonManager wagonManager = container.lookup( WagonManager.class );
try
{
Proxy proxy = settings.getActiveProxy(); Proxy proxy = settings.getActiveProxy();
if ( proxy != null ) if ( proxy != null )
@ -434,10 +429,18 @@ public class DefaultMavenExecutionRequestPopulator
{ {
Server server = (Server) i.next(); Server server = (Server) i.next();
String pass = securityDispatcher.decrypt( server.getPassword() ); String pass;
String phrase;
try
{
pass = securityDispatcher.decrypt( server.getPassword() );
phrase = securityDispatcher.decrypt( server.getPassphrase() );
}
catch (SecDispatcherException e)
{
throw new SettingsConfigurationException( "Error decrypting server password/passphrase.", e );
}
String phrase = securityDispatcher.decrypt( server.getPassphrase() );
mavenTools.addAuthenticationInfo( server.getId(), server.getUsername(), pass, server.getPrivateKey(), phrase ); mavenTools.addAuthenticationInfo( server.getId(), server.getUsername(), pass, server.getPrivateKey(), phrase );
mavenTools.addPermissionInfo( server.getId(), server.getFilePermissions(), server.getDirectoryPermissions() ); mavenTools.addPermissionInfo( server.getId(), server.getFilePermissions(), server.getDirectoryPermissions() );
@ -451,15 +454,6 @@ public class DefaultMavenExecutionRequestPopulator
mavenTools.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() ); mavenTools.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
} }
}
catch ( SecDispatcherException e )
{
throw new SettingsConfigurationException( e.getMessage() );
}
finally
{
container.release( wagonManager );
}
} }
/** /**