From 8df55aefc240d46c8f87b31ce9f92aa5c02b5a60 Mon Sep 17 00:00:00 2001
From: "Donald J. Brown" <mrdon@apache.org>
Date: Wed, 27 Sep 2006 06:19:05 +0000
Subject: [PATCH] Moving the JSF code into its own plugin, minor improvement to
 struts 1 config WW-1457

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@450338 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/showcase/pom.xml                         |  6 +++
 .../src/main/resources/struts-jsf.xml         |  2 +-
 core/src/main/resources/struts-default.xml    | 26 +----------
 plugins/jsf/pom.xml                           | 44 +++++++++++++++++++
 .../jsf/ApplyRequestValuesInterceptor.java    |  0
 .../apache/struts2/jsf/FacesInterceptor.java  |  0
 .../org/apache/struts2/jsf/FacesRender.java   |  0
 .../org/apache/struts2/jsf/FacesResult.java   |  0
 .../struts2/jsf/FacesSetupInterceptor.java    |  0
 .../org/apache/struts2/jsf/FacesSupport.java  |  0
 .../jsf/InvokeApplicationInterceptor.java     |  0
 .../jsf/ProcessValidationsInterceptor.java    |  0
 .../struts2/jsf/RestoreViewInterceptor.java   |  0
 .../struts2/jsf/StrutsNavigationHandler.java  |  0
 .../struts2/jsf/StrutsVariableResolver.java   |  0
 .../jsf/UpdateModelValuesInterceptor.java     |  0
 .../jsf/src/main/resources/struts-plugin.xml  | 38 ++++++++++++++++
 plugins/pom.xml                               |  1 +
 .../src/main/resources/struts-plugin.xml      |  3 +-
 19 files changed, 93 insertions(+), 27 deletions(-)
 create mode 100644 plugins/jsf/pom.xml
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/FacesRender.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/FacesResult.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/FacesSupport.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java (100%)
 rename {core => plugins/jsf}/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java (100%)
 create mode 100644 plugins/jsf/src/main/resources/struts-plugin.xml

diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml
index 8db25884a..360e1191f 100644
--- a/apps/showcase/pom.xml
+++ b/apps/showcase/pom.xml
@@ -30,6 +30,12 @@
             <version>${pom.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-jsf-plugin</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
  
         <dependency>
            <groupId>javax.servlet</groupId>
diff --git a/apps/showcase/src/main/resources/struts-jsf.xml b/apps/showcase/src/main/resources/struts-jsf.xml
index 453551f50..595825f3c 100644
--- a/apps/showcase/src/main/resources/struts-jsf.xml
+++ b/apps/showcase/src/main/resources/struts-jsf.xml
@@ -4,7 +4,7 @@
 <struts>
   <include file="struts-default.xml"/>
 
-  <package name="jsf" extends="struts-default" namespace="/jsf">
+  <package name="jsf" extends="jsf-default" namespace="/jsf">
 
       <result-types>
           <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index c3a1b863e..9ab9b138b 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -18,10 +18,6 @@
             <result-type name="velocity" class="org.apache.struts2.dispatcher.VelocityResult"/>
             <result-type name="xslt" class="org.apache.struts2.views.xslt.XSLTResult"/>
             <result-type name="plaintext" class="org.apache.struts2.dispatcher.PlainTextResult" />
-
-            <!-- third party integration
-            <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
-            -->
         </result-types>
 
         <interceptors>
@@ -53,14 +49,6 @@
             <interceptor name="store" class="org.apache.struts2.interceptor.MessageStoreInterceptor" />
             <interceptor name="checkbox" class="org.apache.struts2.interceptor.CheckboxInterceptor" />
             
-            <!-- JSF interceptors, one per lifecycle phase -->
-            <interceptor class="org.apache.struts2.jsf.FacesSetupInterceptor" name="jsfSetup" />
-            <interceptor class="org.apache.struts2.jsf.RestoreViewInterceptor" name="jsfRestore" />
-            <interceptor class="org.apache.struts2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
-            <interceptor class="org.apache.struts2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
-            <interceptor class="org.apache.struts2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
-            <interceptor class="org.apache.struts2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
-			
             <!-- Basic stack -->
             <interceptor-stack name="basicStack">
                 <interceptor-ref name="exception"/>
@@ -189,19 +177,7 @@
                 </interceptor-ref>
             </interceptor-stack>
             
-            <!-- Sample JSF stack, can be combined with other stacks easily -->
-            <interceptor-stack name="jsfStack">
-                <interceptor-ref name="jsfSetup">
-                    <param name="variableResolver">org.apache.struts2.jsf.StrutsVariableResolver</param>
-                    <param name="navigationHandler">org.apache.struts2.jsf.StrutsNavigationHandler</param>
-                </interceptor-ref>
-                <interceptor-ref name="jsfRestore" />
-                <interceptor-ref name="jsfApply" />
-                <interceptor-ref name="jsfValidate" />
-                <interceptor-ref name="jsfUpdate" />
-                <interceptor-ref name="jsfInvoke" />
-            </interceptor-stack>
-        </interceptors>
+       </interceptors>
         
         <default-interceptor-ref name="defaultStack"/>
     </package>
diff --git a/plugins/jsf/pom.xml b/plugins/jsf/pom.xml
new file mode 100644
index 000000000..bfa79c1ac
--- /dev/null
+++ b/plugins/jsf/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.struts</groupId>
+        <artifactId>struts2-plugins</artifactId>
+        <version>2.0.1-SNAPSHOT</version>
+    </parent>
+    <groupId>org.apache.struts</groupId>
+    <artifactId>struts2-jsf-plugin</artifactId>
+    <packaging>jar</packaging>
+    <name>Struts 2 JSF Plugin</name>
+    
+    <distributionManagement>
+        <site>
+            <id>apache-site</id>
+            <url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/jsf</url>
+        </site>
+    </distributionManagement>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts-core</artifactId>
+            <version>1.3.5</version>
+        </dependency>
+ 
+        <dependency>
+            <groupId>myfaces</groupId>
+            <artifactId>myfaces-jsf-api</artifactId>
+            <version>1.0.9</version>
+            <scope>provided</scope>
+        </dependency>
+
+     
+        <dependency>
+            <groupId>mockobjects</groupId>
+            <artifactId>mockobjects-core</artifactId>
+            <version>0.09</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/core/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesRender.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/FacesRender.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesResult.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/FacesResult.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesSupport.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/FacesSupport.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
diff --git a/core/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java b/plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
similarity index 100%
rename from core/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
rename to plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
diff --git a/plugins/jsf/src/main/resources/struts-plugin.xml b/plugins/jsf/src/main/resources/struts-plugin.xml
new file mode 100644
index 000000000..df5a8a169
--- /dev/null
+++ b/plugins/jsf/src/main/resources/struts-plugin.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+    "http://struts.apache.org/dtds/struts-2.0.dtd">
+    
+<struts>
+    <package name="jsf-default" extends="struts-default">
+
+        <result-types>
+            <result-type name="jsf" class="org.apache.struts2.jsf.FacesResult" />
+        </result-types>
+        <interceptors>
+            <interceptor class="org.apache.struts2.jsf.FacesSetupInterceptor" name="jsfSetup" />
+            <interceptor class="org.apache.struts2.jsf.RestoreViewInterceptor" name="jsfRestore" />
+            <interceptor class="org.apache.struts2.jsf.ApplyRequestValuesInterceptor" name="jsfApply" />
+            <interceptor class="org.apache.struts2.jsf.ProcessValidationsInterceptor" name="jsfValidate" />
+            <interceptor class="org.apache.struts2.jsf.UpdateModelValuesInterceptor" name="jsfUpdate" />
+            <interceptor class="org.apache.struts2.jsf.InvokeApplicationInterceptor" name="jsfInvoke" />
+
+            <interceptor-stack name="jsfStack">
+                <interceptor-ref name="jsfSetup">
+                    <param name="variableResolver">org.apache.struts2.jsf.StrutsVariableResolver</param>
+                    <param name="navigationHandler">org.apache.struts2.jsf.StrutsNavigationHandler</param>
+                </interceptor-ref>
+                <interceptor-ref name="jsfRestore" />
+                <interceptor-ref name="jsfApply" />
+                <interceptor-ref name="jsfValidate" />
+                <interceptor-ref name="jsfUpdate" />
+                <interceptor-ref name="jsfInvoke" />
+            </interceptor-stack>
+        </interceptors>
+        
+        <default-interceptor-ref name="jsfStack"/>
+        
+    </package>
+
+</struts>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 43893a1af..f6a2b6133 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -16,6 +16,7 @@
         <module>pell-multipart</module>
         <module>jasperreports</module>
         <module>jfreechart</module>
+        <module>jsf</module>
     </modules>
     
      <distributionManagement>
diff --git a/plugins/struts1/src/main/resources/struts-plugin.xml b/plugins/struts1/src/main/resources/struts-plugin.xml
index 9114f590c..2d7bfaed4 100644
--- a/plugins/struts1/src/main/resources/struts-plugin.xml
+++ b/plugins/struts1/src/main/resources/struts-plugin.xml
@@ -13,7 +13,7 @@
             <interceptor name="actionForm-commonsValidation" class="org.apache.struts2.s1.ActionFormValidationInterceptor">
             	<param name="pathnames">/org/apache/struts/validator/validator-rules.xml,/WEB-INF/validation.xml</param>
             </interceptor>
-            <interceptor-stack name="struts1-default">
+            <interceptor-stack name="struts1Stack">
 	    		<interceptor-ref name="static-params"/>
 	    		<interceptor-ref name="scoped-model-driven"/>
 	    		<interceptor-ref name="model-driven"/>
@@ -24,6 +24,7 @@
 	    	</interceptor-stack>
         </interceptors>
         
+        <default-interceptor-ref name="struts1Stack"/>
     </package>
 
 </struts>