Author: husted
Date: Sun Mar 11 21:46:27 2007
New Revision: 517096
URL: http://svn.apache.org/viewvc?view=rev&rev=517096
Log:
WW-1707 Apply consistent naming for the interceptors in struts-default.xml
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml?view=diff&rev=517096&r1=517095&r2=517096
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml Sun
Mar 11 21:46:27 2007
@@ -12,14 +12,14 @@
<interceptor-ref name="createSession" />
<interceptor-ref name="exception"/>
<interceptor-ref name="alias"/>
- <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
<interceptor-ref name="debugging"/>
<interceptor-ref name="modelDriven"/>
<interceptor-ref name="fileUpload"/>
- <interceptor-ref name="static-params"/>
+ <interceptor-ref name="staticParams"/>
<interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
Modified:
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml?view=diff&rev=517096&r1=517095&r2=517096
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
Sun Mar 11 21:46:27 2007
@@ -3,7 +3,7 @@
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd";>
-
+
<struts>
<package name="struts1-default" extends="struts-default">
@@ -11,19 +11,19 @@
<interceptor name="actionForm-reset"
class="org.apache.struts2.s1.ActionFormResetInterceptor"/>
<interceptor name="actionForm-validation"
class="org.apache.struts2.s1.ActionFormValidationInterceptor"/>
<interceptor name="actionForm-commonsValidation"
class="org.apache.struts2.s1.ActionFormValidationInterceptor">
- <param
name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
+ <param
name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
</interceptor>
<interceptor-stack name="struts1Stack">
- <interceptor-ref name="static-params"/>
- <interceptor-ref name="scoped-model-driven"/>
- <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="scopedModelDriven"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="actionForm-reset"/>
<interceptor-ref name="basicStack"/>
<interceptor-ref name="actionForm-validation"/>
<interceptor-ref name="workflow"/>
- </interceptor-stack>
+ </interceptor-stack>
</interceptors>
-
+
<default-interceptor-ref name="struts1Stack"/>
</package>
