Author: mrdon
Date: Sat Apr 12 04:48:17 2008
New Revision: 647435
URL: http://svn.apache.org/viewvc?rev=647435&view=rev
Log:
Removing optional from bean loading now that fileupload is required, cleaned up
optional notation for freemarker, also required
WW-2590
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=647435&r1=647434&r2=647435&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Sat Apr 12
04:48:17 2008
@@ -44,12 +44,12 @@
<bean type="org.apache.struts2.dispatcher.mapper.ActionMapper"
name="restful" class="org.apache.struts2.dispatcher.mapper.RestfulActionMapper"
/>
<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" optional="true"/>
- <bean type="org.apache.struts2.dispatcher.multipart.MultiPartRequest"
name="jakarta"
class="org.apache.struts2.dispatcher.multipart.JakartaMultiPartRequest"
scope="default" optional="true" />
+ <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" />
<bean type="org.apache.struts2.views.TagLibrary" name="s"
class="org.apache.struts2.views.DefaultTagLibrary" />
- <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="struts" optional="true"/>
+ <bean class="org.apache.struts2.views.freemarker.FreemarkerManager"
name="struts" />
<bean class="org.apache.struts2.views.velocity.VelocityManager"
name="struts" optional="true" />
<bean class="org.apache.struts2.components.template.TemplateEngineManager"
/>
