You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2009/04/29 00:17:54 UTC
svn commit: r769568 - in
/maven/components/branches/maven-2.2.x/maven-core/src/main:
java/org/apache/maven/DefaultMaven.java
resources/META-INF/plexus/components.xml
Author: jdcasey
Date: Tue Apr 28 22:17:53 2009
New Revision: 769568
URL: http://svn.apache.org/viewvc?rev=769568&view=rev
Log:
[MNG-4146] Use standard component descriptor for SecDispatcher component, brought in by plexus-sec-dispatcher, instead of the replicated one in maven-core. The replicated version was missing the requirement for the decryptors map.
Modified:
maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=769568&r1=769567&r2=769568&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/branches/maven-2.2.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue Apr 28 22:17:53 2009
@@ -703,19 +703,19 @@
WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE );
+ SecDispatcher sd = null;
+
try
{
Proxy proxy = settings.getActiveProxy();
- SecDispatcher sd = null;
-
try
{
- sd = (SecDispatcher) container.lookup( SecDispatcher.ROLE, "maven" );
+ sd = (SecDispatcher) container.lookup( SecDispatcher.ROLE );
}
catch (Exception e)
{
- getLogger().warn( "security features are disabled. Cannot find plexus component "+SecDispatcher.ROLE +":maven");
+ getLogger().warn( "Security features are disabled. Cannot find plexus component "+SecDispatcher.ROLE );
line();
}
@@ -799,6 +799,10 @@
finally
{
container.release( wagonManager );
+ if ( sd != null )
+ {
+ container.release( sd );
+ }
}
// Would be better in settings.xml, but it is not extensible yet
Modified: maven/components/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=769568&r1=769567&r2=769568&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/components/branches/maven-2.2.x/maven-core/src/main/resources/META-INF/plexus/components.xml Tue Apr 28 22:17:53 2009
@@ -603,21 +603,5 @@
</requirement>
</requirements>
</component>
-
- <component>
- <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
- <role-hint>maven</role-hint>
- <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
- <description>Maven Security dispatcher</description>
- <requirements>
- <requirement>
- <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
- <field-name>_cipher</field-name>
- </requirement>
- </requirements>
- <configuration>
- <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
- </configuration>
- </component>
</components>
</component-set>