Author: olamy
Date: Wed Aug 10 15:51:57 2011
New Revision: 1156242
URL: http://svn.apache.org/viewvc?rev=1156242&view=rev
Log:
[MRM-1487] simplify previous fix !
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1156242&r1=1156241&r2=1156242&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Wed Aug 10 15:51:57 2011
@@ -36,8 +36,6 @@
<interceptor name="redbackAutoLogin"
class="redbackAutoLoginInterceptor"/>
<interceptor name="redbackPolicyEnforcement"
class="redbackPolicyEnforcementInterceptor"/>
<interceptor name="paramFilter"
class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/>
- <interceptor name="archivaParams"
class="org.apache.maven.archiva.web.interceptor.ArchivaParametersInterceptor"/>
-
<interceptor-stack name="defaultArchivaStack">
<interceptor-ref name="exception"/>
@@ -54,8 +52,9 @@
<interceptor-ref name="multiselect"/>
<interceptor-ref name="staticParams"/>
<interceptor-ref name="actionMappingParams"/>
- <interceptor-ref name="archivaParams">
+ <interceptor-ref name="params">
<param name="excludeParams">dojo\..*,^struts\..*</param>
+ <param name="acceptParamNames">[a-zA-Z0-9\-\.\]\[\(\)_'\s]+</param>
</interceptor-ref>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
@@ -110,7 +109,7 @@
<interceptor-stack name="configuredPrepareParamsStack">
<!-- <interceptor-ref name="prepare" /> -->
- <interceptor-ref name="archivaParams"/>
+ <interceptor-ref name="params"/>
<interceptor-ref name="configuredArchivaStack"/>
</interceptor-stack>
</interceptors>
