Author: carlos Date: Mon Sep 4 01:24:13 2006 New Revision: 439975 URL: http://svn.apache.org/viewvc?view=rev&rev=439975 Log: Deprecate our implementations of PasswordEncoder for now. They don't work with acegi
Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/AbstractJAASPasswordEncoder.java maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserSecurityPolicy.java maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA1PasswordEncoder.java maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA256PasswordEncoder.java Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/AbstractJAASPasswordEncoder.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/AbstractJAASPasswordEncoder.java?view=diff&rev=439975&r1=439974&r2=439975 ============================================================================== --- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/AbstractJAASPasswordEncoder.java (original) +++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/AbstractJAASPasswordEncoder.java Mon Sep 4 01:24:13 2006 @@ -30,6 +30,8 @@ /** * Abstract Password Encoder that uses the [EMAIL PROTECTED] MessageDigest} from JAAS. * + * @deprecated use AcegiPasswordEncoder from maven-user-acegi + * * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> * @version $Id$ */ Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserSecurityPolicy.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserSecurityPolicy.java?view=diff&rev=439975&r1=439974&r2=439975 ============================================================================== --- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserSecurityPolicy.java (original) +++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/DefaultUserSecurityPolicy.java Mon Sep 4 01:24:13 2006 @@ -54,11 +54,6 @@ private PasswordEncoder passwordEncoder; /** - * @plexus.configuration default-value="Step doog ekam Skravdraa" - */ - private String systemSalt; - - /** * The List of [EMAIL PROTECTED] PasswordRule} objects. */ private List rules; @@ -158,7 +153,5 @@ // TODO: Find way to have plexus initialize this list with only 1 item. addPasswordRule( new MustHavePasswordRule() ); - - getPasswordEncoder().setSystemSalt( systemSalt ); } } Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA1PasswordEncoder.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA1PasswordEncoder.java?view=diff&rev=439975&r1=439974&r2=439975 ============================================================================== --- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA1PasswordEncoder.java (original) +++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA1PasswordEncoder.java Mon Sep 4 01:24:13 2006 @@ -21,6 +21,8 @@ /** * SHA-1 Password Encoder. * + * @deprecated use AcegiPasswordEncoder from maven-user-acegi + * * @plexus.component role="org.apache.maven.user.model.PasswordEncoder" role-hint="sha1" * * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a> Modified: maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA256PasswordEncoder.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA256PasswordEncoder.java?view=diff&rev=439975&r1=439974&r2=439975 ============================================================================== --- maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA256PasswordEncoder.java (original) +++ maven/shared/trunk/maven-user/maven-user-model/src/main/java/org/apache/maven/user/model/impl/SHA256PasswordEncoder.java Mon Sep 4 01:24:13 2006 @@ -21,6 +21,8 @@ /** * SHA-256 Password Encoder. * + * @deprecated use AcegiPasswordEncoder from maven-user-acegi + * * @plexus.component role="org.apache.maven.user.model.PasswordEncoder" role-hint="sha256" * * @author <a href="mailto:[EMAIL PROTECTED]">Joakim Erdfelt</a>