Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java Sun Apr 8 16:19:46 2012 @@ -28,9 +28,9 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.EditUserCredentials; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.EditUserCredentials; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller;
Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java Sun Apr 8 16:19:46 2012 @@ -37,9 +37,9 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.util.AutoLoginCookies; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.util.AutoLoginCookies; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java Sun Apr 8 16:19:46 2012 @@ -22,9 +22,9 @@ package org.codehaus.plexus.redback.stru import org.apache.struts2.ServletActionContext; import org.apache.struts2.dispatcher.SessionMap; import org.codehaus.plexus.cache.Cache; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.util.AutoLoginCookies; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.util.AutoLoginCookies; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java Sun Apr 8 16:19:46 2012 @@ -27,8 +27,8 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordResetAction.java Sun Apr 8 16:19:46 2012 @@ -28,9 +28,9 @@ import org.apache.archiva.redback.keys.K import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.users.User; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.mail.Mailer; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.mail.Mailer; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RegisterAction.java Sun Apr 8 16:19:46 2012 @@ -27,10 +27,10 @@ import org.apache.archiva.redback.users. import org.apache.archiva.redback.keys.KeyManagerException; import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.mail.Mailer; -import org.codehaus.redback.integration.model.CreateUserCredentials; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.mail.Mailer; +import org.apache.archiva.redback.integration.model.CreateUserCredentials; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AddAdminUserAction.java Sun Apr 8 16:19:46 2012 @@ -35,10 +35,10 @@ import org.codehaus.plexus.redback.strut import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.EditUserCredentials; -import org.codehaus.redback.integration.util.AutoLoginCookies; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.EditUserCredentials; +import org.apache.archiva.redback.integration.util.AutoLoginCookies; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java Sun Apr 8 16:19:46 2012 @@ -21,9 +21,9 @@ package org.codehaus.plexus.redback.stru import org.apache.archiva.redback.rbac.Resource; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java Sun Apr 8 16:19:46 2012 @@ -33,10 +33,10 @@ import org.codehaus.plexus.redback.strut import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.AdminEditUserCredentials; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.AdminEditUserCredentials; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java Sun Apr 8 16:19:46 2012 @@ -27,10 +27,10 @@ import org.apache.archiva.redback.keys.K import org.apache.archiva.redback.management.DataManagementTool; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; import org.apache.archiva.redback.users.UserManager; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java Sun Apr 8 16:19:46 2012 @@ -31,8 +31,8 @@ import org.codehaus.plexus.redback.strut import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.apache.archiva.redback.integration.security.role.RedbackRoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java Sun Apr 8 16:19:46 2012 @@ -24,10 +24,10 @@ import org.apache.archiva.redback.rbac.R import org.apache.archiva.redback.rbac.RbacManagerException; import org.apache.archiva.redback.rbac.Resource; import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; -import org.codehaus.redback.integration.util.OperationSorter; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.util.OperationSorter; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java Sun Apr 8 16:19:46 2012 @@ -26,10 +26,10 @@ import org.apache.archiva.redback.rbac.R import org.apache.archiva.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; -import org.codehaus.redback.integration.util.PermissionSorter; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.util.PermissionSorter; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java Sun Apr 8 16:19:46 2012 @@ -29,12 +29,12 @@ import javax.servlet.http.HttpServletRes import org.apache.struts2.ServletActionContext; import org.apache.archiva.redback.rbac.Resource; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.reports.Report; -import org.codehaus.redback.integration.reports.ReportException; -import org.codehaus.redback.integration.reports.ReportManager; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.reports.Report; +import org.apache.archiva.redback.integration.reports.ReportException; +import org.apache.archiva.redback.integration.reports.ReportManager; +import org.apache.archiva.redback.integration.role.RoleConstants; import com.opensymphony.module.sitemesh.filter.PageResponseWrapper; import org.springframework.context.annotation.Scope; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java Sun Apr 8 16:19:46 2012 @@ -23,10 +23,10 @@ import org.apache.archiva.redback.rbac.R import org.apache.archiva.redback.rbac.Resource; import org.apache.archiva.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; -import org.codehaus.redback.integration.util.ResourceSorter; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.util.ResourceSorter; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java Sun Apr 8 16:19:46 2012 @@ -27,10 +27,10 @@ import org.apache.archiva.redback.rbac.R import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.SimplePermission; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.SimplePermission; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java Sun Apr 8 16:19:46 2012 @@ -23,9 +23,9 @@ import org.apache.archiva.redback.rbac.R import org.apache.archiva.redback.role.RoleManager; import org.codehaus.plexus.redback.role.model.RedbackRoleModel; import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java Sun Apr 8 16:19:46 2012 @@ -23,9 +23,9 @@ import org.apache.archiva.redback.rbac.R import org.apache.archiva.redback.rbac.Role; import org.apache.archiva.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java Sun Apr 8 16:19:46 2012 @@ -27,9 +27,9 @@ import org.apache.commons.lang.StringUti import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction; import org.apache.archiva.redback.system.SecuritySystem; import org.codehaus.plexus.registry.Registry; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java Sun Apr 8 16:19:46 2012 @@ -27,10 +27,10 @@ import org.codehaus.plexus.redback.strut import org.codehaus.plexus.redback.struts2.action.AuditEvent; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserManager; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.CreateUserCredentials; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.CreateUserCredentials; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java Sun Apr 8 16:19:46 2012 @@ -31,9 +31,9 @@ import org.codehaus.plexus.redback.strut import org.codehaus.plexus.redback.struts2.action.CancellableAction; import org.apache.archiva.redback.users.UserNotFoundException; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java Sun Apr 8 16:19:46 2012 @@ -35,10 +35,10 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.model.AdminEditUserCredentials; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.model.AdminEditUserCredentials; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java Sun Apr 8 16:19:46 2012 @@ -33,11 +33,11 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.users.UserManager; import org.apache.archiva.redback.users.UserQuery; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; -import org.codehaus.redback.integration.reports.Report; -import org.codehaus.redback.integration.reports.ReportManager; -import org.codehaus.redback.integration.role.RoleConstants; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.reports.Report; +import org.apache.archiva.redback.integration.reports.ReportManager; +import org.apache.archiva.redback.integration.role.RoleConstants; import org.extremecomponents.table.context.Context; import org.extremecomponents.table.context.HttpServletRequestContext; import org.extremecomponents.table.limit.FilterSet; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java Sun Apr 8 16:19:46 2012 @@ -23,8 +23,8 @@ import java.util.List; import java.util.Map; import org.codehaus.plexus.util.StringUtils; -import org.codehaus.redback.integration.checks.xwork.XworkActionConfig; -import org.codehaus.redback.integration.checks.xwork.XworkPackageConfig; +import org.apache.archiva.redback.integration.checks.xwork.XworkActionConfig; +import org.apache.archiva.redback.integration.checks.xwork.XworkPackageConfig; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.entities.ActionConfig; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java Sun Apr 8 16:19:46 2012 @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.archiva.redback.system.check.EnvironmentCheck; -import org.codehaus.redback.integration.checks.xwork.XworkPackageConfig; +import org.apache.archiva.redback.integration.checks.xwork.XworkPackageConfig; import com.opensymphony.xwork2.config.Configuration; import com.opensymphony.xwork2.config.ConfigurationManager; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java Sun Apr 8 16:19:46 2012 @@ -33,7 +33,7 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserNotFoundException; -import org.codehaus.redback.integration.util.AutoLoginCookies; +import org.apache.archiva.redback.integration.util.AutoLoginCookies; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java Sun Apr 8 16:19:46 2012 @@ -21,6 +21,7 @@ package org.codehaus.plexus.redback.stru import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; +import org.apache.archiva.redback.integration.checks.security.AdminAutoCreateCheck; import org.apache.archiva.redback.users.User; import org.apache.archiva.redback.users.UserNotFoundException; import org.apache.commons.lang.StringUtils; @@ -33,8 +34,7 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.UserManager; -import org.codehaus.redback.integration.checks.security.AdminAutoCreateCheck; -import org.codehaus.redback.integration.util.AutoLoginCookies; +import org.apache.archiva.redback.integration.util.AutoLoginCookies; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.annotation.Scope; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java Sun Apr 8 16:19:46 2012 @@ -30,9 +30,9 @@ import org.apache.archiva.redback.author import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystem; import org.apache.archiva.redback.system.SecuritySystemConstants; -import org.codehaus.redback.integration.interceptor.SecureAction; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureAction; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Controller; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java Sun Apr 8 16:19:46 2012 @@ -31,8 +31,8 @@ import org.apache.archiva.redback.policy import org.apache.archiva.redback.rbac.RbacManagerException; import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails; import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell; -import org.codehaus.redback.integration.interceptor.SecureActionBundle; -import org.codehaus.redback.integration.interceptor.SecureActionException; +import org.apache.archiva.redback.integration.interceptor.SecureActionBundle; +import org.apache.archiva.redback.integration.interceptor.SecureActionException; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java?rev=1311034&r1=1311033&r2=1311034&view=diff ============================================================================== --- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java (original) +++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java Sun Apr 8 16:19:46 2012 @@ -34,7 +34,7 @@ import org.apache.archiva.redback.system import org.apache.archiva.redback.system.SecuritySession; import org.apache.archiva.redback.system.SecuritySystemConstants; import org.apache.archiva.redback.users.memory.SimpleUser; -import org.codehaus.redback.integration.model.AdminEditUserCredentials; +import org.apache.archiva.redback.integration.model.AdminEditUserCredentials; import org.junit.After; import org.junit.Before; import org.junit.Test;
