svn commit: r1421134 - /archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java

[olamy]

Author: olamy
Date: Thu Dec 13 08:39:54 2012
New Revision: 1421134

URL: http://svn.apache.org/viewvc?rev=1421134&view=rev
Log:
this class does not need to extends UserManagerAuthenticator

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java?rev=1421134&r1=1421133&r2=1421134&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/security/ArchivaUserManagerAuthenticator.java
 Thu Dec 13 08:39:54 2012
@@ -24,6 +24,7 @@ import org.apache.archiva.redback.authen
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
+import org.apache.archiva.redback.authentication.Authenticator;
 import 
org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
 import 
org.apache.archiva.redback.authentication.users.UserManagerAuthenticator;
 import org.apache.archiva.redback.policy.AccountLockedException;
@@ -53,7 +54,7 @@ import java.util.Map;
  */
 @Service( "authenticator#archiva" )
 public class ArchivaUserManagerAuthenticator
-    extends UserManagerAuthenticator
+    implements Authenticator
 {
     private Logger log = LoggerFactory.getLogger( getClass() );
 
@@ -84,7 +85,6 @@ public class ArchivaUserManagerAuthentic
     }
 
 
-    @Override
     public AuthenticationResult authenticate( AuthenticationDataSource ds )
         throws AuthenticationException, AccountLockedException, 
MustChangePasswordException
     {
@@ -191,7 +191,11 @@ public class ArchivaUserManagerAuthentic
         return new AuthenticationResult( authenticationSuccess, username, 
resultException, authnResultExceptionsMap );
     }
 
-    @Override
+    public boolean supportsDataSource( AuthenticationDataSource source )
+    {
+        return ( source instanceof PasswordBasedAuthenticationDataSource );
+    }
+
     public String getId()
     {
         return "ArchivaUserManagerAuthenticator";