Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-11 01:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moving the JSF code into its own plugin, minor improvement to struts 1 config

Browse Source 
WW-1457


git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@450338 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Donald J. Brown
2006-09-27 06:19:05 +00:00
parent d15d905c8e
commit 8df55aefc2
19 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/pom.xml
+6
View File
@@ -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>
apps/showcase/src/main/resources/struts-jsf.xml
+1 -1
View File
@@ -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" />
core/src/main/resources/struts-default.xml
+1 -25
View File
@@ -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>
plugins/jsf/pom.xml
+44
View File
@@ -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>
core/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/ApplyRequestValuesInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/FacesRender.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesRender.java
View File
core/src/main/java/org/apache/struts2/jsf/FacesResult.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesResult.java
View File
core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/FacesSupport.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/FacesSupport.java
View File
core/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/InvokeApplicationInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/ProcessValidationsInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/RestoreViewInterceptor.java
View File
core/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsNavigationHandler.java
View File
core/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/StrutsVariableResolver.java
View File
core/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java → plugins/jsf/src/main/java/org/apache/struts2/jsf/UpdateModelValuesInterceptor.java
View File
plugins/jsf/src/main/resources/struts-plugin.xml
+38
View File
@@ -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>
plugins/pom.xml
+1
View File
@@ -16,6 +16,7 @@
<module>pell-multipart</module>
<module>jasperreports</module>
<module>jfreechart</module>
<module>jsf</module>
</modules>
<distributionManagement>
plugins/struts1/src/main/resources/struts-plugin.xml
+2 -1
View File
@@ -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>