You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ca...@apache.org on 2006/09/13 02:21:36 UTC

svn commit: r442766 - /maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Author: carlos
Date: Tue Sep 12 17:21:35 2006
New Revision: 442766

URL: http://svn.apache.org/viewvc?view=rev&rev=442766
Log:
Work around lack of support of constructor injection in plexus

Modified:
    maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=442766&r1=442765&r2=442766
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue Sep 12 17:21:35 2006
@@ -337,7 +337,7 @@
           <role-hint>maven</role-hint>
         </requirement>
         <requirement>
-          <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
+          <role>org.apache.maven.user.model.PasswordEncoder</role>
           <field-name>passwordEncoder</field-name>
         </requirement>
         <!--
@@ -350,27 +350,15 @@
     </component>
 
     <component>
-      <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
-      <implementation>org.acegisecurity.providers.encoding.ShaPasswordEncoder</implementation>
+      <role>org.apache.maven.user.model.PasswordEncoder</role>
+      <role-hint>SHA-256</role-hint>
+      <implementation>org.apache.maven.user.acegi.AcegiPasswordEncoder</implementation>
       <configuration>
-        <!-- TODO sync with maven-user password encryptor -->
         <algorithm>SHA-256</algorithm>
       </configuration>
     </component>
 
     <component>
-      <role>org.apache.maven.user.model.PasswordEncoder</role>
-      <role-hint>acegisha256</role-hint>
-      <implementation>org.apache.maven.user.acegi.AcegiPasswordEncoder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
-          <field-name>encoder</field-name>
-        </requirement>
-      </requirements>
-    </component>
-
-    <component>
       <role>org.acegisecurity.event.authentication.LoggerListener</role>
       <implementation>org.acegisecurity.event.authentication.LoggerListener</implementation>
     </component>
@@ -747,7 +735,7 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.user.model.PasswordEncoder</role>
-          <role-hint>acegisha256</role-hint>
+          <role-hint>SHA-256</role-hint>
           <field-name>passwordEncoder</field-name>
         </requirement>
       </requirements>