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-struts2-integration 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311079 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-08 20:16:40 +00:00
parent 78766bc7ee
commit f45b8da121
68 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AbstractSecurityAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AbstractSecurityAction.java
View File

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

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

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AccountAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AccountAction.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/AuditEvent.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/AuditEvent.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/CancellableAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/CancellableAction.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LoginAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LoginAction.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/LogoutAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/LogoutAction.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/PasswordAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/PasswordAction.java
View File

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

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

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/RedbackActionSupport.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/RedbackActionSupport.java
View File

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

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

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/SecurityRedirectAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/SecurityRedirectAction.java
View File

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

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AbstractAdminUserCredentialsAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
/**
* AbstractAdminUserCredentialsAction

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

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,6 +24,7 @@ import org.apache.archiva.redback.configuration.UserConfiguration;
import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.role.RoleManagerException;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.authentication.AuthenticationConstants;
@ -31,7 +32,6 @@ import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationResult;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.policy.AccountLockedException;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AdminConsoleAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AdminConsoleAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,7 +20,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
*/
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

10
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,14 +23,14 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.role.model.ModelApplication;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails;
import org.codehaus.plexus.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.model.ApplicationRoleDetails;
import org.apache.archiva.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
import org.apache.archiva.redback.users.UserManager;
import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRecord.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/BackupRecord.java
View File

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

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/BackupRestoreAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/BackupRestoreAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,10 +22,10 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import com.opensymphony.xwork2.Preparable;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.commons.lang.StringUtils;
import org.apache.archiva.redback.keys.KeyManager;
import org.apache.archiva.redback.management.DataManagementTool;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.integration.interceptor.SecureAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/EditRoleAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/EditRoleAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -26,8 +26,8 @@ import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringEscapeUtils;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/OperationsAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/OperationsAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,7 +23,7 @@ import org.apache.archiva.redback.rbac.Operation;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.apache.archiva.redback.struts2.action.RedbackActionSupport;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/PermissionsAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/PermissionsAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,7 +24,7 @@ import org.apache.archiva.redback.rbac.Permission;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.RedbackActionSupport;
import org.apache.archiva.redback.struts2.action.RedbackActionSupport;
import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ReportAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ReportAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.reports.Report;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/ResourcesAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/ResourcesAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleCreateAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleCreateAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,8 +24,8 @@ import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RoleModelAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RoleModelAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -21,8 +21,8 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.role.model.RedbackRoleModel;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/RolesAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/RolesAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,7 +22,7 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.apache.archiva.redback.integration.role.RoleConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,7 +24,7 @@ import org.apache.archiva.redback.rbac.Resource;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.system.SecuritySystem;
import org.codehaus.plexus.registry.Registry;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserCreateAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserCreateAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,8 +23,8 @@ import java.util.Arrays;
import org.apache.archiva.redback.policy.UserSecurityPolicy;
import org.apache.archiva.redback.rbac.Resource;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,13 +22,13 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.redback.struts2.action.CancellableAction;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.CancellableAction;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.codehaus.plexus.util.StringUtils;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,14 +22,14 @@ package org.codehaus.plexus.redback.struts2.action.admin;
import org.apache.archiva.redback.policy.PasswordEncoder;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.struts2.action.AuditEvent;
import org.apache.archiva.redback.struts2.action.CancellableAction;
import org.apache.archiva.redback.users.User;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.archiva.redback.policy.PasswordRuleViolationException;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.Role;
import org.codehaus.plexus.redback.struts2.action.AuditEvent;
import org.codehaus.plexus.redback.struts2.action.CancellableAction;
import org.apache.archiva.redback.system.DefaultSecuritySession;
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystemConstants;

4
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -24,11 +24,11 @@ import org.apache.archiva.redback.rbac.RbacObjectNotFoundException;
import org.apache.archiva.redback.rbac.Resource;
import org.apache.archiva.redback.rbac.Role;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.apache.archiva.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.users.User;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.struts2.ServletActionContext;
import org.apache.archiva.redback.rbac.RBACManager;
import org.codehaus.plexus.redback.struts2.action.AbstractSecurityAction;
import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.users.UserManager;
import org.apache.archiva.redback.users.UserQuery;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java
View File

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

24
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkActions.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.checks;
package org.apache.archiva.redback.struts2.checks;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -33,17 +33,17 @@ public class ExpectedXworkActions
{
public void validateEnvironment( List<String> violations )
{
String classNames[] = new String[]{"org.codehaus.plexus.redback.struts2.action.admin.UserCreateAction",
"org.codehaus.plexus.redback.struts2.action.admin.UserDeleteAction",
"org.codehaus.plexus.redback.struts2.action.admin.UserEditAction",
"org.codehaus.plexus.redback.struts2.action.admin.UserListAction",
"org.codehaus.plexus.redback.struts2.action.AccountAction",
"org.codehaus.plexus.redback.struts2.action.LoginAction",
"org.codehaus.plexus.redback.struts2.action.LogoutAction",
"org.codehaus.plexus.redback.struts2.action.PasswordAction",
"org.codehaus.plexus.redback.struts2.action.RegisterAction",
"org.codehaus.plexus.redback.struts2.action.admin.AdminConsoleAction",
"org.codehaus.plexus.redback.struts2.action.admin.SystemInfoAction"};
String classNames[] = new String[]{"org.apache.archiva.redback.struts2.action.admin.UserCreateAction",
"org.apache.archiva.redback.struts2.action.admin.UserDeleteAction",
"org.apache.archiva.redback.struts2.action.admin.UserEditAction",
"org.apache.archiva.redback.struts2.action.admin.UserListAction",
"org.apache.archiva.redback.struts2.action.AccountAction",
"org.apache.archiva.redback.struts2.action.LoginAction",
"org.apache.archiva.redback.struts2.action.LogoutAction",
"org.apache.archiva.redback.struts2.action.PasswordAction",
"org.apache.archiva.redback.struts2.action.RegisterAction",
"org.apache.archiva.redback.struts2.action.admin.AdminConsoleAction",
"org.apache.archiva.redback.struts2.action.admin.SystemInfoAction"};
int count = 0;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ActionInvocationTracker.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ActionInvocationTracker.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AutoLoginInterceptor.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java
View File

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

8
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/PolicyEnforcementInterceptor.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.interceptor;
package org.apache.archiva.redback.struts2.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -185,19 +185,19 @@ public class PolicyEnforcementInterceptor
* find a way to get around this interceptor in the particular case I needed to and use
* "One stack to rule them all
*/
if ( "org.codehaus.plexus.redback.struts2.action.PasswordAction".equals( actionInvocation.getAction().getClass().getName() ) )
if ( "org.apache.archiva.redback.struts2.action.PasswordAction".equals( actionInvocation.getAction().getClass().getName() ) )
{
log.debug( "Enforcement: skipping force password check on password action" );
return false;
}
if ( "org.codehaus.plexus.redback.struts2.action.LoginAction".equals( actionInvocation.getAction().getClass().getName() ) )
if ( "org.apache.archiva.redback.struts2.action.LoginAction".equals( actionInvocation.getAction().getClass().getName() ) )
{
log.debug( "Enforcement: skipping force password check on login action" );
return false;
}
if ( "org.codehaus.plexus.redback.struts2.action.LogoutAction".equals( actionInvocation.getAction().getClass().getName() ) )
if ( "org.apache.archiva.redback.struts2.action.LogoutAction".equals( actionInvocation.getAction().getClass().getName() ) )
{
log.debug( "Enforcement: skipping force password check on logout action" );
return false;

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SavedActionInvocation.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SavedActionInvocation.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SimpleActionInvocationTracker.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTracker.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/model/ApplicationRoleDetails.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java
View File

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

6
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/AbstractBackTrackingResult.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/AbstractBackTrackingResult.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.result;
package org.apache.archiva.redback.struts2.result;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -22,9 +22,9 @@ package org.codehaus.plexus.redback.struts2.result;
import java.util.Map;
import java.util.Set;
import org.apache.archiva.redback.struts2.interceptor.SavedActionInvocation;
import org.apache.struts2.dispatcher.ServletActionRedirectResult;
import org.codehaus.plexus.redback.struts2.interceptor.ActionInvocationTracker;
import org.codehaus.plexus.redback.struts2.interceptor.SavedActionInvocation;
import org.apache.archiva.redback.struts2.interceptor.ActionInvocationTracker;
import com.opensymphony.xwork2.ActionInvocation;
@SuppressWarnings("serial")

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/SecurityExternalResult.java → redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/META-INF/spring-context.xml
View File

@ -29,6 +29,6 @@
<context:annotation-config />
<context:component-scan
base-package="org.codehaus.plexus.redback.struts2"/>
base-package="org.apache.archiva.redback.struts2"/>
</beans>

0
redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/org/codehaus/plexus/redback/struts2/action/NewUserAction-validation.xml → redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/org/apache/archiva/redback/struts2/action/NewUserAction-validation.xml
View File

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionContextStub.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionContextStub.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionInvocationStub.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionInvocationStub.java
View File

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

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionProxyStub.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionProxyStub.java
View File

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

3
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/LoginActionTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action;
package org.apache.archiva.redback.struts2.action;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -31,6 +31,7 @@ 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.struts2.action.LoginAction;
import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authentication.AuthenticationDataSource;
import org.apache.archiva.redback.authentication.AuthenticationException;

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

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -25,13 +25,13 @@ import org.apache.archiva.redback.policy.MustChangePasswordException;
import org.apache.archiva.redback.rbac.RBACManager;
import org.apache.archiva.redback.rbac.RbacObjectInvalidException;
import org.apache.archiva.redback.role.RoleManager;
import org.apache.archiva.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.users.UserManager;
import org.apache.struts2.StrutsSpringTestCase;
import org.apache.archiva.redback.authentication.AuthenticationException;
import org.apache.archiva.redback.authentication.PasswordBasedAuthenticationDataSource;
import org.apache.archiva.redback.rbac.RbacManagerException;
import org.apache.archiva.redback.rbac.UserAssignment;
import org.codehaus.plexus.redback.struts2.action.AbstractUserCredentialsAction;
import org.apache.archiva.redback.system.SecuritySession;
import org.apache.archiva.redback.system.SecuritySystem;
import org.apache.archiva.redback.system.SecuritySystemConstants;

6
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -29,8 +29,8 @@ import org.apache.archiva.redback.users.UserNotFoundException;
import org.apache.archiva.redback.authorization.AuthorizationResult;
import org.apache.archiva.redback.policy.AccountLockedException;
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.apache.archiva.redback.struts2.model.ApplicationRoleDetails;
import org.apache.archiva.redback.struts2.model.ApplicationRoleDetails.RoleTableCell;
import org.apache.archiva.redback.integration.interceptor.SecureActionBundle;
import org.apache.archiva.redback.integration.interceptor.SecureActionException;
import org.junit.Before;

5
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.action.admin;
package org.apache.archiva.redback.struts2.action.admin;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,13 +19,12 @@ package org.codehaus.plexus.redback.struts2.action.admin;
* under the License.
*/
import org.apache.archiva.redback.struts2.action.admin.SystemInfoAction;
import org.apache.struts2.StrutsSpringTestCase;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* SystemInfoActionTest

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/UserEditActionTest.java
View File

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

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/interceptor/CustomInterceptorTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.interceptor;
package org.apache.archiva.redback.struts2.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -32,7 +32,7 @@ import javax.inject.Named;
/**
*
* @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
* @version $Id$
* @version $Id: CustomInterceptorTest.java 1310448 2012-04-06 16:23:16Z olamy $
*/
@RunWith( SpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )

2
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/interceptor/MockComponent.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponent.java
View File

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

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/interceptor/MockComponentImpl.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.interceptor;
package org.apache.archiva.redback.struts2.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
/**
* @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
* @version $Id$
* @version $Id: MockComponentImpl.java 1310448 2012-04-06 16:23:16Z olamy $
*/
@Service
public class MockComponentImpl

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/interceptor/MockCustomInterceptor.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockCustomInterceptor.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.interceptor;
package org.apache.archiva.redback.struts2.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -27,7 +27,7 @@ import javax.inject.Inject;
/**
* @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
* @version $Id$
* @version $Id: MockCustomInterceptor.java 1310448 2012-04-06 16:23:16Z olamy $
*/
@Service("testCustomInterceptor")
public class MockCustomInterceptor

8
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.interceptor;
package org.apache.archiva.redback.struts2.interceptor;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,9 +20,9 @@ package org.codehaus.plexus.redback.struts2.interceptor;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.struts2.ActionContextStub;
import org.codehaus.plexus.redback.struts2.ActionInvocationStub;
import org.codehaus.plexus.redback.struts2.ActionProxyStub;
import org.apache.archiva.redback.struts2.ActionContextStub;
import org.apache.archiva.redback.struts2.ActionInvocationStub;
import org.apache.archiva.redback.struts2.ActionProxyStub;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;

20
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/BackTrackingResultTest.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/BackTrackingResultTest.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.result;
package org.apache.archiva.redback.struts2.result;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -20,11 +20,11 @@ package org.codehaus.plexus.redback.struts2.result;
*/
import junit.framework.TestCase;
import org.codehaus.plexus.redback.struts2.ActionContextStub;
import org.codehaus.plexus.redback.struts2.ActionInvocationStub;
import org.codehaus.plexus.redback.struts2.ActionProxyStub;
import org.codehaus.plexus.redback.struts2.interceptor.ActionInvocationTracker;
import org.codehaus.plexus.redback.struts2.interceptor.SimpleActionInvocationTracker;
import org.apache.archiva.redback.struts2.interceptor.ActionInvocationTracker;
import org.apache.archiva.redback.struts2.interceptor.SimpleActionInvocationTracker;
import org.apache.archiva.redback.struts2.ActionContextStub;
import org.apache.archiva.redback.struts2.ActionInvocationStub;
import org.apache.archiva.redback.struts2.ActionProxyStub;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
@ -42,8 +42,8 @@ public class BackTrackingResultTest
protected String getPlexusConfigLocation()
{
return "plexus.xml";
}
}
@Test
public void testBackTrackPrevious()
throws Exception
@ -81,7 +81,7 @@ public class BackTrackingResultTest
actionInvocation1.getInvocationContext().getSession().put( ActionInvocationTracker.SESSION_KEY, tracker );
// before backtrack
Map<String,Object> parametersMap = actionInvocation1.getInvocationContext().getParameters();
Map<String, Object> parametersMap = actionInvocation1.getInvocationContext().getParameters();
assertEquals( ActionProxyStub.ACTION_NAME, backtrackingResult.getActionName() );
assertEquals( ActionProxyStub.METHOD, backtrackingResult.getMethod() );
@ -103,7 +103,7 @@ public class BackTrackingResultTest
}
@SuppressWarnings("unchecked")
@SuppressWarnings( "unchecked" )
public void testBackTrackCurrent()
throws Exception
{

4
redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/SimpleBackTrackingResult.java → redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/SimpleBackTrackingResult.java
View File

@ -1,4 +1,4 @@
package org.codehaus.plexus.redback.struts2.result;
package org.apache.archiva.redback.struts2.result;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@ -19,7 +19,7 @@ package org.codehaus.plexus.redback.struts2.result;
* under the License.
*/
import org.codehaus.plexus.redback.struts2.ActionInvocationStub;
import org.apache.archiva.redback.struts2.ActionInvocationStub;
public class SimpleBackTrackingResult
extends AbstractBackTrackingResult

0
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/config-defaults.properties → redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/config-defaults.properties
View File

0
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.xml → redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.xml
View File

0
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.xml → redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.xml
View File

0
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.xml → redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/action/admin/UserEditActionTest.xml
View File

8
redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/codehaus/plexus/redback/struts2/interceptor/CustomInterceptorTest.xml → redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.xml
View File

@ -28,16 +28,16 @@
<component>
<role>com.opensymphony.xwork2.interceptor.Interceptor</role>
<role-hint>testCustomInterceptor</role-hint>
<implementation>org.codehaus.plexus.redback.struts2.interceptor.MockCustomInterceptor</implementation>
<implementation>org.apache.archiva.redback.struts2.interceptor.MockCustomInterceptor</implementation>
<requirements>
<requirement>
<role>org.codehaus.plexus.redback.struts2.interceptor.MockComponent</role>
<role>org.apache.archiva.redback.struts2.interceptor.MockComponent</role>
</requirement>
</requirements>
</component>
<component>
<role>org.codehaus.plexus.redback.struts2.interceptor.MockComponent</role>
<implementation>org.codehaus.plexus.redback.struts2.interceptor.MockComponentImpl</implementation>
<role>org.apache.archiva.redback.struts2.interceptor.MockComponent</role>
<implementation>org.apache.archiva.redback.struts2.interceptor.MockComponentImpl</implementation>
</component>
<component>
<role>org.codehaus.plexus.jdo.JdoFactory</role>