diff options
author | Olivier Lamy <olamy@apache.org> | 2012-04-07 19:55:10 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-04-07 19:55:10 +0000 |
commit | 04fd892682a78fbdcfa4613f8aa4ab7d9eab4088 (patch) | |
tree | 1ba27c37d6c17a6b62deaf8b60a67d4818352611 /redback-integrations/redback-struts2 | |
parent | aa9c62dfe9098ccbbe10d4077cb03abf54154228 (diff) | |
download | archiva-04fd892682a78fbdcfa4613f8aa4ab7d9eab4088.tar.gz archiva-04fd892682a78fbdcfa4613f8aa4ab7d9eab4088.zip |
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
Diffstat (limited to 'redback-integrations/redback-struts2')
8 files changed, 23 insertions, 23 deletions
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 46fc619bd..c37dbf883 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 0c4f08ffa..75354bbf8 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 7ac675396..40d2ce61a 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 42d381600..548b126e9 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 e455a65c5..97b274440 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 2a08c1b4c..cd8b803be 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 531ff032a..4df377ef1 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 a87aedf1f..289ab54a2 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; |