You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2017/10/27 13:36:41 UTC

[struts] branch master updated: WW-4878 Fixes typo and adds missing interceptor

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git


The following commit(s) were added to refs/heads/master by this push:
     new a443937  WW-4878 Fixes typo and adds missing interceptor
a443937 is described below

commit a4439376b806fa73f96f469315d51ad83591b796
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Fri Oct 27 15:35:59 2017 +0200

    WW-4878 Fixes typo and adds missing interceptor
---
 ...ametersInteceptor.java => ActionMappingParametersInterceptor.java} | 2 +-
 core/src/main/resources/struts-default.xml                            | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
similarity index 97%
rename from core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
rename to core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
index 32fa671..967f748 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInteceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/ActionMappingParametersInterceptor.java
@@ -71,7 +71,7 @@ import java.util.Map;
  * <!-- END SNIPPET: example -->
  * </pre>
  */
-public class ActionMappingParametersInteceptor extends ParametersInterceptor {
+public class ActionMappingParametersInterceptor extends ParametersInterceptor {
 
     /**
      * @param ac The action context
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 3c68264..27462a1e 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -221,7 +221,8 @@
             <interceptor name="modelDriven" class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
             <interceptor name="scopedModelDriven" class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
             <interceptor name="params" class="com.opensymphony.xwork2.interceptor.ParametersInterceptor"/>
-            <interceptor name="actionMappingParams" class="org.apache.struts2.interceptor.ActionMappingParametersInteceptor"/>
+            <interceptor name="paramRemover" class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/>
+            <interceptor name="actionMappingParams" class="org.apache.struts2.interceptor.ActionMappingParametersInterceptor"/>
             <interceptor name="prepare" class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
             <interceptor name="staticParams" class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
             <interceptor name="scope" class="org.apache.struts2.interceptor.ScopeInterceptor"/>
@@ -237,6 +238,7 @@
             <interceptor name="profiling" class="org.apache.struts2.interceptor.ProfilingActivationInterceptor" />
             <interceptor name="roles" class="org.apache.struts2.interceptor.RolesInterceptor" />
             <interceptor name="annotationWorkflow" class="com.opensymphony.xwork2.interceptor.annotations.AnnotationWorkflowInterceptor" />
+            <interceptor name="annotationParameterFilter" class="com.opensymphony.xwork2.interceptor.annotations.AnnotationParameterFilterInterceptor" />
             <interceptor name="multiselect" class="org.apache.struts2.interceptor.MultiselectInterceptor" />
             <interceptor name="noop" class="org.apache.struts2.interceptor.NoOpInterceptor" />
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@struts.apache.org" <co...@struts.apache.org>'].