Author: craigmcc
Date: Mon May 8 06:54:02 2006
New Revision: 405057
URL: http://svn.apache.org/viewcvs?rev=405057&view=rev
Log:
Corrections to enable the Tiles-based Struts-Faces example (#2) to work:
* Restore FacesTilesRequestProcessor.java
* Add "throws InvalidCancelException to processValidate() signature
* Update POM dependencies to pick up all required libraries
* Update references to the TLD for the struts-tiles library
to use the canonical URLs instead of the non-existent WEB-INF files.
Successful execution still depends on changes to struts-tiles.jar, which
Wendy just checked in on r405052.
Added:
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
- copied, changed from r405023,
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.bak
Removed:
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.bak
Modified:
struts/action/trunk/apps/faces-example2/pom.xml
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/web.xml
struts/action/trunk/apps/faces-example2/src/main/webapp/layout.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/layout1.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/loggedoff.jsp
struts/action/trunk/apps/faces-example2/src/main/webapp/loggedon.jsp
struts/action/trunk/faces/pom.xml
Modified: struts/action/trunk/apps/faces-example2/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/pom.xml?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/pom.xml (original)
+++ struts/action/trunk/apps/faces-example2/pom.xml Mon May 8 06:54:02 2006
@@ -48,13 +48,62 @@
</dependency>
<dependency>
<groupId>myfaces</groupId>
+ <artifactId>myfaces-impl</artifactId>
+ <version>1.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
+ <artifactId>myfaces-extensions</artifactId>
+ <version>1.0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
<version>1.0.9</version>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+
+ <!-- Required by MyFaces -->
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-el</groupId>
+ <artifactId>commons-el</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <!-- This example needs Tiles as well -->
+ <dependency>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+
</dependencies>
<build>
- <finalName>${pom.artifactId}</finalName>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <finalName>${pom.artifactId}</finalName>
</build>
</project>
Modified:
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
---
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
(original)
+++
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/struts-config.xml
Mon May 8 06:54:02 2006
@@ -197,7 +197,7 @@
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
- value="/WEB-INF/validator-rules.xml,
+ value="/org/apache/struts/validator/validator-rules.xml,
/WEB-INF/validation.xml"/>
</plug-in>
Modified:
struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/web.xml?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/WEB-INF/web.xml Mon
May 8 06:54:02 2006
@@ -27,7 +27,7 @@
<web-app>
- <display-name>Struts-Faces Integration Library Example</display-name>
+ <display-name>Struts-Faces Integration Library Example 2</display-name>
MYFACES_BEGIN
Modified: struts/action/trunk/apps/faces-example2/src/main/webapp/layout.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/layout.jsp?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/layout.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/layout.jsp Mon May
8 06:54:02 2006
@@ -3,7 +3,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://struts.apache.org/tags-faces"; %>
-<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
+<%@ taglib prefix="t" uri="http://struts.apache.org/tags-tiles"; %>
<!--
Modified: struts/action/trunk/apps/faces-example2/src/main/webapp/layout1.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/layout1.jsp?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/layout1.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/layout1.jsp Mon May
8 06:54:02 2006
@@ -2,7 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://struts.apache.org/tags-faces"; %>
-<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
+<%@ taglib prefix="t" uri="http://struts.apache.org/tags-tiles"; %>
<!--
Modified: struts/action/trunk/apps/faces-example2/src/main/webapp/loggedoff.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/loggedoff.jsp?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/loggedoff.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/loggedoff.jsp Mon
May 8 06:54:02 2006
@@ -2,7 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://struts.apache.org/tags-faces"; %>
-<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
+<%@ taglib prefix="t" uri="http://struts.apache.org/tags-tiles"; %>
<!--
Modified: struts/action/trunk/apps/faces-example2/src/main/webapp/loggedon.jsp
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/apps/faces-example2/src/main/webapp/loggedon.jsp?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/apps/faces-example2/src/main/webapp/loggedon.jsp
(original)
+++ struts/action/trunk/apps/faces-example2/src/main/webapp/loggedon.jsp Mon
May 8 06:54:02 2006
@@ -2,7 +2,7 @@
<%@ taglib prefix="f" uri="http://java.sun.com/jsf/core"; %>
<%@ taglib prefix="h" uri="http://java.sun.com/jsf/html"; %>
<%@ taglib prefix="s" uri="http://struts.apache.org/tags-faces"; %>
-<%@ taglib prefix="t" uri="/WEB-INF/struts-tiles.tld" %>
+<%@ taglib prefix="t" uri="http://struts.apache.org/tags-tiles"; %>
<!--
Modified: struts/action/trunk/faces/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/faces/pom.xml?rev=405057&r1=405056&r2=405057&view=diff
==============================================================================
--- struts/action/trunk/faces/pom.xml (original)
+++ struts/action/trunk/faces/pom.xml Mon May 8 06:54:02 2006
@@ -101,6 +101,13 @@
</dependency>
<dependency>
+ <groupId>org.apache.struts.action</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+
+ <dependency>
<groupId>myfaces</groupId>
<artifactId>myfaces-jsf-api</artifactId>
<version>1.0.9</version>
Copied:
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
(from r405023,
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.bak)
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java?p2=struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java&p1=struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.bak&r1=405023&r2=405057&rev=405057&view=diff
==============================================================================
---
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java.bak
(original)
+++
struts/action/trunk/faces/src/main/java/org/apache/struts/faces/application/FacesTilesRequestProcessor.java
Mon May 8 06:54:02 2006
@@ -37,6 +37,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.InvalidCancelException;
import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.faces.Constants;
@@ -417,7 +418,7 @@
HttpServletResponse response,
ActionForm form,
ActionMapping mapping)
- throws IOException, ServletException {
+ throws IOException, ServletException, InvalidCancelException {
if (log.isTraceEnabled()) {
log.trace("Performing standard validation");
