From 668889190ea1abb143d9374590938ea249514095 Mon Sep 17 00:00:00 2001
From: Jason Carreira <jcarreira@apache.org>
Date: Sun, 28 May 2006 22:59:31 +0000
Subject: [PATCH] Moved JSF configurations into a separate config file so if
 you don't use / have JSF libraries it won't break

git-svn-id: https://svn.apache.org/repos/asf/struts/action2/trunk@410002 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/webapp/WEB-INF/classes/xwork-jsf.xml |  3 +-
 core/src/main/resources/struts-default.xml    | 21 +-------------
 core/src/main/resources/struts-jsf.xml        | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 core/src/main/resources/struts-jsf.xml

diff --git a/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
index ea520e441..57eee85e5 100644
--- a/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
+++ b/apps/showcase/src/main/webapp/WEB-INF/classes/xwork-jsf.xml
@@ -1,8 +1,9 @@
 <!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
 <xwork>
     <include file="struts-default.xml"/>
+    <include file="struts-jsf.xml"/>
 
-    <package name="jsf" extends="struts-default" namespace="/jsf">
+    <package name="jsf" extends="struts-default, struts-jsf" namespace="/jsf">
 		
         <action name="index" class="org.apache.struts.action2.showcase.jsf.IndexAction">
             <interceptor-ref name="jsfStack"/>
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 02385ccbf..6ee124142 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -13,8 +13,7 @@
             <result-type name="velocity" class="org.apache.struts.action2.dispatcher.VelocityResult"/>
             <result-type name="xslt" class="org.apache.struts.action2.views.xslt.XSLTResult"/>
             <result-type name="plaintext" class="org.apache.struts.action2.dispatcher.PlainTextResult" />
-			<result-type name="jsf" class="org.apache.struts.action2.jsf.FacesResult" />
-            
+
             <!-- third party integration -->
             <result-type name="jasper" class="org.apache.struts.action2.views.jasperreports.JasperReportsResult"/>
         </result-types>
@@ -46,14 +45,6 @@
             <interceptor name="validation" class="com.opensymphony.xwork.validator.ValidationInterceptor"/>
             <interceptor name="workflow" class="com.opensymphony.xwork.interceptor.DefaultWorkflowInterceptor"/>
 			
-			<!-- JSF interceptors, one per lifecycle phase -->
-			<interceptor class="org.apache.struts.action2.jsf.FacesSetupInterceptor" name="jsfSetup" />
-			<interceptor class="org.apache.struts.action2.jsf.RestoreViewInterceptor" name="jsfRestore" />
-			<interceptor class="org.apache.struts.action2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
-			<interceptor class="org.apache.struts.action2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
-			<interceptor class="org.apache.struts.action2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
-			<interceptor class="org.apache.struts.action2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
-
             <!-- Basic stack -->
             <interceptor-stack name="basicStack">
                 <interceptor-ref name="exception"/>
@@ -185,16 +176,6 @@
                 <interceptor-ref name="execAndWait">
                     <param name="excludeMethods">input,back,cancel</param>
                 </interceptor-ref>
-            </interceptor-stack>
-			
-			<!-- Sample JSF stack, can be combined with other stacks easily -->
-			<interceptor-stack name="jsfStack">
-                <interceptor-ref name="jsfSetup" />
-				<interceptor-ref name="jsfRestore" />
-				<interceptor-ref name="jsfApply" />
-				<interceptor-ref name="jsfValidate" />
-				<interceptor-ref name="jsfUpdate" />
-				<interceptor-ref name="jsfInvoke" />
             </interceptor-stack>
         </interceptors>
 
diff --git a/core/src/main/resources/struts-jsf.xml b/core/src/main/resources/struts-jsf.xml
new file mode 100644
index 000000000..d026e7a94
--- /dev/null
+++ b/core/src/main/resources/struts-jsf.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE xwork PUBLIC "-//OpenSymphony Group//XWork 1.1.1//EN" "http://www.opensymphony.com/xwork/xwork-1.1.1.dtd">
+<xwork>
+    <package name="struts-jsf">
+        <result-types>
+			<result-type name="jsf" class="org.apache.struts.action2.jsf.FacesResult" />
+        </result-types>
+
+        <interceptors>
+			<!-- JSF interceptors, one per lifecycle phase -->
+			<interceptor class="org.apache.struts.action2.jsf.FacesSetupInterceptor" name="jsfSetup" />
+			<interceptor class="org.apache.struts.action2.jsf.RestoreViewInterceptor" name="jsfRestore" />
+			<interceptor class="org.apache.struts.action2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
+			<interceptor class="org.apache.struts.action2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
+			<interceptor class="org.apache.struts.action2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
+			<interceptor class="org.apache.struts.action2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
+
+			<!-- Sample JSF stack, can be combined with other stacks easily -->
+			<interceptor-stack name="jsfStack">
+                <interceptor-ref name="jsfSetup" />
+				<interceptor-ref name="jsfRestore" />
+				<interceptor-ref name="jsfApply" />
+				<interceptor-ref name="jsfValidate" />
+				<interceptor-ref name="jsfUpdate" />
+				<interceptor-ref name="jsfInvoke" />
+            </interceptor-stack>
+        </interceptors>
+    </package>
+
+</xwork>