Author: husted
Date: Sun Mar 11 08:51:35 2007
New Revision: 516940
URL: http://svn.apache.org/viewvc?view=rev&rev=516940
Log:
WW-1707 Apply consistent naming for the interceptors in struts-default.xml per
report by Philip Luppens. Update example applications to use new names.
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-chat.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/core/src/main/resources/struts-default.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=516940&r1=516939&r2=516940
==============================================================================
--- 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 08:51:35 2007
@@ -2,22 +2,22 @@
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
"http://struts.apache.org/dtds/struts-2.0.dtd";>
-
+
<struts>
- <package name="chat" extends="struts-default" namespace="/chat">
- <interceptors>
- <interceptor name="chatAuthentication"
-
class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
- <interceptor-stack name="chatAuthenticationStack">
- <interceptor-ref name="createSession" />
- <interceptor-ref name="exception"/>
+ <package name="chat" extends="struts-default" namespace="/chat">
+ <interceptors>
+ <interceptor name="chatAuthentication"
+
class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
+ <interceptor-stack name="chatAuthenticationStack">
+ <interceptor-ref name="createSession" />
+ <interceptor-ref name="exception"/>
<interceptor-ref name="alias"/>
<interceptor-ref name="servlet-config"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
<interceptor-ref name="debugging"/>
- <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="static-params"/>
<interceptor-ref name="params"/>
@@ -29,62 +29,62 @@
<param
name="excludeMethods">input,back,cancel,browse</param>
</interceptor-ref>
<interceptor-ref name="chatAuthentication" />
- </interceptor-stack>
- </interceptors>
-
- <global-results>
- <result name="login"
type="freemarker">/chat/chatLogin.ftl</result>
- </global-results>
-
- <action name="main">
- <interceptor-ref name="chatAuthentication" />
- <result
type="freemarker">/chat/roomSelection.ftl</result>
- </action>
-
- <action name="login" class="chatLoginAction">
- <interceptor-ref name="defaultStack" />
- <result type="redirect">/chat/showRooms.action</result>
- <result name="input"
type="freemarker">/chat/chatLogin.ftl</result>
- </action>
-
- <action name="logout" class="chatLogoutAction">
- <interceptor-ref name="defaultStack" />
- <result type="redirect">/chat/main.action</result>
- </action>
-
- <action name="showRooms">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/roomSelection.ftl</result>
- </action>
-
- <action name="enterRoom" class="enterRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/chat/showRoom.ftl</result>
- </action>
-
- <action name="exitRoom" class="exitRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="redirect">/chat/showRooms.action</result>
- </action>
-
- </package>
-
- <package name="chat-remote" extends="struts-default"
namespace="/chat/ajax">
- <interceptors>
- <interceptor name="chatAuthentication"
-
class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
- <interceptor-stack name="chatAuthenticationStack">
- <interceptor-ref name="createSession" />
- <interceptor-ref name="exception"/>
+ </interceptor-stack>
+ </interceptors>
+
+ <global-results>
+ <result name="login" type="freemarker">/chat/chatLogin.ftl</result>
+ </global-results>
+
+ <action name="main">
+ <interceptor-ref name="chatAuthentication" />
+ <result type="freemarker">/chat/roomSelection.ftl</result>
+ </action>
+
+ <action name="login" class="chatLoginAction">
+ <interceptor-ref name="defaultStack" />
+ <result type="redirect">/chat/showRooms.action</result>
+ <result name="input" type="freemarker">/chat/chatLogin.ftl</result>
+ </action>
+
+ <action name="logout" class="chatLogoutAction">
+ <interceptor-ref name="defaultStack" />
+ <result type="redirect">/chat/main.action</result>
+ </action>
+
+ <action name="showRooms">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/roomSelection.ftl</result>
+ </action>
+
+ <action name="enterRoom" class="enterRoomAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/showRoom.ftl</result>
+ </action>
+
+ <action name="exitRoom" class="exitRoomAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="redirect">/chat/showRooms.action</result>
+ </action>
+
+ </package>
+
+ <package name="chat-remote" extends="struts-default" namespace="/chat/ajax">
+ <interceptors>
+ <interceptor name="chatAuthentication"
+
class="org.apache.struts2.showcase.chat.ChatAuthenticationInterceptor" />
+ <interceptor-stack name="chatAuthenticationStack">
+ <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="model-driven"/>
+ <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">
@@ -94,42 +94,42 @@
<param
name="excludeMethods">input,back,cancel,browse</param>
</interceptor-ref>
<interceptor-ref name="chatAuthentication" />
- </interceptor-stack>
- </interceptors>
-
-
- <action name="usersAvailable" class="usersAvailableAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/usersAvailable.ftl</result>
- </action>
-
- <action name="roomsAvailable" class="roomsAvailableAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/roomsAvailable.ftl</result>
- </action>
-
- <action name="createRoom" class="crudRoomAction"
method="create">
- <interceptor-ref name="chatAuthenticationStack" />
- <result type="freemarker">/chat/createRoom.ftl</result>
- <result name="input"
type="freemarker">/chat/createRoom.ftl</result>
- </action>
-
- <action name="messagesAvailableInRoom"
class="messagesAvailableInRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
- <result name="input"
type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
- </action>
-
- <action name="sendMessageToRoom"
class="sendMessageToRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
- <result name="input"
type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
- </action>
-
- <action name="usersAvailableInRoom"
class="usersAvailableInRoomAction">
- <interceptor-ref name="chatAuthenticationStack" />
- <result
type="freemarker">/chat/usersAvailableInRoom.ftl</result>
- </action>
- </package>
-</struts>
+ </interceptor-stack>
+ </interceptors>
+
+
+ <action name="usersAvailable" class="usersAvailableAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/usersAvailable.ftl</result>
+ </action>
+
+ <action name="roomsAvailable" class="roomsAvailableAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/roomsAvailable.ftl</result>
+ </action>
+
+ <action name="createRoom" class="crudRoomAction" method="create">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/createRoom.ftl</result>
+ <result name="input" type="freemarker">/chat/createRoom.ftl</result>
+ </action>
+
+ <action name="messagesAvailableInRoom"
class="messagesAvailableInRoomAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
+ <result name="input"
type="freemarker">/chat/messagesAvailableInRoom.ftl</result>
+ </action>
+
+ <action name="sendMessageToRoom" class="sendMessageToRoomAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
+ <result name="input"
type="freemarker">/chat/sendMessageToRoomResult.ftl</result>
+ </action>
+
+ <action name="usersAvailableInRoom" class="usersAvailableInRoomAction">
+ <interceptor-ref name="chatAuthenticationStack" />
+ <result type="freemarker">/chat/usersAvailableInRoom.ftl</result>
+ </action>
+ </package>
+</struts>
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml?view=diff&rev=516940&r1=516939&r2=516940
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/resources/struts-integration.xml
Sun Mar 11 08:51:35 2007
@@ -5,45 +5,44 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <package name="integration" extends="struts1-default"
namespace="/integration">
-
- <interceptors>
- <interceptor name="gangsterForm"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
- <param
name="className">org.apache.struts2.showcase.integration.GangsterForm</param>
- <param name="name">gangsterForm</param>
- </interceptor>
- <interceptor name="gangsterValidation"
class="org.apache.struts2.s1.ActionFormValidationInterceptor">
- <param
name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
- </interceptor>
-
- <interceptor-stack name="integration">
- <interceptor-ref name="static-params"/>
- <interceptor-ref name="gangsterForm"/>
- <interceptor-ref name="model-driven"/>
+ <package name="integration" extends="struts1-default"
namespace="/integration">
+
+ <interceptors>
+ <interceptor name="gangsterForm"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor">
+ <param
name="className">org.apache.struts2.showcase.integration.GangsterForm</param>
+ <param name="name">gangsterForm</param>
+ </interceptor>
+ <interceptor name="gangsterValidation"
class="org.apache.struts2.s1.ActionFormValidationInterceptor">
+ <param
name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
+ </interceptor>
+
+ <interceptor-stack name="integration">
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="gangsterForm"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="actionForm-reset"/>
<interceptor-ref name="basicStack"/>
<interceptor-ref name="gangsterValidation"/>
<interceptor-ref name="workflow"/>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="integration" />
- <default-action-ref name="editGangster" />
-
- <!-- Diplay entry page that uses Model-Driven technique -->
- <action name="editGangster"
class="org.apache.struts2.s1.Struts1Action">
- <param
name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
- <result>modelDriven.jsp</result>
- </action>
-
- <!-- Display the result page whose content is populated using
the Model-Driven technique -->
- <action name="saveGangster"
class="org.apache.struts2.s1.Struts1Action">
- <param
name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
- <param name="validate">true</param>
- <result name="input">modelDriven.jsp</result>
- <result>modelDrivenResult.jsp</result>
- </action>
-
- </package>
-</struts>
-
\ No newline at end of file
+ </interceptor-stack>
+ </interceptors>
+
+ <default-interceptor-ref name="integration" />
+ <default-action-ref name="editGangster" />
+
+ <!-- Diplay entry page that uses Model-Driven technique -->
+ <action name="editGangster" class="org.apache.struts2.s1.Struts1Action">
+ <param
name="className">org.apache.struts2.showcase.integration.EditGangsterAction</param>
+ <result>modelDriven.jsp</result>
+ </action>
+
+ <!-- Display the result page whose content is populated using the
Model-Driven technique -->
+ <action name="saveGangster" class="org.apache.struts2.s1.Struts1Action">
+ <param
name="className">org.apache.struts2.showcase.integration.SaveGangsterAction</param>
+ <param name="validate">true</param>
+ <result name="input">modelDriven.jsp</result>
+ <result>modelDrivenResult.jsp</result>
+ </action>
+
+ </package>
+</struts>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml?view=diff&rev=516940&r1=516939&r2=516940
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-token.xml Sun
Mar 11 08:51:35 2007
@@ -39,7 +39,7 @@
<action name="transfer3"
class="org.apache.struts2.showcase.token.TokenAction">
<interceptor-ref name="defaultStack"/>
- <interceptor-ref name="token-session"/>
+ <interceptor-ref name="tokenSession"/>
<result name="invalid.token">doublePost.jsp</result>
<result name="success" type="redirect">transferDone.jsp</result>
</action>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=516940&r1=516939&r2=516940
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Sun Mar 11
08:51:35 2007
@@ -61,7 +61,7 @@
<interceptor-stack name="crudStack">
<interceptor-ref name="checkbox" />
<interceptor-ref name="params" />
- <interceptor-ref name="static-params" />
+ <interceptor-ref name="staticParams" />
<interceptor-ref name="defaultStack" />
</interceptor-stack>
</interceptors>
Modified: struts/struts2/trunk/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/struts-default.xml?view=diff&rev=516940&r1=516939&r2=516940
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sun Mar 11
08:51:35 2007
@@ -5,15 +5,15 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
- <bean type="com.opensymphony.xwork2.ObjectFactory" name="struts"
class="org.apache.struts2.impl.StrutsObjectFactory" />
+ <bean class="com.opensymphony.xwork2.ObjectFactory" name="xwork" />
+ <bean type="com.opensymphony.xwork2.ObjectFactory" name="struts"
class="org.apache.struts2.impl.StrutsObjectFactory" />
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="xwork"
class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts"
class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="xwork"
class="com.opensymphony.xwork2.DefaultActionProxyFactory"/>
+ <bean type="com.opensymphony.xwork2.ActionProxyFactory" name="struts"
class="org.apache.struts2.impl.StrutsActionProxyFactory"/>
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer" name="tiger"
class="com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="notiger"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer" name="struts"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="tiger" class="com.opensymphony.xwork2.util.GenericsObjectTypeDeterminer"/>
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="notiger"
class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
+ <bean type="com.opensymphony.xwork2.util.ObjectTypeDeterminer"
name="struts" class="com.opensymphony.xwork2.util.DefaultObjectTypeDeterminer"/>
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="struts" class="org.apache.struts2.dispatcher.mapper.DefaultActionMapper"
/>
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="composite"
class="org.apache.struts2.dispatcher.mapper.CompositeActionMapper" />
@@ -33,7 +33,7 @@
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="vm" class="org.apache.struts2.components.template.VelocityTemplateEngine"
/>
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
- <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="xwork1"
class="com.opensymphony.xwork2.util.XWorkConverter" />
+ <bean type="com.opensymphony.xwork2.util.XWorkConverter" name="xwork1"
class="com.opensymphony.xwork2.util.XWorkConverter" />
<bean type="com.opensymphony.xwork2.util.XWorkConverter" name="struts"
class="com.opensymphony.xwork2.util.AnnotationXWorkConverter" />
<!-- Only have static injections -->
@@ -67,23 +67,23 @@
<interceptor name="conversionError"
class="org.apache.struts2.interceptor.StrutsConversionErrorInterceptor"/>
<interceptor name="createSession"
class="org.apache.struts2.interceptor.CreateSessionInterceptor" />
<interceptor name="debugging"
class="org.apache.struts2.interceptor.debugging.DebuggingInterceptor" />
- <interceptor name="external-ref"
class="com.opensymphony.xwork2.interceptor.ExternalReferencesInterceptor"/>
+ <interceptor name="externalRef"
class="com.opensymphony.xwork2.interceptor.ExternalReferencesInterceptor"/>
<interceptor name="execAndWait"
class="org.apache.struts2.interceptor.ExecuteAndWaitInterceptor"/>
<interceptor name="exception"
class="com.opensymphony.xwork2.interceptor.ExceptionMappingInterceptor"/>
<interceptor name="fileUpload"
class="org.apache.struts2.interceptor.FileUploadInterceptor"/>
<interceptor name="i18n"
class="com.opensymphony.xwork2.interceptor.I18nInterceptor"/>
<interceptor name="logger"
class="com.opensymphony.xwork2.interceptor.LoggingInterceptor"/>
- <interceptor name="model-driven"
class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
- <interceptor name="scoped-model-driven"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
+ <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="prepare"
class="com.opensymphony.xwork2.interceptor.PrepareInterceptor"/>
- <interceptor name="static-params"
class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="staticParams"
class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
<interceptor name="scope"
class="org.apache.struts2.interceptor.ScopeInterceptor"/>
- <interceptor name="servlet-config"
class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
+ <interceptor name="servletConfig"
class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
<interceptor name="sessionAutowiring"
class="org.apache.struts2.spring.interceptor.SessionContextAutowiringInterceptor"/>
<interceptor name="timer"
class="com.opensymphony.xwork2.interceptor.TimerInterceptor"/>
<interceptor name="token"
class="org.apache.struts2.interceptor.TokenInterceptor"/>
- <interceptor name="token-session"
class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
+ <interceptor name="tokenSession"
class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
<interceptor name="validation"
class="org.apache.struts2.interceptor.validation.AnnotationValidationInterceptor"/>
<interceptor name="workflow"
class="com.opensymphony.xwork2.interceptor.DefaultWorkflowInterceptor"/>
<interceptor name="store"
class="org.apache.struts2.interceptor.MessageStoreInterceptor" />
@@ -94,7 +94,7 @@
<!-- Basic stack -->
<interceptor-stack name="basicStack">
<interceptor-ref name="exception"/>
- <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="checkbox"/>
<interceptor-ref name="params"/>
@@ -116,7 +116,7 @@
<!-- Sample model-driven stack -->
<interceptor-stack name="modelDrivenStack">
- <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="basicStack"/>
</interceptor-stack>
@@ -148,14 +148,14 @@
<interceptor-ref name="exception"/>
<interceptor-ref name="alias"/>
<interceptor-ref name="params"/>
- <interceptor-ref name="servlet-config"/>
+ <interceptor-ref name="servletConfig"/>
<interceptor-ref name="prepare"/>
<interceptor-ref name="i18n"/>
<interceptor-ref name="chain"/>
- <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
- <interceptor-ref name="static-params"/>
+ <interceptor-ref name="staticParams"/>
<interceptor-ref name="params"/>
<interceptor-ref name="conversionError"/>
<interceptor-ref name="validation">
@@ -180,17 +180,17 @@
<interceptor-stack name="defaultStack">
<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="profiling"/>
- <interceptor-ref name="scoped-model-driven"/>
- <interceptor-ref name="model-driven"/>
+ <interceptor-ref name="scopedModelDriven"/>
+ <interceptor-ref name="modelDriven"/>
<interceptor-ref name="fileUpload"/>
<interceptor-ref name="checkbox"/>
- <interceptor-ref name="static-params"/>
+ <interceptor-ref name="staticParams"/>
<interceptor-ref name="params">
<param name="excludeParams">dojo\..*</param>
</interceptor-ref>
