svn commit: r1311079 [2/2] - in /archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src: main/java/org/apache/ main/java/org/apache/archiva/ main/java/org/apache/archiva/redback/ main/java/org/apache/arc...

[ol...@apache.org]

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java (from r1311034, 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/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserDeleteAction.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/action/admin/UserDeleteAction.java Sun Apr  8 20:16:40 2012
@@ -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.stru
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java (from r1311034, 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/apache/archiva/redback/struts2/action/admin/UserEditAction.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserEditAction.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditAction.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/action/admin/UserEditAction.java Sun Apr  8 20:16:40 2012
@@ -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.stru
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java (from r1311034, 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/apache/archiva/redback/struts2/action/admin/UserListAction.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/action/admin/UserListAction.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/action/admin/UserListAction.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/action/admin/UserListAction.java Sun Apr  8 20:16:40 2012
@@ -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.R
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java (from r1311034, 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/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/AbstractXworkConfigurationCheck.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/checks/AbstractXworkConfigurationCheck.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkActions.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkActions.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkActions.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkActions.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkActions.java Sun Apr  8 20:16:40 2012
@@ -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;
 

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java (from r1311034, 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/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/checks/ExpectedXworkConfiguration.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/checks/ExpectedXworkConfiguration.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AbstractHttpRequestTrackerInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ActionInvocationTracker.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ActionInvocationTracker.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ActionInvocationTracker.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ActionInvocationTracker.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ActionInvocationTracker.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ActionInvocationTracker.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ActionInvocationTracker.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AutoLoginInterceptor.java (from r1311034, 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/apache/archiva/redback/struts2/interceptor/AutoLoginInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/AutoLoginInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/AutoLoginInterceptor.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/interceptor/AutoLoginInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/EnvironmentCheckInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/EnvironmentCheckInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java (from r1311034, 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/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/ForceAdminUserInterceptor.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/interceptor/ForceAdminUserInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/PolicyEnforcementInterceptor.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/PolicyEnforcementInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/PolicyEnforcementInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/PolicyEnforcementInterceptor.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/PolicyEnforcementInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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 PolicyEnforcementIntercepto
          * 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SavedActionInvocation.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SavedActionInvocation.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SavedActionInvocation.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SavedActionInvocation.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SavedActionInvocation.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SavedActionInvocation.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SavedActionInvocation.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java (from r1311034, 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/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SecureActionInterceptor.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/interceptor/SecureActionInterceptor.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTracker.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SimpleActionInvocationTracker.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTracker.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTracker.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SimpleActionInvocationTracker.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/interceptor/SimpleActionInvocationTracker.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTracker.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/model/ApplicationRoleDetails.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/model/ApplicationRoleDetails.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/model/ApplicationRoleDetails.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/model/ApplicationRoleDetails.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/AbstractBackTrackingResult.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/AbstractBackTrackingResult.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/AbstractBackTrackingResult.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/AbstractBackTrackingResult.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/AbstractBackTrackingResult.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/AbstractBackTrackingResult.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/AbstractBackTrackingResult.java Sun Apr  8 20:16:40 2012
@@ -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.stru
 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")

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/SecurityExternalResult.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/SecurityExternalResult.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/codehaus/plexus/redback/struts2/result/SecurityExternalResult.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/java/org/apache/archiva/redback/struts2/result/SecurityExternalResult.java Sun Apr  8 20:16:40 2012
@@ -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

Modified: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/META-INF/spring-context.xml?rev=1311079&r1=1311078&r2=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/main/resources/META-INF/spring-context.xml Sun Apr  8 20:16:40 2012
@@ -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>
\ No newline at end of file

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionContextStub.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionContextStub.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionContextStub.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionContextStub.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionContextStub.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionContextStub.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionContextStub.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionInvocationStub.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionInvocationStub.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionInvocationStub.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionInvocationStub.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionInvocationStub.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionInvocationStub.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionInvocationStub.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionProxyStub.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionProxyStub.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionProxyStub.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionProxyStub.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionProxyStub.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/ActionProxyStub.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/ActionProxyStub.java Sun Apr  8 20:16:40 2012
@@ -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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/LoginActionTest.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/LoginActionTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/LoginActionTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/LoginActionTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/LoginActionTest.java Sun Apr  8 20:16:40 2012
@@ -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
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AbstractUserCredentialsActionTest.java Sun Apr  8 20:16:40 2012
@@ -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
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.java (from r1311034, 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/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/AssignmentsActionTest.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/action/admin/AssignmentsActionTest.java Sun Apr  8 20:16:40 2012
@@ -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.
 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;

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/SystemInfoActionTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/SystemInfoActionTest.java Sun Apr  8 20:16:40 2012
@@ -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.stru
  * 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

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/UserEditActionTest.java (from r1311034, 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/apache/archiva/redback/struts2/action/admin/UserEditActionTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/action/admin/UserEditActionTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/action/admin/UserEditActionTest.java&r1=1311034&r2=1311079&rev=1311079&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/apache/archiva/redback/struts2/action/admin/UserEditActionTest.java Sun Apr  8 20:16:40 2012
@@ -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

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.java Sun Apr  8 20:16:40 2012
@@ -0,0 +1,56 @@
+package org.apache.archiva.redback.struts2.interceptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+
+/**
+ *
+ * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
+ * @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" } )
+public class CustomInterceptorTest
+    extends TestCase
+{
+
+    @Inject @Named(value = "testCustomInterceptor")
+    MockCustomInterceptor component;
+
+    /**
+     *
+     * @throws Exception on errors
+     */
+    @Test
+    public void testLookup()
+        throws Exception
+    {
+        assertNotNull( component );
+    }
+}

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponent.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponent.java?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponent.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponent.java Sun Apr  8 20:16:40 2012
@@ -0,0 +1,30 @@
+package org.apache.archiva.redback.struts2.interceptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
+ */
+public interface MockComponent
+{
+    String ROLE = MockComponent.class.getName();
+
+    void displayResult( String result );
+}

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockComponentImpl.java Sun Apr  8 20:16:40 2012
@@ -0,0 +1,46 @@
+package org.apache.archiva.redback.struts2.interceptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.springframework.stereotype.Service;
+
+/**
+ * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
+ * @version $Id: MockComponentImpl.java 1310448 2012-04-06 16:23:16Z olamy $
+ */
+@Service
+public class MockComponentImpl
+    implements MockComponent
+{
+    private String result;
+
+    /* (non-Javadoc)
+    * @see org.codehaus.plexus.xwork.interceptor.TestComponent#execute()
+    */
+    public void displayResult( String result )
+    {
+        this.result = result;
+    }
+
+    public String getResult()
+    {
+        return result;
+    }
+}

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockCustomInterceptor.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockCustomInterceptor.java?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockCustomInterceptor.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/MockCustomInterceptor.java Sun Apr  8 20:16:40 2012
@@ -0,0 +1,91 @@
+package org.apache.archiva.redback.struts2.interceptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
+import org.springframework.stereotype.Service;
+
+import javax.inject.Inject;
+
+/**
+ * @author <a href='mailto:rahul.thakur.xdev@gmail.com'>Rahul Thakur</a>
+ * @version $Id: MockCustomInterceptor.java 1310448 2012-04-06 16:23:16Z olamy $
+ */
+@Service("testCustomInterceptor")
+public class MockCustomInterceptor
+    implements Interceptor
+{
+    /**
+     *
+     */
+    @Inject
+    private MockComponent testComponent;
+
+    public MockCustomInterceptor()
+    {
+    }
+
+    public MockCustomInterceptor( MockComponent testComponent )
+    {
+        this.testComponent = testComponent;
+    }
+
+    /* (non-Javadoc)
+     * @see com.opensymphony.xwork2.interceptor.Interceptor#destroy()
+     */
+    public void destroy()
+    {
+        // do nothing
+    }
+
+    /* (non-Javadoc)
+     * @see com.opensymphony.xwork2.interceptor.Interceptor#init()
+     */
+    public void init()
+    {
+        // do nothing
+    }
+
+    /**
+     * @noinspection ProhibitedExceptionDeclared
+     */
+    public String intercept( ActionInvocation invocation )
+        throws Exception
+    {
+        String result = "Hello Custom Interceptor";
+
+        testComponent.displayResult( result );
+
+        return result;
+    }
+
+    public MockComponent getTestComponent()
+    {
+        return testComponent;
+    }
+
+    // Introduce a Composition Exception , see PLX - 278 
+    //    public void setTestComponent( MockComponent testComponent )
+    //    {
+    //        this.testComponent = testComponent;
+    //    }
+
+}

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/interceptor/SimpleActionInvocationTrackerTest.java Sun Apr  8 20:16:40 2012
@@ -0,0 +1,135 @@
+package org.apache.archiva.redback.struts2.interceptor;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+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;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.Map;
+
+@RunWith( SpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" } )
+public class SimpleActionInvocationTrackerTest
+    extends TestCase
+{
+    private static final int HISTORY_SIZE = 2;
+
+    private ActionInvocationTracker tracker;
+
+    
+    
+
+    protected String getPlexusConfigLocation()
+    {
+        return "plexus.xml";
+    }
+
+    @Before
+    public void setUp()
+        throws Exception
+    {
+        super.setUp();
+        tracker = new SimpleActionInvocationTracker();
+    }
+
+    @Test
+    public void testAddActionInvocation()
+        throws Exception
+    {
+        tracker.setHistorySize( HISTORY_SIZE );
+
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        assertEquals( 1, tracker.getHistoryCount() );
+
+        // first entry int the stack
+        SavedActionInvocation actionInvocation = tracker.getActionInvocationAt( 0 );
+        Map<String,Object> parametersMap = actionInvocation.getParametersMap();
+
+        assertEquals( ActionProxyStub.ACTION_NAME, actionInvocation.getActionName() );
+        assertEquals( ActionProxyStub.METHOD, actionInvocation.getMethodName() );
+        assertEquals( ActionContextStub.VALUE_1, parametersMap.get( ActionContextStub.PARAMETER_1 ) );
+        assertEquals( ActionContextStub.VALUE_2, parametersMap.get( ActionContextStub.PARAMETER_2 ) );
+        assertEquals( ActionContextStub.VALUE_3, parametersMap.get( ActionContextStub.PARAMETER_3 ) );
+
+        ActionInvocationStub actionInvocationStub = new ActionInvocationStub();
+
+        ActionProxyStub proxyStub = (ActionProxyStub) actionInvocationStub.getProxy();
+        proxyStub.setActionName( "new_action" );
+        proxyStub.setMethod( "new_method" );
+
+        ActionContextStub actionContextStub = (ActionContextStub) actionInvocationStub.getInvocationContext();
+        actionContextStub.getParameters().put( "new_parameter", "new_value" );
+
+        tracker.addActionInvocation( actionInvocationStub );
+        assertEquals( tracker.getHistoryCount(), HISTORY_SIZE );
+
+        // second entry in the stack
+        actionInvocation = tracker.getActionInvocationAt( 1 );
+        parametersMap = actionInvocation.getParametersMap();
+
+        assertEquals( "new_action", actionInvocation.getActionName() );
+        assertEquals( "new_method", actionInvocation.getMethodName() );
+        assertEquals( ActionContextStub.VALUE_1, parametersMap.get( ActionContextStub.PARAMETER_1 ) );
+        assertEquals( ActionContextStub.VALUE_2, parametersMap.get( ActionContextStub.PARAMETER_2 ) );
+        assertEquals( ActionContextStub.VALUE_3, parametersMap.get( ActionContextStub.PARAMETER_3 ) );
+        assertEquals( "new_value", parametersMap.get( "new_parameter" ) );
+
+        // first entry int the stack
+        actionInvocation = tracker.getActionInvocationAt( 0 );
+        parametersMap = actionInvocation.getParametersMap();
+
+        assertEquals( ActionProxyStub.ACTION_NAME, actionInvocation.getActionName() );
+        assertEquals( ActionProxyStub.METHOD, actionInvocation.getMethodName() );
+        assertEquals( ActionContextStub.VALUE_1, parametersMap.get( ActionContextStub.PARAMETER_1 ) );
+        assertEquals( ActionContextStub.VALUE_2, parametersMap.get( ActionContextStub.PARAMETER_2 ) );
+        assertEquals( ActionContextStub.VALUE_3, parametersMap.get( ActionContextStub.PARAMETER_3 ) );
+    }
+
+    @Test
+    public void testHistoryCounter()
+        throws Exception
+    {
+        tracker.setHistorySize( HISTORY_SIZE );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        assertEquals( 1, tracker.getHistoryCount() );
+
+        tracker.setHistorySize( HISTORY_SIZE );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        assertEquals( HISTORY_SIZE, tracker.getHistoryCount() );
+
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        assertEquals( HISTORY_SIZE, tracker.getHistoryCount() );
+
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        tracker.addActionInvocation( new ActionInvocationStub() );
+        assertEquals( HISTORY_SIZE, tracker.getHistoryCount() );
+    }
+
+}

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/BackTrackingResultTest.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/BackTrackingResultTest.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/BackTrackingResultTest.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/BackTrackingResultTest.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/BackTrackingResultTest.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/BackTrackingResultTest.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/BackTrackingResultTest.java Sun Apr  8 20:16:40 2012
@@ -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.stru
  */
 
 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
     {

Copied: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/SimpleBackTrackingResult.java (from r1311032, archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/SimpleBackTrackingResult.java)
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/SimpleBackTrackingResult.java?p2=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/SimpleBackTrackingResult.java&p1=archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/SimpleBackTrackingResult.java&r1=1311032&r2=1311079&rev=1311079&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/codehaus/plexus/redback/struts2/result/SimpleBackTrackingResult.java (original)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/java/org/apache/archiva/redback/struts2/result/SimpleBackTrackingResult.java Sun Apr  8 20:16:40 2012
@@ -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.stru
  * under the License.
  */
 
-import org.codehaus.plexus.redback.struts2.ActionInvocationStub;
+import org.apache.archiva.redback.struts2.ActionInvocationStub;
 
 public class SimpleBackTrackingResult
     extends AbstractBackTrackingResult

Added: archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.xml
URL: http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.xml?rev=1311079&view=auto
==============================================================================
--- archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.xml (added)
+++ archiva/redback/redback-core/trunk/redback-integrations/redback-struts2/redback-struts2-integration/src/test/resources/org/apache/archiva/redback/struts2/interceptor/CustomInterceptorTest.xml Sun Apr  8 20:16:40 2012
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~  http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<component-set>
+  <components>
+    <component>
+      <role>com.opensymphony.xwork2.Action</role>
+      <role-hint>testAction</role-hint>
+      <implementation>org.codehaus.plexus.redback.struts2.action.TestPlexusAction</implementation>
+    </component>
+    <component>
+      <role>com.opensymphony.xwork2.interceptor.Interceptor</role>
+      <role-hint>testCustomInterceptor</role-hint>
+      <implementation>org.apache.archiva.redback.struts2.interceptor.MockCustomInterceptor</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.archiva.redback.struts2.interceptor.MockComponent</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <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>
+      <role-hint>users</role-hint>
+      <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+      <configuration>
+        <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+        <driverName>org.hsqldb.jdbcDriver</driverName>
+        <url>jdbc:hsqldb:mem:MailGeneratorTest</url>
+        <userName>sa</userName>
+        <otherProperties>
+          <property>
+            <name>org.jpox.rdbms.dateTimezone</name>
+            <value>JDK_DEFAULT_TIMEZONE</value>
+          </property>
+          
+        </otherProperties>
+      </configuration>
+    </component>      
+  </components>
+</component-set>