Author: husted
Date: Wed Aug 30 11:09:22 2006
New Revision: 438570
URL: http://svn.apache.org/viewvc?rev=438570&view=rev
Log:
WW-1308 Disable include of jasperreport and JSF results by default. Specify the
JSF result in the appropriate package of the showcase application.
Modified:
struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml?rev=438570&r1=438569&r2=438570&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml Wed
Aug 30 11:09:22 2006
@@ -5,6 +5,11 @@
<include file="struts-default.xml"/>
<package name="jsf" extends="struts-default" namespace="/jsf">
+
+ <result-types>
+ <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
+ </result-types>
+
<interceptors>
<interceptor-stack name="jsfFullStack">
<interceptor-ref name="params" />
@@ -12,8 +17,9 @@
<interceptor-ref name="jsfStack"/>
</interceptor-stack>
</interceptors>
-
+
<default-interceptor-ref name="jsfFullStack"/>
+
</package>
<package name="jsf.employee" extends="jsf" namespace="/jsf/employee">
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=438570&r1=438569&r2=438570&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Wed Aug 30
11:09:22 2006
@@ -19,10 +19,10 @@
<result-type name="xslt"
class="org.apache.struts2.views.xslt.XSLTResult"/>
<result-type name="plaintext"
class="org.apache.struts2.dispatcher.PlainTextResult" />
- <!-- third party integration -->
+ <!-- third party integration
<result-type name="jasper"
class="org.apache.struts2.views.jasperreports.JasperReportsResult"/>
-
<result-type name="jsf" class="org.apache.struts2.jsf.FacesResult"
/>
+ -->
</result-types>
<interceptors>
