Author: husted
Date: Sun Mar 11 08:50:48 2007
New Revision: 516937
URL: http://svn.apache.org/viewvc?view=rev&rev=516937
Log:
WW-1707 Apply consistent naming for the interceptors in struts-default.xml per
report by Philip Luppens.
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml?view=diff&rev=516937&r1=516936&r2=516937
==============================================================================
---
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml
(original)
+++
struts/struts2/branches/STRUTS_2_0_X/core/src/main/resources/struts-default.xml
Sun Mar 11 08:50:48 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" />
<bean type="com.opensymphony.xwork2.TextProvider" name="xwork1"
class="com.opensymphony.xwork2.TextProviderSupport" />
<bean type="com.opensymphony.xwork2.TextProvider" name="struts"
class="com.opensymphony.xwork2.TextProviderSupport" />
@@ -69,23 +69,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" />
@@ -150,14 +150,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">
@@ -182,17 +182,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>
@@ -223,6 +223,14 @@
<param name="excludeMethods">input,back,cancel</param>
</interceptor-ref>
</interceptor-stack>
+
+ <!-- Deprecated name forms scheduled for removal in Struts 2.1.0.
The camelCase versions are preferred. See ww-1707 --->
+ <interceptor name="external-ref"
class="com.opensymphony.xwork2.interceptor.ExternalReferencesInterceptor"/>
+ <interceptor name="model-driven"
class="com.opensymphony.xwork2.interceptor.ModelDrivenInterceptor"/>
+ <interceptor name="static-params"
class="com.opensymphony.xwork2.interceptor.StaticParametersInterceptor"/>
+ <interceptor name="scoped-model-driven"
class="com.opensymphony.xwork2.interceptor.ScopedModelDrivenInterceptor"/>
+ <interceptor name="servlet-config"
class="org.apache.struts2.interceptor.ServletConfigInterceptor"/>
+ <interceptor name="token-session"
class="org.apache.struts2.interceptor.TokenSessionStoreInterceptor"/>
</interceptors>
