From cfcdbe049cb90c2fd3073e33fed9030af576fcfc Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Wed, 30 Aug 2006 18:09:22 +0000
Subject: [PATCH] WW-1308 Disable include of jasperreport and JSF results by
 default. Specify the JSF result in the appropriate package of the showcase
 application.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@438570 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/src/main/resources/struts-jsf.xml | 8 +++++++-
 core/src/main/resources/struts-default.xml      | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/apps/showcase/src/main/resources/struts-jsf.xml b/apps/showcase/src/main/resources/struts-jsf.xml
index eebf09efa..453551f50 100644
--- a/apps/showcase/src/main/resources/struts-jsf.xml
+++ b/apps/showcase/src/main/resources/struts-jsf.xml
@@ -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">
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index c1d55647a..b70dee6f1 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -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>