Author: lukaszlenart
Date: Wed Oct 16 09:58:43 2013
New Revision: 1532704
URL: http://svn.apache.org/r1532704
Log:
WW-4222 Removes duplicated unused beans
Modified:
struts/struts2/trunk/core/src/main/resources/struts-default.xml
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?rev=1532704&r1=1532703&r2=1532704&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Wed Oct 16
09:58:43 2013
@@ -21,39 +21,34 @@
* under the License.
*/
-->
+
+<!--
+ When declaring beans in this file you must either use name="struts" or
don't name the bean at all.
+
+ The name="struts" must be used when alias was defined in {@link
org.apache.struts2.config.BeanSelectionProvider} -
+ it is then the default bean's name and {@link
org.apache.struts2.config.BeanSelectionProvider} links name "struts"
+ with "default" (aliasing it)
+
+ If name won't be defined then the "default" value will be used {@link
com.opensymphony.xwork2.inject.Container#DEFAULT_NAME}
+ and {@link com.opensymphony.xwork2.inject.Inject}
+-->
<!DOCTYPE struts PUBLIC
"-//Apache Software Foundation//DTD Struts Configuration 2.3//EN"
"http://struts.apache.org/dtds/struts-2.3.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 type="com.opensymphony.xwork2.factory.ResultFactory" name="xwork"
class="org.apache.struts2.factory.StrutsResultFactory" />
+ <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
<bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts"
class="org.apache.struts2.factory.StrutsResultFactory" />
-
- <bean type="com.opensymphony.xwork2.factory.ActionFactory" name="xwork"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
<bean type="com.opensymphony.xwork2.factory.ActionFactory" name="struts"
class="com.opensymphony.xwork2.factory.DefaultActionFactory" />
-
- <bean type="com.opensymphony.xwork2.factory.ConverterFactory" name="xwork"
class="com.opensymphony.xwork2.factory.DefaultConverterFactory" />
<bean type="com.opensymphony.xwork2.factory.ConverterFactory"
name="struts" class="com.opensymphony.xwork2.factory.DefaultConverterFactory" />
-
- <bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="xwork" class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory"
/>
<bean type="com.opensymphony.xwork2.factory.InterceptorFactory"
name="struts" class="com.opensymphony.xwork2.factory.DefaultInterceptorFactory"
/>
-
- <bean type="com.opensymphony.xwork2.factory.ValidatorFactory" name="xwork"
class="com.opensymphony.xwork2.factory.DefaultValidatorFactory" />
<bean type="com.opensymphony.xwork2.factory.ValidatorFactory"
name="struts" class="com.opensymphony.xwork2.factory.DefaultValidatorFactory" />
<bean type="com.opensymphony.xwork2.FileManager"
class="com.opensymphony.xwork2.util.fs.DefaultFileManager" name="system"
scope="singleton"/>
-
- <bean type="com.opensymphony.xwork2.FileManagerFactory"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory" name="xwork"
scope="singleton"/>
<bean type="com.opensymphony.xwork2.FileManagerFactory"
class="com.opensymphony.xwork2.util.fs.DefaultFileManagerFactory" name="struts"
scope="singleton"/>
- <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.conversion.ObjectTypeDeterminer"
name="tiger"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
- <bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="notiger"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
<bean type="com.opensymphony.xwork2.conversion.ObjectTypeDeterminer"
name="struts"
class="com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer"/>
<bean type="com.opensymphony.xwork2.util.PatternMatcher" name="struts"
class="com.opensymphony.xwork2.util.WildcardHelper" />
@@ -66,8 +61,6 @@
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="restful2"
class="org.apache.struts2.dispatcher.mapper.Restful2ActionMapper" />
<bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="struts"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default"/>
- <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="jakarta"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default" />
- <constant name="struts.multipart.parser" value="jakarta" />
<bean type="org.apache.struts2.views.TagLibrary" name="s"
class="org.apache.struts2.views.DefaultTagLibrary" />
@@ -80,6 +73,7 @@
<bean type="org.apache.struts2.components.template.TemplateEngine"
name="jsp" class="org.apache.struts2.components.template.JspTemplateEngine" />
<bean type="com.opensymphony.xwork2.conversion.impl.XWorkConverter"
name="struts" class="com.opensymphony.xwork2.conversion.impl.XWorkConverter" />
+
<bean
type="com.opensymphony.xwork2.conversion.ConversionPropertiesProcessor"
name="struts"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionPropertiesProcessor"
/>
<bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor"
name="struts"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor"
/>
<bean
type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor"
name="struts"
class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor"
/>
