Author: mrdon
Date: Tue Sep 26 23:19:05 2006
New Revision: 450338
URL: http://svn.apache.org/viewvc?view=rev&rev=450338
Log:
Moving the JSF code into its own plugin, minor improvement to struts 1 config
WW-1457
Added:
struts/struts2/trunk/plugins/jsf/
struts/struts2/trunk/plugins/jsf/pom.xml
struts/struts2/trunk/plugins/jsf/src/
struts/struts2/trunk/plugins/jsf/src/main/
struts/struts2/trunk/plugins/jsf/src/main/java/
struts/struts2/trunk/plugins/jsf/src/main/java/org/
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/
struts/struts2/trunk/plugins/jsf/src/main/java/org/apache/struts2/jsf/
- copied from r450303,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/
struts/struts2/trunk/plugins/jsf/src/main/resources/
struts/struts2/trunk/plugins/jsf/src/main/resources/struts-plugin.xml
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/jsf/
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
struts/struts2/trunk/core/src/main/resources/struts-default.xml
struts/struts2/trunk/plugins/pom.xml
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=450338&r1=450337&r2=450338
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Sep 26 23:19:05 2006
@@ -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>
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?view=diff&rev=450338&r1=450337&r2=450338
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts-jsf.xml Tue
Sep 26 23:19:05 2006
@@ -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" />
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?view=diff&rev=450338&r1=450337&r2=450338
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/struts-default.xml (original)
+++ struts/struts2/trunk/core/src/main/resources/struts-default.xml Tue Sep 26
23:19:05 2006
@@ -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>
Added: struts/struts2/trunk/plugins/jsf/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/pom.xml?view=auto&rev=450338
==============================================================================
--- struts/struts2/trunk/plugins/jsf/pom.xml (added)
+++ struts/struts2/trunk/plugins/jsf/pom.xml Tue Sep 26 23:19:05 2006
@@ -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>
Added: struts/struts2/trunk/plugins/jsf/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/jsf/src/main/resources/struts-plugin.xml?view=auto&rev=450338
==============================================================================
--- struts/struts2/trunk/plugins/jsf/src/main/resources/struts-plugin.xml
(added)
+++ struts/struts2/trunk/plugins/jsf/src/main/resources/struts-plugin.xml Tue
Sep 26 23:19:05 2006
@@ -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>
Modified: struts/struts2/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?view=diff&rev=450338&r1=450337&r2=450338
==============================================================================
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Tue Sep 26 23:19:05 2006
@@ -16,6 +16,7 @@
<module>pell-multipart</module>
<module>jasperreports</module>
<module>jfreechart</module>
+ <module>jsf</module>
</modules>
<distributionManagement>
Modified:
struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml?view=diff&rev=450338&r1=450337&r2=450338
==============================================================================
--- struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
(original)
+++ struts/struts2/trunk/plugins/struts1/src/main/resources/struts-plugin.xml
Tue Sep 26 23:19:05 2006
@@ -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>
