cvs commit: jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application FacesRequestProcessor.java

2003-12-28 Thread craigmcc 
craigmcc2003/12/28 14:03:28

  Modified:contrib/struts-faces build.properties.sample build.xml
   contrib/struts-faces/src/java/org/apache/struts/faces/application
FacesRequestProcessor.java
  Log:
  Tweak the build scripts and sample properties for refined prerequisites.
  
  Remove now-obsolete code from the FacesRequestProcessor class, in prep for
  refining how the Faces environment gets itself initialized.
  
  Revision  ChangesPath
  1.4   +14 -16jakarta-struts/contrib/struts-faces/build.properties.sample
  
  Index: build.properties.sample
  ===
  RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/build.properties.sample,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.properties.sample   24 Dec 2003 03:21:01 -  1.3
  +++ build.properties.sample   28 Dec 2003 22:03:27 -  1.4
  @@ -13,8 +13,8 @@
   
   # Uncomment the following property setting to build web applications that will
   # include all of the required libraries, and therefore run on containers other
  -# than the Java Web Services Developer Pack (JWSDP) 1.2 Release, which makes
  -# many of these libraries available to web applications already
  +# than the Java Web Services Developer Pack (JWSDP) 1.2 or later, which makes
  +# many of these libraries available to web applications already.
   
   # build.standalone=true
   
  @@ -22,13 +22,17 @@
   # -- DEPENDENCY HOME DIRECTORIES --
   
   # The absolute or relative pathname of the Java Web Services Developer Pack
  -# (JWSDP) Version 1.2 installation directory
  +# (JWSDP) Version 1.2 or later installation directory
   jwsdp.home=/usr/local/jwsdp-1.2
   
   # The absolute or relative pathname of the JavaServer Faces Beta Distribution
   # Directory
   jsf.home=/usr/local/jsf-1_0
   
  +# The absolute or relative pathname of the JSP Standard Tag Library 1.0 or later
  +# distribution directory
  +jstl.home=${jwsdp.home}/jstl
  +
   # The absolute or relative pathname of the Struts 1.1 (or later)
   # Distribution Directory
   struts.home=/usr/local/jakarta-struts-1.1
  @@ -37,16 +41,13 @@
   # -- DEPENDENCY LIBRARY PATHS -
   
   # The absolute or relative pathname of the Commons Beanutils Library
  -commons-beanutils.jar=${jwsdp.home}/jwsdp-shared/lib/commons-beanutils.jar
  +commons-beanutils.jar=${struts.home}/lib/commons-beanutils.jar
   
   # The absolute or relative pathname of the Commons Collections Library
  -commons-collections.jar=${jwsdp.home}/jwsdp-shared/lib/commons-collections.jar
  -
  -# The absolute or relative pathname of the Commons DBCP Library
  -commons-dbcp.jar=${jwsdp.home}/common/lib/commons-dbcp.jar
  +commons-collections.jar=${struts.home}/lib/commons-collections.jar
   
   # The absolute or relative pathname of the Commons Digester Library
  -commons-digester.jar=${jwsdp.home}/jwsdp-shared/lib/commons-digester.jar
  +commons-digester.jar=${struts.home}/lib/commons-digester.jar
   
   # The absolute or relative pathname of the Commons FileUpload Library
   commons-fileupload.jar=${struts.home}/lib/commons-fileupload.jar
  @@ -55,10 +56,7 @@
   commons-lang.jar=${struts.home}/lib/commons-lang.jar
   
   # The absolute or relative pathname of the Commons Logging Library
  -commons-logging.jar=${jwsdp.home}/jwsdp-shared/lib/commons-logging.jar
  -
  -# The absolute or relative pathname of the Commons Pool Library
  -commons-pool.jar=${jwsdp.home}/common/lib/commons-pool.jar
  +commons-logging.jar=${struts.home}/lib/commons-logging.jar
   
   # The absolute or relative pathname of the Commons Validator Library
   commons-validator.jar=${struts.home}/lib/commons-validator.jar
  @@ -76,7 +74,7 @@
   
   # The absolute or relative pathname of the JSP Standard Tag Library
   # (JSTL) API Classes
  -jstl.jar=${jsf-impl.home}/lib/jstl.jar
  +jstl.jar=${jstl.home}/lib/jstl.jar
   
   # The absolute or relative pathname of the Servlet 2.4 API Classes
   # (or a combined Servlet 2.3 / JSP 1.2 API classes JAR file)
  @@ -84,7 +82,7 @@
   
   # The absolute or relative pathname of the JSP Standard Tag Library
   # (JSTL) RI Classes
  -standard.jar=${jsf-impl.home}/lib/standard.jar
  +standard.jar=${jstl.home}/lib/standard.jar
   
   # The absolute or relative pathname of the Struts Runtime Library
   struts.jar=${struts.home}/lib/struts.jar
  
  
  
  1.7   +13 -22jakarta-struts/contrib/struts-faces/build.xml
  
  Index: build.xml
  ===
  RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 24 Dec 2003 03:21:01 -  1.6
  +++ build.xml 28 Dec 2003 22:03:27 -  1.7
  @@ -13,35 +13,32 @@
   
 !-- Dependency home

cvs commit: jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application FacesRequestProcessor.java

2003-09-20 Thread craigmcc 
craigmcc2003/09/20 19:30:12

  Modified:contrib/struts-faces/src/java/org/apache/struts/faces/application
FacesRequestProcessor.java
  Log:
  Emulate the if the response is already committed, do an include instead
  of a forward behavior of TilesRequestProcesor.
  
  Revision  ChangesPath
  1.3   +9 -5  
jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java
  
  Index: FacesRequestProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-struts/contrib/struts-faces/src/java/org/apache/struts/faces/application/FacesRequestProcessor.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FacesRequestProcessor.java4 Jun 2003 17:38:13 -   1.2
  +++ FacesRequestProcessor.java21 Sep 2003 02:30:11 -  1.3
  @@ -137,7 +137,11 @@
   if ((context != null)  !uri.startsWith(/faces/)) {
   selectTree(context, uri);
   } else {
  -super.doForward(uri, request, response);
  +if (response.isCommitted()) {
  +doInclude(uri, request, response);
  +} else {
  +super.doForward(uri, request, response);
  +}
   if (context != null) {
   context.responseComplete();
   }
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]