From 04fd892682a78fbdcfa4613f8aa4ab7d9eab4088 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sat, 7 Apr 2012 19:55:10 +0000 Subject: [PATCH] package move to o.a.a.r module redback-authentication-api git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310844 13f79535-47bb-0310-9956-ffa450edef68 --- .../authentication/AuthenticationConstants.java | 2 +- .../authentication/AuthenticationDataSource.java | 2 +- .../authentication/AuthenticationException.java | 2 +- .../authentication/AuthenticationManager.java | 2 +- .../authentication/AuthenticationResult.java | 2 +- .../redback/authentication/Authenticator.java | 5 ++++- .../DefaultAuthenticationManager.java | 7 ++++++- .../NotAuthenticatedException.java | 2 +- .../PasswordBasedAuthenticationDataSource.java | 3 ++- .../TokenBasedAuthenticationDataSource.java | 3 ++- .../main/resources/META-INF/spring-context.xml | 2 +- .../ldap/LdapBindAuthenticator.java | 10 +++++----- .../ldap/LdapBindAuthenticatorTest.java | 4 ++-- .../memory/MemoryAuthenticator.java | 10 +++++----- .../memory/MemoryAuthenticatorTest.java | 6 +++--- .../authentication/open/OpenAuthenticator.java | 10 +++++----- .../checks/security/AdminAutoCreateCheck.java | 2 +- .../HttpAuthenticationException.java | 2 +- .../filter/authentication/HttpAuthenticator.java | 6 +++--- .../basic/HttpBasicAuthentication.java | 6 +++--- .../basic/HttpBasicAuthenticationFilter.java | 2 +- .../digest/HttpDigestAuthentication.java | 6 +++--- .../digest/HttpDigestAuthenticationFilter.java | 2 +- .../rest/services/DefaultLoginService.java | 4 ++-- .../rest/services/DefaultUserService.java | 4 ++-- .../interceptors/AuthenticationInterceptor.java | 4 ++-- .../interceptors/PermissionsInterceptor.java | 2 +- .../redback/struts2/action/LoginAction.java | 12 ++++++------ .../struts2/action/admin/AddAdminUserAction.java | 10 +++++----- .../interceptor/AutoLoginInterceptor.java | 6 +++--- .../interceptor/ForceAdminUserInterceptor.java | 2 +- .../redback/struts2/action/LoginActionTest.java | 6 +++--- .../admin/AbstractUserCredentialsActionTest.java | 4 ++-- .../action/admin/AssignmentsActionTest.java | 2 +- .../struts2/action/admin/UserEditActionTest.java | 4 ++-- .../keystore/KeyStoreAuthenticator.java | 10 +++++----- .../redback/system/DefaultSecuritySession.java | 2 +- .../redback/system/DefaultSecuritySystem.java | 8 ++++---- .../plexus/redback/system/SecuritySession.java | 2 +- .../plexus/redback/system/SecuritySystem.java | 4 ++-- .../system/TestAuthenticationManager.java | 2 +- .../users/UserManagerAuthenticator.java | 16 ++++++++-------- .../users/UserManagerAuthenticatorTest.java | 9 ++++----- 43 files changed, 110 insertions(+), 101 deletions(-) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/AuthenticationConstants.java (95%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/AuthenticationDataSource.java (96%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/AuthenticationException.java (96%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/AuthenticationManager.java (96%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/AuthenticationResult.java (98%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/Authenticator.java (82%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/DefaultAuthenticationManager.java (91%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/NotAuthenticatedException.java (96%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/PasswordBasedAuthenticationDataSource.java (95%) rename redback-authentication/redback-authentication-api/src/main/java/org/{codehaus/plexus => apache/archiva}/redback/authentication/TokenBasedAuthenticationDataSource.java (94%) diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java similarity index 95% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java index 9397fca1..7379937c 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationConstants.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationConstants.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java similarity index 96% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java index 8eea2a8b..f745db98 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationDataSource.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationDataSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java similarity index 96% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java index 9c323c20..a168e2d6 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationException.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java similarity index 96% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java index 23bfdbb7..84280c95 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationManager.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java similarity index 98% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java index 8eeb3b22..8e42842a 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/AuthenticationResult.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationResult.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java similarity index 82% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java index d3445398..9f434ee6 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/Authenticator.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,9 @@ package org.codehaus.plexus.redback.authentication; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java similarity index 91% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java index 93fcc486..5d019d5d 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/DefaultAuthenticationManager.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,11 @@ package org.codehaus.plexus.redback.authentication; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationManager; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.Authenticator; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.springframework.context.ApplicationContext; diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/NotAuthenticatedException.java similarity index 96% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/NotAuthenticatedException.java index a74552e3..ae637e41 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/NotAuthenticatedException.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/NotAuthenticatedException.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java similarity index 95% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java index 75263ae7..c42b7405 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/PasswordBasedAuthenticationDataSource.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/PasswordBasedAuthenticationDataSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.authentication; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.commons.lang.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; diff --git a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java similarity index 94% rename from redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java rename to redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java index 7a69a5be..3f25a263 100644 --- a/redback-authentication/redback-authentication-api/src/main/java/org/codehaus/plexus/redback/authentication/TokenBasedAuthenticationDataSource.java +++ b/redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/TokenBasedAuthenticationDataSource.java @@ -1,4 +1,4 @@ -package org.codehaus.plexus.redback.authentication; +package org.apache.archiva.redback.authentication; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.authentication; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; diff --git a/redback-authentication/redback-authentication-api/src/main/resources/META-INF/spring-context.xml b/redback-authentication/redback-authentication-api/src/main/resources/META-INF/spring-context.xml index b0a4eba9..f2e50d77 100644 --- a/redback-authentication/redback-authentication-api/src/main/resources/META-INF/spring-context.xml +++ b/redback-authentication/redback-authentication-api/src/main/resources/META-INF/spring-context.xml @@ -29,6 +29,6 @@ + base-package="org.apache.archiva.redback.authentication"/> \ No newline at end of file diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java index b932153e..d2aad35a 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/main/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticator.java @@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.authentication.ldap; */ import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +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.codehaus.plexus.redback.common.ldap.UserMapper; import org.codehaus.plexus.redback.common.ldap.connection.LdapConnection; import org.codehaus.plexus.redback.common.ldap.connection.LdapConnectionFactory; diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java index 6fae15e2..8d970919 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/codehaus/plexus/redback/authentication/ldap/LdapBindAuthenticatorTest.java @@ -20,8 +20,8 @@ package org.codehaus.plexus.redback.authentication.ldap; */ import junit.framework.TestCase; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder; import org.apache.archiva.redback.users.ldap.service.LdapCacheService; diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticator.java index 062875ff..1a6853a0 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/main/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticator.java @@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.authentication.memory; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +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.springframework.stereotype.Service; /** diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticatorTest.java b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticatorTest.java index ba6df9af..311aa644 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticatorTest.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-memory/src/test/java/org/codehaus/plexus/redback/authentication/memory/MemoryAuthenticatorTest.java @@ -20,9 +20,9 @@ package org.codehaus.plexus.redback.authentication.memory; */ import junit.framework.TestCase; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.Authenticator; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/codehaus/plexus/redback/authentication/open/OpenAuthenticator.java b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/codehaus/plexus/redback/authentication/open/OpenAuthenticator.java index fd380baf..1e39ed12 100644 --- a/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/codehaus/plexus/redback/authentication/open/OpenAuthenticator.java +++ b/redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/codehaus/plexus/redback/authentication/open/OpenAuthenticator.java @@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.authentication.open; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +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.codehaus.plexus.redback.policy.AccountLockedException; import org.springframework.stereotype.Service; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java index a356e0ff..a7548c3f 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/AdminAutoCreateCheck.java @@ -21,7 +21,7 @@ package org.codehaus.redback.integration.checks.security; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.configuration.UserConfiguration; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RbacManagerException; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java index c05ad859..61b2e3f8 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticationException.java @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authentication; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationException; /** * HttpAuthenticationException diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java index c46c2701..cbf74020 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java @@ -19,11 +19,11 @@ package org.codehaus.redback.integration.filter.authentication; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java index 3776c6e1..fbfe08c3 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java @@ -25,10 +25,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.commons.codec.binary.Base64; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java index 6aade049..459e399d 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthenticationFilter.java @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authentication.basic; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java index 887aca7d..318cdc3a 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java @@ -19,11 +19,11 @@ package org.codehaus.redback.integration.filter.authentication.digest; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.User; import org.apache.commons.codec.binary.Base64; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.TokenBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.users.UserManager; diff --git a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java index c957bfd3..02ccad01 100644 --- a/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java +++ b/redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthenticationFilter.java @@ -19,7 +19,7 @@ package org.codehaus.redback.integration.filter.authentication.digest; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.codehaus.redback.integration.filter.authentication.AbstractHttpAuthenticationFilter; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.basic.HttpBasicAuthentication; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java index 21a8b8ae..e81e83a3 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java @@ -18,9 +18,9 @@ package org.codehaus.redback.rest.services; * specific language governing permissions and limitations * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.keys.KeyManager; import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java index 318bb482..84562dc5 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java @@ -24,8 +24,8 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; import org.codehaus.plexus.cache.Cache; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.TokenBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.codehaus.plexus.redback.configuration.UserConfiguration; import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.keys.KeyManager; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java index dfb9834b..df91c39f 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java @@ -25,8 +25,8 @@ import org.apache.archiva.redback.users.UserManager; import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.authorization.RedbackAuthorization; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java index 675fa2c8..86514bf6 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PermissionsInterceptor.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.model.ClassResourceInfo; import org.apache.cxf.message.Message; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.authorization.AuthorizationException; import org.codehaus.plexus.redback.authorization.RedbackAuthorization; import org.codehaus.plexus.redback.system.SecuritySession; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java index 46fc619b..c37dbf88 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java @@ -21,12 +21,12 @@ package org.codehaus.plexus.redback.struts2.action; import org.apache.archiva.redback.users.User; import org.apache.struts2.ServletActionContext; -import org.codehaus.plexus.redback.authentication.AuthenticationConstants; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.TokenBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationConstants; +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.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.codehaus.plexus.redback.configuration.UserConfiguration; import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.keys.KeyManagerException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java index 0c4f08ff..75354bbf 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java @@ -19,13 +19,13 @@ package org.codehaus.plexus.redback.struts2.action.admin; * under the License. */ +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.UserManager; import org.apache.struts2.ServletActionContext; -import org.codehaus.plexus.redback.authentication.AuthenticationConstants; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationConstants; +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.configuration.UserConfiguration; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java index 7ac67539..40d2ce61 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java @@ -23,9 +23,9 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; import org.apache.struts2.ServletActionContext; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.TokenBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java index 42d38160..548b126e 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java @@ -25,7 +25,7 @@ import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; import org.apache.struts2.ServletActionContext; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.configuration.UserConfiguration; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManagerException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java index e455a65c..97b27444 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java @@ -28,9 +28,9 @@ import static org.easymock.EasyMock.verify; import java.util.HashMap; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.DefaultUserSecurityPolicy; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java index 2a08c1b4..cd8b803b 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java @@ -22,8 +22,8 @@ package org.codehaus.plexus.redback.struts2.action.admin; import net.sf.ehcache.CacheManager; import org.apache.archiva.redback.users.UserManager; import org.apache.struts2.StrutsSpringTestCase; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.rbac.RBACManager; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java index 531ff032..4df377ef 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java @@ -22,8 +22,8 @@ package org.codehaus.plexus.redback.struts2.action.admin; import com.google.common.collect.Lists; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionProxy; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationException; import org.codehaus.plexus.redback.authorization.AuthorizationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java index a87aedf1..289ab54a 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java @@ -20,10 +20,10 @@ package org.codehaus.plexus.redback.struts2.action.admin; */ import com.opensymphony.xwork2.Action; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.rbac.RbacManagerException; diff --git a/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java b/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java index f15e7959..217422e7 100644 --- a/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java +++ b/redback-keys/redback-authentication-keys/src/main/java/org/codehaus/plexus/redback/authentication/keystore/KeyStoreAuthenticator.java @@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.authentication.keystore; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.TokenBasedAuthenticationDataSource; +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.TokenBasedAuthenticationDataSource; import org.codehaus.plexus.redback.keys.AuthenticationKey; import org.codehaus.plexus.redback.keys.KeyManager; import org.codehaus.plexus.redback.keys.KeyManagerException; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java index 9b149aaf..1f6257de 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySession.java @@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.system; */ import org.apache.archiva.redback.users.User; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.springframework.stereotype.Service; import java.io.Serializable; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java index e2c33358..53509b55 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java @@ -22,10 +22,10 @@ package org.codehaus.plexus.redback.system; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationManager; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationManager; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.codehaus.plexus.redback.authorization.AuthorizationDataSource; import org.codehaus.plexus.redback.authorization.AuthorizationException; import org.codehaus.plexus.redback.authorization.AuthorizationResult; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java index 9052bbf6..8ac071a5 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySession.java @@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.system; * under the License. */ -import org.codehaus.plexus.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.users.User; import java.io.Serializable; diff --git a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java index e2f67c42..b288f8a6 100644 --- a/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java +++ b/redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java @@ -20,8 +20,8 @@ package org.codehaus.plexus.redback.system; */ import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; import org.codehaus.plexus.redback.authorization.AuthorizationException; import org.codehaus.plexus.redback.authorization.AuthorizationResult; import org.codehaus.plexus.redback.keys.KeyManager; diff --git a/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java b/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java index 3b200c5e..73a3d8f2 100644 --- a/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java +++ b/redback-system/src/test/java/org/codehaus/plexus/redback/system/TestAuthenticationManager.java @@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.system; */ import junit.framework.TestCase; -import org.codehaus.plexus.redback.authentication.AuthenticationManager; +import org.apache.archiva.redback.authentication.AuthenticationManager; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; diff --git a/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java b/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java index 9c5dad96..bc55365f 100644 --- a/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java +++ b/redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java @@ -19,14 +19,14 @@ package org.apache.archiva.redback.authentication.users; * under the License. */ +import org.apache.archiva.redback.authentication.Authenticator; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationConstants; -import org.codehaus.plexus.redback.authentication.AuthenticationDataSource; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationConstants; +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.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.PasswordEncoder; @@ -72,7 +72,7 @@ public class UserManagerAuthenticator * @throws MustChangePasswordException * @throws MustChangePasswordException * @throws PolicyViolationException - * @see org.codehaus.plexus.redback.authentication.Authenticator#authenticate(org.codehaus.plexus.redback.authentication.AuthenticationDataSource) + * @see org.apache.archiva.redback.authentication.Authenticator#authenticate(org.apache.archiva.redback.authentication.AuthenticationDataSource) */ public AuthenticationResult authenticate( AuthenticationDataSource ds ) throws AuthenticationException, AccountLockedException, MustChangePasswordException @@ -158,7 +158,7 @@ public class UserManagerAuthenticator } /** - * Returns the wrapped {@link UserManager} used by this {@link Authenticator} + * Returns the wrapped {@link UserManager} used by this {@link org.apache.archiva.redback.authentication.Authenticator} * implementation for authentication. * * @return the userManager diff --git a/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java b/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java index 507abb50..bc849a67 100644 --- a/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java +++ b/redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java @@ -20,14 +20,13 @@ package org.apache.archiva.redback.authentication.users; */ import junit.framework.TestCase; -import org.apache.archiva.redback.authentication.users.UserManagerAuthenticator; +import org.apache.archiva.redback.authentication.Authenticator; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.authentication.AuthenticationException; -import org.codehaus.plexus.redback.authentication.AuthenticationResult; -import org.codehaus.plexus.redback.authentication.Authenticator; -import org.codehaus.plexus.redback.authentication.PasswordBasedAuthenticationDataSource; +import org.apache.archiva.redback.authentication.AuthenticationException; +import org.apache.archiva.redback.authentication.AuthenticationResult; +import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.policy.UserSecurityPolicy;