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/04 10:23:01 UTC
svn commit: r439974 - in /maven/continuum/branches/continuum-acegi:
continuum-webapp/pom.xml
continuum-webapp/src/main/resources/META-INF/plexus/application.xml pom.xml
Author: carlos
Date: Mon Sep 4 01:23:00 2006
New Revision: 439974
URL: http://svn.apache.org/viewvc?view=rev&rev=439974
Log:
Use acegi implementations for password encoding
Modified:
maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
maven/continuum/branches/continuum-acegi/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
maven/continuum/branches/continuum-acegi/pom.xml
Modified: maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml?view=diff&rev=439974&r1=439973&r2=439974
==============================================================================
--- maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/continuum-webapp/pom.xml Mon Sep 4 01:23:00 2006
@@ -125,12 +125,14 @@
<groupId>org.apache.maven.shared.user</groupId>
<artifactId>maven-user-webapp</artifactId>
<type>war</type>
- <version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared.user</groupId>
<artifactId>maven-user-controller</artifactId>
- <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared.user</groupId>
+ <artifactId>maven-user-acegi</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
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=439974&r1=439973&r2=439974
==============================================================================
--- 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 Mon Sep 4 01:23:00 2006
@@ -367,9 +367,25 @@
<role>org.acegisecurity.userdetails.UserDetailsService</role>
<field-name>userDetailsService</field-name>
</requirement>
+ <requirement>
+ <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
+ <field-name>passwordEncoder</field-name>
+ </requirement>
+ <!--
+ <requirement>
+ <role>org.acegisecurity.providers.dao.SaltSource</role>
+ <field-name>saltSource</field-name>
+ </requirement>
+ -->
</requirements>
+ </component>
+
+ <component>
+ <role>org.acegisecurity.providers.encoding.PasswordEncoder</role>
+ <implementation>org.acegisecurity.providers.encoding.ShaPasswordEncoder</implementation>
<configuration>
- <passwordEncoder implementation="org.acegisecurity.providers.encoding.ShaPasswordEncoder"/>
+ <!-- TODO sync with maven-user password encryptor -->
+ <algorithm>SHA-256</algorithm>
</configuration>
</component>
@@ -825,14 +841,13 @@
<requirements>
<requirement>
<role>org.apache.maven.user.model.PasswordEncoder</role>
- <role-hint>sha256</role-hint>
+ <role-hint>acegisha256</role-hint>
<field-name>passwordEncoder</field-name>
</requirement>
</requirements>
<configuration>
<allowedLoginAttempts>3</allowedLoginAttempts>
<previousPasswordsCount>6</previousPasswordsCount>
- <systemSalt>Step doog ekam Skravdraa</systemSalt>
</configuration>
</component>
@@ -893,9 +908,16 @@
<component>
<role>org.apache.maven.user.model.PasswordEncoder</role>
- <role-hint>sha256</role-hint>
- <implementation>org.apache.maven.user.model.impl.SHA256PasswordEncoder</implementation>
+ <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>
+
</components>
</plexus>
Modified: maven/continuum/branches/continuum-acegi/pom.xml
URL: http://svn.apache.org/viewvc/maven/continuum/branches/continuum-acegi/pom.xml?view=diff&rev=439974&r1=439973&r2=439974
==============================================================================
--- maven/continuum/branches/continuum-acegi/pom.xml (original)
+++ maven/continuum/branches/continuum-acegi/pom.xml Mon Sep 4 01:23:00 2006
@@ -422,6 +422,17 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared.user</groupId>
+ <artifactId>maven-user-acegi</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared.user</groupId>
+ <artifactId>maven-user-webapp</artifactId>
+ <type>war</type>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>1.2.1</version>