You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2009/02/18 23:00:37 UTC
svn commit: r745672 -
/maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Author: jvanzyl
Date: Wed Feb 18 22:00:36 2009
New Revision: 745672
URL: http://svn.apache.org/viewvc?rev=745672&view=rev
Log:
o remove WagonManager
Modified:
maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
Modified: maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java?rev=745672&r1=745671&r2=745672&view=diff
==============================================================================
--- maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java (original)
+++ maven/components/branches/MNG-3932/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestPopulator.java Wed Feb 18 22:00:36 2009
@@ -85,9 +85,6 @@
private PlexusContainer container;
@Requirement
- private WagonManager wagonManager;
-
- @Requirement
private MavenSettingsBuilder settingsBuilder;
@Requirement
@@ -392,22 +389,18 @@
if ( request.isOffline() )
{
- wagonManager.setOnline( false );
+ mavenTools.setOnline( false );
}
else if ( ( request.getSettings() != null ) && request.getSettings().isOffline() )
{
- wagonManager.setOnline( false );
+ mavenTools.setOnline( false );
}
else
{
- wagonManager.findAndRegisterWagons( container );
-
- wagonManager.setInteractive( request.isInteractiveMode() );
+ mavenTools.setDownloadMonitor( request.getTransferListener() );
- wagonManager.setDownloadMonitor( request.getTransferListener() );
-
- wagonManager.setOnline( true );
- }
+ mavenTools.setOnline( true );
+ }
try
{
@@ -435,7 +428,7 @@
throw new SettingsConfigurationException( "Proxy in settings.xml has no host" );
}
- wagonManager.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(), proxy.getUsername(), proxy.getPassword(), proxy.getNonProxyHosts() );
+ mavenTools.addProxy( proxy.getProtocol(), proxy.getHost(), proxy.getPort(), proxy.getUsername(), proxy.getPassword(), proxy.getNonProxyHosts() );
}
for ( Iterator i = settings.getServers().iterator(); i.hasNext(); )
@@ -446,29 +439,18 @@
String phrase = securityDispatcher.decrypt( server.getPassphrase() );
- wagonManager.addAuthenticationInfo( server.getId(), server.getUsername(), pass, server.getPrivateKey(), phrase );
-
- wagonManager.addPermissionInfo( server.getId(), server.getFilePermissions(), server.getDirectoryPermissions() );
+ mavenTools.addAuthenticationInfo( server.getId(), server.getUsername(), pass, server.getPrivateKey(), phrase );
- if ( server.getConfiguration() != null )
- {
- wagonManager.addConfiguration( server.getId(), (Xpp3Dom) server.getConfiguration() );
- }
+ mavenTools.addPermissionInfo( server.getId(), server.getFilePermissions(), server.getDirectoryPermissions() );
}
RepositoryPermissions defaultPermissions = new RepositoryPermissions();
- defaultPermissions.setDirectoryMode( "775" );
-
- defaultPermissions.setFileMode( "664" );
-
- wagonManager.setDefaultRepositoryPermissions( defaultPermissions );
-
for ( Iterator i = settings.getMirrors().iterator(); i.hasNext(); )
{
Mirror mirror = (Mirror) i.next();
- wagonManager.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
+ mavenTools.addMirror( mirror.getId(), mirror.getMirrorOf(), mirror.getUrl() );
}
}
catch ( SecDispatcherException e )
@@ -489,7 +471,7 @@
*/
@SuppressWarnings("unchecked")
private void decrypt( Settings settings )
- throws IOException
+ throws IOException
{
List<Server> servers = settings.getServers();