Apache/archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

package move to o.a.a.r module redback-policy

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1310894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-07 22:28:59 +00:00
parent 2348016ffa
commit 12919d4171
76 changed files with 149 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/AuthenticationManager.java
View File

@ -19,8 +19,8 @@
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import java.util.List; import java.util.List;

7
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/Authenticator.java
View File

@ -19,11 +19,8 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
/** /**
* Authenticator: * Authenticator:

9
redback-authentication/redback-authentication-api/src/main/java/org/apache/archiva/redback/authentication/DefaultAuthenticationManager.java
View File

@ -19,13 +19,8 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.policy.MustChangePasswordException;
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; import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

5
redback-authentication/redback-authentication-providers/redback-authentication-ldap/src/test/java/org/apache/archiva/redback/authentication/ldap/LdapBindAuthenticatorTest.java
View File

@ -22,9 +22,8 @@
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.authentication.ldap.LdapBindAuthenticator; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService; import org.apache.archiva.redback.users.ldap.service.LdapCacheService;
import org.codehaus.redback.components.apacheds.ApacheDs; import org.codehaus.redback.components.apacheds.ApacheDs;
import org.junit.After; import org.junit.After;

2
redback-authentication/redback-authentication-providers/redback-authentication-open/src/main/java/org/apache/archiva/redback/authentication/open/OpenAuthenticator.java
View File

@ -24,7 +24,7 @@
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.Authenticator; import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/checks/security/GuestUserEnvironmentCheck.java
View File

@ -19,9 +19,9 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/HttpAuthenticator.java
View File

@ -20,12 +20,12 @@
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.redback.system.SecuritySystemConstants;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/basic/HttpBasicAuthentication.java
View File

@ -26,11 +26,11 @@
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; 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; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/filter/authentication/digest/HttpDigestAuthentication.java
View File

@ -20,12 +20,12 @@
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;

4
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/mail/MailerImpl.java
View File

@ -35,8 +35,8 @@
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserValidationSettings; import org.apache.archiva.redback.policy.UserValidationSettings;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

2
redback-integrations/redback-common-integrations/src/main/java/org/codehaus/redback/integration/util/AutoLoginCookies.java
View File

@ -28,7 +28,7 @@
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.CookieSettings; import org.apache.archiva.redback.policy.CookieSettings;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

2
redback-integrations/redback-common-integrations/src/test/java/org/codehaus/redback/integration/mail/MailGeneratorTest.java
View File

@ -23,9 +23,9 @@
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory; import org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.jpox.SchemaTool; import org.jpox.SchemaTool;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;

4
redback-integrations/redback-jsecurity/src/main/java/org/codehaus/redback/jsecurity/RedbackRealm.java
View File

@ -23,10 +23,10 @@
import java.util.Iterator; import java.util.Iterator;
import java.util.Set; import java.util.Set;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.Permission; import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;

2
redback-integrations/redback-jsecurity/src/test/java/org/codehaus/redback/jsecurity/RedbackRealmTest.java
View File

@ -20,8 +20,8 @@
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.Operation; import org.codehaus.plexus.redback.rbac.Operation;
import org.codehaus.plexus.redback.rbac.Permission; import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultLoginService.java
View File

@ -20,14 +20,14 @@
*/ */
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey; import org.codehaus.plexus.redback.keys.jdo.JdoAuthenticationKey;
import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey; import org.apache.archiva.redback.keys.memory.MemoryAuthenticationKey;
import org.apache.archiva.redback.keys.memory.MemoryKeyManager; import org.apache.archiva.redback.keys.memory.MemoryKeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;

6
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultPasswordService.java
View File

@ -18,13 +18,13 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticator;

8
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/DefaultUserService.java
View File

@ -22,6 +22,8 @@
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -31,10 +33,8 @@
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException; import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/AuthenticationInterceptor.java
View File

@ -20,6 +20,7 @@
*/ */
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.cxf.jaxrs.ext.RequestHandler; import org.apache.cxf.jaxrs.ext.RequestHandler;
@ -28,8 +29,7 @@
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authorization.RedbackAuthorization; import org.apache.archiva.redback.authorization.RedbackAuthorization;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException; import org.codehaus.redback.integration.filter.authentication.HttpAuthenticationException;

4
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/interceptors/PasswordRuleViolationExceptionMapper.java
View File

@ -18,8 +18,8 @@
* under the License. * under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.redback.rest.api.model.ErrorMessage; import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.model.RedbackRestError; import org.codehaus.redback.rest.api.model.RedbackRestError;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/codehaus/redback/rest/services/utils/PasswordValidator.java
View File

@ -18,11 +18,11 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.redback.rest.api.model.ErrorMessage; import org.codehaus.redback.rest.api.model.ErrorMessage;
import org.codehaus.redback.rest.api.services.RedbackServiceException; import org.codehaus.redback.rest.api.services.RedbackServiceException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java
View File

@ -23,8 +23,8 @@
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.redback.system.SecuritySystemConstants;
import org.codehaus.redback.integration.interceptor.SecureAction; import org.codehaus.redback.integration.interceptor.SecureAction;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractUserCredentialsAction.java
View File

@ -20,7 +20,7 @@
*/ */
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.rbac.Permission; import org.codehaus.plexus.redback.rbac.Permission;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java
View File

@ -21,8 +21,8 @@
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.redback.system.SecuritySystemConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java
View File

@ -20,6 +20,7 @@
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants; import org.apache.archiva.redback.authentication.AuthenticationConstants;
@ -31,8 +32,7 @@
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java
View File

@ -19,10 +19,10 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java
View File

@ -20,11 +20,11 @@
*/ */
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java
View File

@ -20,9 +20,9 @@
*/ */
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.RoleManagerException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java
View File

@ -21,14 +21,14 @@
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants; import org.apache.archiva.redback.authentication.AuthenticationConstants;
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.role.RoleManager;
import org.codehaus.plexus.redback.role.RoleManagerException; import org.codehaus.plexus.redback.role.RoleManagerException;
import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.codehaus.plexus.redback.struts2.action.AuditEvent;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java
View File

@ -21,7 +21,7 @@
import java.util.Arrays; import java.util.Arrays;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.rbac.Resource; import org.codehaus.plexus.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction; import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.codehaus.plexus.redback.struts2.action.AuditEvent;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java
View File

@ -19,11 +19,11 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.policy.PasswordRuleViolationException;
import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.Resource; import org.codehaus.plexus.redback.rbac.Resource;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java
View File

@ -23,12 +23,12 @@
import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.interceptor.Interceptor; import com.opensymphony.xwork2.interceptor.Interceptor;
import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.keys.AuthenticationKey;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;
import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.redback.system.SecuritySystemConstants;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java
View File

@ -28,7 +28,7 @@
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext; import org.apache.struts2.ServletActionContext;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java
View File

@ -27,15 +27,15 @@
import java.util.HashMap; import java.util.HashMap;
import org.apache.archiva.redback.policy.DefaultUserSecurityPolicy;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.policy.UserValidationSettings;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.DefaultUserSecurityPolicy;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserValidationSettings;
import org.codehaus.plexus.redback.system.DefaultSecuritySession; import org.codehaus.plexus.redback.system.DefaultSecuritySession;
import org.codehaus.plexus.redback.system.SecuritySession; import org.codehaus.plexus.redback.system.SecuritySession;
import org.codehaus.plexus.redback.system.SecuritySystem; import org.codehaus.plexus.redback.system.SecuritySystem;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java
View File

@ -20,12 +20,12 @@
*/ */
import net.sf.ehcache.CacheManager; import net.sf.ehcache.CacheManager;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.StrutsSpringTestCase; import org.apache.struts2.StrutsSpringTestCase;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; 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; import org.codehaus.plexus.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException; import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;

5
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java
View File

@ -25,8 +25,7 @@
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException; import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.Role; import org.codehaus.plexus.redback.rbac.Role;
@ -489,7 +488,7 @@ public void testRoleGrantFilteringOnRemoveRolesPermittedTemplated()
* Check security - show should succeed and display all roles, even without 'user-management-role-grant' or * Check security - show should succeed and display all roles, even without 'user-management-role-grant' or
* 'user-management-user-role' for the user administrators. * 'user-management-user-role' for the user administrators.
* *
* @throws MustChangePasswordException * @throws org.apache.archiva.redback.policy.MustChangePasswordException
*/ */
@Test @Test
public void testSystemAdminCanShowRoles() public void testSystemAdminCanShowRoles()

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java
View File

@ -21,11 +21,11 @@
import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.Action;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException; import org.codehaus.plexus.redback.rbac.RbacObjectInvalidException;
import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException; import org.codehaus.plexus.redback.rbac.RbacObjectNotFoundException;

4
redback-keys/redback-authentication-keys/src/main/java/org/apache/archiva/redback/authentication/keystore/KeyStoreAuthenticator.java
View File

@ -28,8 +28,8 @@
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.keys.KeyManagerException;
import org.apache.archiva.redback.keys.KeyNotFoundException; import org.apache.archiva.redback.keys.KeyNotFoundException;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AbstractCookieSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/AbstractCookieSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/AccountLockedException.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/AccountLockedException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/CookieSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/CookieSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserSecurityPolicy.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserSecurityPolicy.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -21,7 +21,7 @@
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.rules.MustHavePasswordRule; import org.apache.archiva.redback.policy.rules.MustHavePasswordRule;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/DefaultUserValidationSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/DefaultUserValidationSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/MustChangePasswordException.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/MustChangePasswordException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordEncoder.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncoder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordEncodingException.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordEncodingException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolationException.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolationException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PasswordRuleViolations.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PasswordRuleViolations.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyContext.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyContext.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/PolicyViolationException.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/PolicyViolationException.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.

3
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/RememberMeCookieSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/RememberMeCookieSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -19,6 +19,7 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.AbstractCookieSettings;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;

3
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/SignonCookieSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/SignonCookieSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one
@ -19,6 +19,7 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.AbstractCookieSettings;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserSecurityPolicy.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/UserSecurityPolicy.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -197,7 +197,7 @@ void extensionPasswordExpiration( User user )
* Extension Point - Test if user has excessive logins * Extension Point - Test if user has excessive logins
* *
* @param user the user to test excessive logins against. * @param user the user to test excessive logins against.
* @throws AccountLockedException if the number of logins was exceeded * @throws org.apache.archiva.redback.policy.AccountLockedException if the number of logins was exceeded
*/ */
void extensionExcessiveLoginAttempts( User user ) void extensionExcessiveLoginAttempts( User user )
throws AccountLockedException; throws AccountLockedException;

2
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/UserValidationSettings.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/UserValidationSettings.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/AbstractJAASPasswordEncoder.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/AbstractJAASPasswordEncoder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.encoders; package org.apache.archiva.redback.policy.encoders;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,11 +16,11 @@
* limitations under the License. * limitations under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.PasswordEncodingException;
import org.apache.archiva.redback.users.Messages; import org.apache.archiva.redback.users.Messages;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PasswordEncodingException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.security.MessageDigest; import java.security.MessageDigest;

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/PlainTextPasswordEncoder.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/PlainTextPasswordEncoder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.encoders; package org.apache.archiva.redback.policy.encoders;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA1PasswordEncoder.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA1PasswordEncoder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.encoders; package org.apache.archiva.redback.policy.encoders;
/* /*
* Copyright 2006 The Apache Software Foundation. * Copyright 2006 The Apache Software Foundation.
@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/encoders/SHA256PasswordEncoder.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/encoders/SHA256PasswordEncoder.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.encoders; package org.apache.archiva.redback.policy.encoders;
/* /*
* Copyright 2006 The Apache Software Foundation. * Copyright 2006 The Apache Software Foundation.
@ -16,7 +16,7 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.PasswordEncoder;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**

4
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AbstractPasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AbstractPasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -17,7 +17,7 @@
*/ */
import org.apache.archiva.redback.configuration.UserConfiguration; import org.apache.archiva.redback.configuration.UserConfiguration;
import org.codehaus.plexus.redback.policy.PasswordRule; import org.apache.archiva.redback.policy.PasswordRule;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaNumericPasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaNumericPasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,9 +16,9 @@
* limitations under the License. * limitations under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/AlphaPasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/AlphaPasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,8 +16,8 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/CharacterLengthPasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/CharacterLengthPasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,9 +16,9 @@
* limitations under the License. * limitations under the License.
*/ */
import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/MustHavePasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/MustHavePasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2006 The Apache Software Foundation. * Copyright 2006 The Apache Software Foundation.
@ -16,8 +16,8 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/NumericalPasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/NumericalPasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -17,8 +17,8 @@
*/ */
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/ReusePasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/ReusePasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,8 +16,8 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

6
redback-policy/src/main/java/org/codehaus/plexus/redback/policy/rules/WhitespacePasswordRule.java → redback-policy/src/main/java/org/apache/archiva/redback/policy/rules/WhitespacePasswordRule.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy.rules; package org.apache.archiva.redback.policy.rules;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -16,8 +16,8 @@
* limitations under the License. * limitations under the License.
*/ */
import org.codehaus.plexus.redback.policy.PasswordRuleViolations; import org.apache.archiva.redback.policy.PasswordRuleViolations;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
redback-policy/src/main/resources/META-INF/spring-context.xml
View File

@ -28,6 +28,6 @@
default-lazy-init="true"> default-lazy-init="true">
<context:annotation-config /> <context:annotation-config />
<context:component-scan base-package="org.codehaus.plexus.redback.policy"/> <context:component-scan base-package="org.apache.archiva.redback.policy"/>
</beans> </beans>

3
redback-policy/src/test/java/org/codehaus/plexus/redback/policy/PasswordEncoderTest.java → redback-policy/src/test/java/org/apache/archiva/redback/policy/PasswordEncoderTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.policy; package org.apache.archiva.redback.policy;
/* /*
* Copyright 2001-2006 The Apache Software Foundation. * Copyright 2001-2006 The Apache Software Foundation.
@ -17,6 +17,7 @@
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;

8
redback-system/src/main/java/org/codehaus/plexus/redback/system/DefaultSecuritySystem.java
View File

@ -20,6 +20,8 @@
*/ */
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
@ -31,9 +33,7 @@
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.authorization.Authorizer; import org.apache.archiva.redback.authorization.Authorizer;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -91,7 +91,7 @@ public class DefaultSecuritySystem
* @throws AuthenticationException * @throws AuthenticationException
* @throws UserNotFoundException * @throws UserNotFoundException
* @throws MustChangePasswordException * @throws MustChangePasswordException
* @throws AccountLockedException * @throws org.apache.archiva.redback.policy.AccountLockedException
* @throws MustChangePasswordException * @throws MustChangePasswordException
*/ */
public SecuritySession authenticate( AuthenticationDataSource source ) public SecuritySession authenticate( AuthenticationDataSource source )

6
redback-system/src/main/java/org/codehaus/plexus/redback/system/SecuritySystem.java
View File

@ -19,15 +19,15 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource; import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authorization.AuthorizationException; import org.apache.archiva.redback.authorization.AuthorizationException;
import org.apache.archiva.redback.authorization.AuthorizationResult; import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.keys.KeyManager;
import org.codehaus.plexus.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
/** /**

12
redback-users/redback-authentication-users/src/main/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticator.java
View File

@ -20,6 +20,9 @@
*/ */
import org.apache.archiva.redback.authentication.Authenticator; import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationConstants; import org.apache.archiva.redback.authentication.AuthenticationConstants;
@ -27,11 +30,8 @@
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.PolicyViolationException;
import org.codehaus.plexus.redback.policy.PasswordEncoder;
import org.codehaus.plexus.redback.policy.PolicyViolationException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -67,7 +67,7 @@ public String getId()
} }
/** /**
* @throws org.codehaus.plexus.redback.policy.AccountLockedException * @throws org.apache.archiva.redback.policy.AccountLockedException
* *
* @throws MustChangePasswordException * @throws MustChangePasswordException
* @throws MustChangePasswordException * @throws MustChangePasswordException

6
redback-users/redback-authentication-users/src/test/java/org/apache/archiva/redback/authentication/users/UserManagerAuthenticatorTest.java
View File

@ -21,15 +21,15 @@
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.authentication.Authenticator; import org.apache.archiva.redback.authentication.Authenticator;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationException; import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.codehaus.plexus.redback.policy.AccountLockedException; import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

2
redback-users/redback-users-providers/redback-users-jdo/src/main/java/org/apache/archiva/redback/users/jdo/JdoUserManager.java
View File

@ -19,6 +19,7 @@
* under the License. * under the License.
*/ */
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager; import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManagerException; import org.apache.archiva.redback.users.UserManagerException;
@ -27,7 +28,6 @@
import org.codehaus.plexus.jdo.PlexusJdoUtils; import org.codehaus.plexus.jdo.PlexusJdoUtils;
import org.codehaus.plexus.jdo.PlexusObjectNotFoundException; import org.codehaus.plexus.jdo.PlexusObjectNotFoundException;
import org.codehaus.plexus.jdo.PlexusStoreException; import org.codehaus.plexus.jdo.PlexusStoreException;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.PermanentUserException; import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserQuery; import org.apache.archiva.redback.users.UserQuery;
import org.codehaus.plexus.redback.users.jdo.JdoUser; import org.codehaus.plexus.redback.users.jdo.JdoUser;

4
redback-users/redback-users-providers/redback-users-ldap/src/test/java/org/apache/archiva/redback/users/ldap/LdapUserManagerTest.java
View File

@ -20,11 +20,11 @@
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.common.ldap.connection.LdapConnection; import org.apache.archiva.redback.common.ldap.connection.LdapConnection;
import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory; import org.apache.archiva.redback.common.ldap.connection.LdapConnectionFactory;
import org.codehaus.plexus.redback.policy.PasswordEncoder; import org.apache.archiva.redback.policy.encoders.SHA1PasswordEncoder;
import org.codehaus.plexus.redback.policy.encoders.SHA1PasswordEncoder;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.ldap.service.LdapCacheService; import org.apache.archiva.redback.users.ldap.service.LdapCacheService;

2
redback-users/redback-users-providers/redback-users-memory/src/main/java/org/apache/archiva/redback/users/memory/MemoryUserManager.java
View File

@ -21,7 +21,7 @@
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.AbstractUserManager; import org.apache.archiva.redback.users.AbstractUserManager;
import org.apache.archiva.redback.users.PermanentUserException; import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserQuery; import org.apache.archiva.redback.users.UserQuery;

2
redback-users/redback-users-tests/src/main/java/org/apache/archiva/redback/users/provider/test/AbstractUserManagerTestCase.java
View File

@ -20,10 +20,10 @@
*/ */
import junit.framework.TestCase; import junit.framework.TestCase;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.users.UserQuery; import org.apache.archiva.redback.users.UserQuery;
import org.codehaus.plexus.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.users.PermanentUserException; import org.apache.archiva.redback.users.PermanentUserException;
import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserManager;
import org.junit.Test; import org.junit.Test;