adding in the policy enforcement interceptor which was missing from archiva

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@506786 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/src/main/resources/xwork.xml b/archiva-webapp/src/main/resources/xwork.xml
index 96c9bdb216d0cfb7a85ddccc0017df05de9cd35e..b44a581383630a45c8caa7f1e1cfaf45f2231f2f 100644 (file)
--- a/archiva-webapp/src/main/resources/xwork.xml
+++ b/archiva-webapp/src/main/resources/xwork.xml
@@ -34,12 +34,15 @@
       <interceptor name="pssSecureActions" class="pssSecureActionInterceptor"/>
       <interceptor name="pssAutoLogin" class="pssAutoLoginInterceptor"/>
       <interceptor name="pssEnvironmentChecker" class="pssEnvironmentCheckInterceptor"/>
+      <interceptor name="pssPolicyEnforcement" class="pssPolicyEnforcementInterc
+eptor"/>
 
       <interceptor-stack name="unconfiguredStack">
         <interceptor-ref name="defaultStack"/>
         <interceptor-ref name="pssEnvironmentChecker"/>
         <interceptor-ref name="pssForceAdminUser"/>
         <interceptor-ref name="pssAutoLogin"/>
+        <interceptor-ref name="pssPolicyEnforcement"/>        
         <interceptor-ref name="pssSecureActions"/>
       </interceptor-stack>
 
@@ -48,6 +51,7 @@
         <interceptor-ref name="pssEnvironmentChecker"/>
         <interceptor-ref name="pssForceAdminUser"/>
         <interceptor-ref name="pssAutoLogin"/>
+        <interceptor-ref name="pssPolicyEnforcement"/>
         <interceptor-ref name="pssSecureActions"/>
         <interceptor-ref name="configuration"/>
       </interceptor-stack>
@@ -109,6 +113,10 @@
         <param name="actionName">addadmin</param>
         <param name="namespace">/security</param>
       </result>
+      <result name="security-must-change-password" type="redirect-action">
+        <param name="actionName">password</param>
+        <param name="namespace">/security</param>
+      </result>
 
       <!-- Generic Catchall for those action configurations that forget to
            include a result for 'error' -->