diff options
Diffstat (limited to 'redback-integrations/redback-struts2/redback-struts2-integration')
8 files changed, 16 insertions, 16 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 4d1be692a..ccf43e893 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 @@ -19,6 +19,7 @@ package org.codehaus.plexus.redback.struts2.action; * under the License. */ +import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.users.User; import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.authentication.AuthenticationConstants; @@ -28,9 +29,8 @@ import org.apache.archiva.redback.authentication.AuthenticationResult; import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource; import org.apache.archiva.redback.authentication.TokenBasedAuthenticationDataSource; import org.apache.archiva.redback.configuration.UserConfiguration; -import org.codehaus.plexus.redback.keys.AuthenticationKey; -import org.codehaus.plexus.redback.keys.KeyManagerException; -import org.codehaus.plexus.redback.keys.KeyNotFoundException; +import org.apache.archiva.redback.keys.KeyManagerException; +import org.apache.archiva.redback.keys.KeyNotFoundException; import org.codehaus.plexus.redback.policy.AccountLockedException; import org.codehaus.plexus.redback.policy.MustChangePasswordException; import org.codehaus.plexus.redback.system.SecuritySession; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java index e450e3ac8..81235f95c 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java @@ -19,11 +19,11 @@ package org.codehaus.plexus.redback.struts2.action; * under the License. */ +import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.plexus.redback.keys.AuthenticationKey; -import org.codehaus.plexus.redback.keys.KeyManager; -import org.codehaus.plexus.redback.keys.KeyManagerException; +import org.apache.archiva.redback.keys.AuthenticationKey; +import org.apache.archiva.redback.keys.KeyManagerException; import org.codehaus.plexus.redback.policy.UserSecurityPolicy; import org.codehaus.plexus.redback.system.SecuritySystem; import org.apache.archiva.redback.users.User; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java index 414997658..f5873e128 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java @@ -19,9 +19,9 @@ package org.codehaus.plexus.redback.struts2.action; * under the License. */ +import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.archiva.redback.users.User; -import org.codehaus.plexus.redback.keys.AuthenticationKey; -import org.codehaus.plexus.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.RoleManagerException; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java index 04fbaa7f0..871da592f 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java @@ -21,7 +21,7 @@ package org.codehaus.plexus.redback.struts2.action.admin; import com.opensymphony.xwork2.Preparable; import org.apache.commons.lang.StringUtils; -import org.codehaus.plexus.redback.keys.KeyManager; +import org.apache.archiva.redback.keys.KeyManager; import org.apache.archiva.redback.management.DataManagementTool; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.rbac.Resource; 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 40d2ce61a..3677c7e6a 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 @@ -22,11 +22,11 @@ package org.codehaus.plexus.redback.struts2.interceptor; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; +import org.apache.archiva.redback.keys.AuthenticationKey; import org.apache.struts2.ServletActionContext; 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; import org.codehaus.plexus.redback.system.SecuritySession; diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml index 79fb9a89d..1705a1fc1 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml @@ -87,13 +87,13 @@ </requirements> </component> <component> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>cached</role-hint> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <description>CachedKeyManager</description> <requirements> <requirement> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>memory</role-hint> <field-name>keyImpl</field-name> </requirement> diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml index 79fb9a89d..1705a1fc1 100644 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml @@ -87,13 +87,13 @@ </requirements> </component> <component> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>cached</role-hint> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <description>CachedKeyManager</description> <requirements> <requirement> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>memory</role-hint> <field-name>keyImpl</field-name> </requirement> diff --git a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml index 62e3d199b..aa9e46143 100755 --- a/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml +++ b/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/spring-context.xml @@ -122,13 +122,13 @@ </bean> <!-- <component> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>cached</role-hint> <implementation>org.codehaus.plexus.redback.keys.cached.CachedKeyManager</implementation> <description>CachedKeyManager</description> <requirements> <requirement> - <role>org.codehaus.plexus.redback.keys.KeyManager</role> + <role>org.apache.archiva.redback.keys.KeyManager</role> <role-hint>memory</role-hint> <field-name>keyImpl</field-name> </requirement> |