expose intialize method for Authenticator to make it reloadable

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1421469 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
index 54805bcf5a11a5b2b2d35203c9257627e3b72760..6efe11ca4addc44a6d9b8fe1c886814bfa7b4c89 100644 (file)
--- a/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
+++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
@@ -36,4 +36,6 @@ public interface Authenticator
 
     AuthenticationResult authenticate( AuthenticationDataSource source )
         throws AccountLockedException, AuthenticationException, MustChangePasswordException;
+
+    void initialize() throws AuthenticationException;
 }

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
index a4b51fee8f342fb0d6dcbb01272c8d8aef1e6683..7cf582fa36b62273b2b3397092f01dea9e54e7e3 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.authentication.ldap;
  * under the License.
  */
 
+import org.apache.archiva.redback.authentication.AbstractAuthenticator;
 import org.apache.archiva.redback.authentication.AuthenticationConstants;
 import org.apache.archiva.redback.common.ldap.UserMapper;
 import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
@@ -54,6 +55,7 @@ import java.util.Map;
  */
 @Service( "authenticator#ldap" )
 public class LdapBindAuthenticator
+    extends AbstractAuthenticator
     implements Authenticator
 {
 

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
index 4bc98e317c7cce0bc31fc8098a3832ef9a2e85ef..92de62b15a4c9be84f79f46187616660d79beba4 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/apache/archiva/redback/authentication/memory/MemoryAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.authentication.memory;
  * under the License.
  */
 
+import org.apache.archiva.redback.authentication.AbstractAuthenticator;
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
@@ -33,6 +34,7 @@ import org.springframework.stereotype.Service;
  */
 @Service("authenticator#memory")
 public class MemoryAuthenticator
+    extends AbstractAuthenticator
     implements Authenticator
 {
     private String login;

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
index b87c8f591f74f770523cf6dc4aa55a1307651b95..8d0f957774473c4cc9177ee5fcd8cc9d3d2f1580 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.authentication.open;
  * under the License.
  */
 
+import org.apache.archiva.redback.authentication.AbstractAuthenticator;
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
@@ -29,14 +30,13 @@ import org.springframework.stereotype.Service;
 
 /**
  * OpenAuthenticator - Does not test user / password.
- * All attempts result in access. 
+ * All attempts result in access.
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- *
- * 
  */
 @Service("authenticator#open")
 public class OpenAuthenticator
+    extends AbstractAuthenticator
     implements Authenticator
 {
 

diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
index eb982ddab3317a73c99af12a243e047351679366..d62f2e772dfa4ca0a1dd119877941ecb1737233d 100644 (file)
--- a/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
+++ b/redback-authentication/redback-authentication-providers/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.authentication.users;
  * under the License.
  */
 
+import org.apache.archiva.redback.authentication.AbstractAuthenticator;
 import org.apache.archiva.redback.authentication.AuthenticationConstants;
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
@@ -50,6 +51,7 @@ import java.util.Map;
  */
 @Service("authenticator#user-manager")
 public class UserManagerAuthenticator
+    extends AbstractAuthenticator
     implements Authenticator
 {
     private Logger log = LoggerFactory.getLogger( getClass() );
@@ -66,6 +68,7 @@ public class UserManagerAuthenticator
         return "UserManagerAuthenticator";
     }
 
+
     /**
      * @throws org.apache.archiva.redback.policy.AccountLockedException
      *

diff --git a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
index f3d549f31f9c1c9058b9bd07d14d7963ce1141f6..035c1e4cd98b18b7aace8f93a257b6af71cf98fc 100644 (file)
--- a/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
+++ b/redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
@@ -19,6 +19,7 @@ package org.apache.archiva.redback.authentication.keystore;
  * under the License.
  */
 
+import org.apache.archiva.redback.authentication.AbstractAuthenticator;
 import org.apache.archiva.redback.authentication.AuthenticationDataSource;
 import org.apache.archiva.redback.authentication.AuthenticationException;
 import org.apache.archiva.redback.authentication.AuthenticationResult;
@@ -47,6 +48,7 @@ import javax.annotation.Resource;
  */
 @Service("authenticator#keystore")
 public class KeyStoreAuthenticator
+    extends AbstractAuthenticator
     implements Authenticator
 {
     private Logger log = LoggerFactory.getLogger( getClass() );