Author: mrdon
Date: Thu Apr 6 13:54:30 2006
New Revision: 392070
URL: http://svn.apache.org/viewcvs?rev=392070&view=rev
Log:
Adding faces and scripting to the module list, starting to restructure
faces, adding a maven 2 build for faces which works and all tests pass,
made faces work with latest action although backwards compatibility
might be compromised due the use of ModuleUtils and
InvalidCancelException. This should be addressed if we plan to keep
support for old versions of Struts Action 1.
Added:
struts/action/trunk/faces/src/
- copied from r392045, struts/action/trunk/faces/core-library/src/
struts/action/trunk/faces/src/conf/
- copied from r392064, struts/action/trunk/faces/core-library/src/conf/
struts/action/trunk/faces/src/java/
- copied from r392064, struts/action/trunk/faces/core-library/src/java/
struts/action/trunk/faces/src/test/
- copied from r392064, struts/action/trunk/faces/core-library/src/test/
Removed:
struts/action/trunk/faces/core-library/src/
Modified:
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
struts/action/trunk/pom.xml
Modified:
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/java/org/apache/struts/faces/application/ActionListenerImpl.java?rev=392070&r1=392064&r2=392070&view=diff
==============================================================================
---
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
(original)
+++
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/ActionListenerImpl.java
Thu Apr 6 13:54:30 2006
@@ -36,6 +36,7 @@
import org.apache.struts.faces.Constants;
import org.apache.struts.faces.component.FormComponent;
import org.apache.struts.util.RequestUtils;
+import org.apache.struts.util.ModuleUtils;
/**
@@ -152,7 +153,7 @@
// Invoke the appropriate request processor for this request
try {
request.setAttribute(Constants.ACTION_EVENT_KEY, event);
- RequestUtils.selectModule(request, servletContext);
+ ModuleUtils.getInstance().selectModule(request, servletContext);
ModuleConfig moduleConfig = (ModuleConfig)
request.getAttribute(Globals.MODULE_KEY);
if (log.isTraceEnabled()) {
Modified:
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java?rev=392070&r1=392064&r2=392070&view=diff
==============================================================================
---
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
(original)
+++
struts/action/trunk/faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
Thu Apr 6 13:54:30 2006
@@ -38,6 +38,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.RequestProcessor;
+import org.apache.struts.action.InvalidCancelException;
import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.ForwardConfig;
import org.apache.struts.faces.Constants;
@@ -403,7 +404,7 @@
HttpServletResponse response,
ActionForm form,
ActionMapping mapping)
- throws IOException, ServletException {
+ throws IOException, ServletException, InvalidCancelException {
if (log.isTraceEnabled()) {
log.trace("Performing standard validation");
Modified: struts/action/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/pom.xml?rev=392070&r1=392069&r2=392070&view=diff
==============================================================================
--- struts/action/trunk/pom.xml (original)
+++ struts/action/trunk/pom.xml Thu Apr 6 13:54:30 2006
@@ -273,6 +273,8 @@
<module>el</module>
<module>extras</module>
<module>taglib</module>
+ <module>faces</module>
+ <module>scripting</module>
<!--module>apps</module-->
</modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
