maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject svn commit: r769489 - in /maven/components/branches/maven-2.1.x/maven-core/src/main: java/org/apache/maven/DefaultMaven.java resources/META-INF/plexus/components.xml
Date Tue, 28 Apr 2009 18:24:48 GMT
Author: jdcasey
Date: Tue Apr 28 18:24:48 2009
New Revision: 769489

URL: http://svn.apache.org/viewvc?rev=769489&view=rev
Log:
[MNG-4146] Switch to default component descriptor for SecDispatcher, which provides the _decryptors
field requirement and should allow custom security decryptors to be used with Maven.

Modified:
    maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
    maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml

Modified: maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=769489&r1=769488&r2=769489&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Tue Apr 28 18:24:48 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.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=769489&r1=769488&r2=769489&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/components/branches/maven-2.1.x/maven-core/src/main/resources/META-INF/plexus/components.xml
Tue Apr 28 18:24:48 2009
@@ -603,23 +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>



Mime
View raw message