1 files changed, 47 insertions, 44 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
index f4a003cb4..11cba8223 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
@@ -22,6 +22,9 @@
     "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
+
+  <constant name="struts.action.extension" value="action" />
+  
   <!-- Include plexus-security xwork configurations. -->
   <include file="struts-security.xml"/>
 
@@ -89,43 +92,43 @@
     <global-results>
       <!-- The following security-* result names arrive from the plexus-security package -->
 
-      <result name="security-login-success" type="redirect-action">index</result>
-      <result name="security-login-cancel" type="redirect-action">index</result>
-      <result name="security-login-locked" type="redirect-action">
+      <result name="security-login-success" type="redirectAction">index</result>
+      <result name="security-login-cancel" type="redirectAction">index</result>
+      <result name="security-login-locked" type="redirectAction">
         <param name="actionName">index</param>
         <param name="infoMessage">Account Locked</param>
       </result>
-      <result name="security-logout" type="redirect-action">index</result>
-      <result name="requires-authentication" type="redirect-action">
+      <result name="security-logout" type="redirectAction">index</result>
+      <result name="requires-authentication" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="requires-authorization" type="redirect-action">
+      <result name="requires-authorization" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-register-success" type="redirect-action">
+      <result name="security-register-success" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-register-cancel" type="redirect-action">
+      <result name="security-register-cancel" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-account-success" type="redirect-action">index</result>
-      <result name="security-account-cancel" type="redirect-action">
+      <result name="security-account-success" type="redirectAction">index</result>
+      <result name="security-account-cancel" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-admin-user-created" type="redirect-action">
+      <result name="security-admin-user-created" type="redirectAction">
         <param name="actionName">login</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-admin-user-needed" type="redirect-action">
+      <result name="security-admin-user-needed" type="redirectAction">
         <param name="actionName">addadmin</param>
         <param name="namespace">/security</param>
       </result>
-      <result name="security-must-change-password" type="redirect-action">
+      <result name="security-must-change-password" type="redirectAction">
         <param name="actionName">password</param>
         <param name="namespace">/security</param>
       </result>
@@ -146,7 +149,7 @@
          allowing plexus-security to call out from its own set of actions
          into the application webapp, using global result names. -->
     <action name="redbackRedirect" class="redback-redirect" method="redirect">
-      <result type="redirect-action">browse</result>
+      <result type="redirectAction">browse</result>
     </action>
 
     <action name="index" class="searchAction" method="input">
@@ -271,7 +274,7 @@
     <action name="addRepositoryGroup" class="repositoryGroupsAction" method="addRepositoryGroup">
       <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -287,7 +290,7 @@
     <action name="deleteRepositoryGroup" class="deleteRepositoryGroupAction" method="delete">
       <result name="input">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/deleteRepositoryGroup.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -296,28 +299,28 @@
     <action name="addRepositoryToGroup" class="repositoryGroupsAction" method="addRepositoryToGroup">
       <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="removeRepositoryFromGroup" class="repositoryGroupsAction" method="removeRepositoryFromGroup">
       <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="sortDownRepositoryFromGroup" class="sortRepositoriesAction" method="sortDown">
       <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="sortUpRepositoryFromGroup" class="sortRepositoriesAction" method="sortUp">
       <result name="input">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/repositoryGroups.jsp</result>
-      <result name="success" type="redirect-action">repositoryGroups</result>
+      <result name="success" type="redirectAction">repositoryGroups</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
@@ -325,25 +328,25 @@
 
     <action name="repositories" class="repositoriesAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/repositories.jsp</result>
-      <result name="confirm" type="redirect-action">deleteRepository</result>
+      <result name="confirm" type="redirectAction">deleteRepository</result>
     </action>
 
     <action name="indexRepository" class="schedulerAction" method="scanRepository">
-      <result type="redirect-action">repositories</result>
+      <result type="redirectAction">repositories</result>
     </action>
 
     <action name="addRepository" class="addManagedRepositoryAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/addRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/addRepository.jsp</result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="editRepository" class="editManagedRepositoryAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/editRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/editRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <result name="confirm">/WEB-INF/jsp/admin/confirmAddRepository.jsp</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
@@ -358,7 +361,7 @@
     <action name="deleteRepository" class="deleteManagedRepositoryAction" method="delete">
       <result name="input">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/deleteRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -367,14 +370,14 @@
     <action name="addRemoteRepository" class="addRemoteRepositoryAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/addRemoteRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="editRemoteRepository" class="editRemoteRepositoryAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/editRemoteRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
@@ -393,7 +396,7 @@
     <action name="deleteRemoteRepository" class="deleteRemoteRepositoryAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/deleteRemoteRepository.jsp</result>
-      <result name="success" type="redirect-action">repositories</result>
+      <result name="success" type="redirectAction">repositories</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
@@ -405,31 +408,31 @@
 
     <action name="addProxyConnector" class="addProxyConnectorAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/addProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="editProxyConnector" class="editProxyConnectorAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="sortUpProxyConnector" class="sortProxyConnectorsAction" method="sortUp">
       <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="sortDownProxyConnector" class="sortProxyConnectorsAction" method="sortDown">
       <result name="input">/WEB-INF/jsp/admin/editProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="deleteProxyConnector" class="deleteProxyConnectorAction" method="confirm">
       <result name="input">/WEB-INF/jsp/admin/deleteProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -437,13 +440,13 @@
 
     <action name="enableProxyConnector" class="enableProxyConnectorAction" method="confirm">
       <result name="input">/WEB-INF/jsp/admin/enableProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="disableProxyConnector" class="disableProxyConnectorAction" method="confirm">
       <result name="input">/WEB-INF/jsp/admin/disableProxyConnector.jsp</result>
-      <result name="success" type="redirect-action">proxyConnectors</result>
+      <result name="success" type="redirectAction">proxyConnectors</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>  
       </interceptor-ref>
@@ -458,19 +461,19 @@
 
     <action name="addNetworkProxy" class="configureNetworkProxyAction" method="add">
       <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
-      <result name="success" type="redirect-action">networkProxies</result>
+      <result name="success" type="redirectAction">networkProxies</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="editNetworkProxy" class="configureNetworkProxyAction" method="edit">
       <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
-      <result name="success" type="redirect-action">networkProxies</result>
+      <result name="success" type="redirectAction">networkProxies</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="saveNetworkProxy" class="configureNetworkProxyAction" method="save">
       <result name="input">/WEB-INF/jsp/admin/editNetworkProxy.jsp</result>
-      <result name="success" type="redirect-action">networkProxies</result>
+      <result name="success" type="redirectAction">networkProxies</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -478,7 +481,7 @@
 
     <action name="deleteNetworkProxy" class="configureNetworkProxyAction" method="confirm">
       <result name="input">/WEB-INF/jsp/admin/deleteNetworkProxy.jsp</result>
-      <result name="success" type="redirect-action">networkProxies</result>
+      <result name="success" type="redirectAction">networkProxies</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>
@@ -488,7 +491,7 @@
 
     <action name="repositoryScanning" class="repositoryScanningAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/repositoryScanning.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">repositoryScanning</param>
       </result>
       <interceptor-ref name="configuredArchivaStack">
@@ -508,7 +511,7 @@
 
     <action name="saveAppearance" class="editOrganisationInfo">
       <result name="input">/WEB-INF/jsp/admin/editAppearance.jsp</result>
-      <result type="redirect-action">
+      <result type="redirectAction">
         <param name="actionName">configureAppearance</param>
         <param name="namespace">/admin</param>
       </result>
@@ -522,7 +525,7 @@
 
     <action name="legacyArtifactPath" class="legacyArtifactPathAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
-      <result name="success" type="redirect-action">
+      <result name="success" type="redirectAction">
         <param name="actionName">legacyArtifactPath</param>
       </result>
     </action>
@@ -530,14 +533,14 @@
     <action name="addLegacyArtifactPath" class="addLegacyArtifactPathAction" method="input">
       <result name="input">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/addLegacyArtifactPath.jsp</result>
-      <result name="success" type="redirect-action">legacyArtifactPath</result>
+      <result name="success" type="redirectAction">legacyArtifactPath</result>
       <interceptor-ref name="configuredPrepareParamsStack"/>
     </action>
 
     <action name="deleteLegacyArtifactPath" class="deleteLegacyArtifactPathAction" method="delete">
       <result name="input">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
       <result name="error">/WEB-INF/jsp/admin/legacyArtifactPath.jsp</result>
-      <result name="success" type="redirect-action">legacyArtifactPath</result>
+      <result name="success" type="redirectAction">legacyArtifactPath</result>
       <interceptor-ref name="configuredPrepareParamsStack">
         <param name="tokenSession.includeMethods">*</param>
       </interceptor-ref>