You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/06/16 19:04:32 UTC
svn commit: r190957 - in
/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow:
FacesBackingBeanFactory.java PageFlowPageFilter.java
Author: rich
Date: Thu Jun 16 10:04:32 2005
New Revision: 190957
URL: http://svn.apache.org/viewcvs?rev=190957&view=rev
Log:
Fix two broken JSF BVTs: RestorePreviousBackingBean and RestorePreviousPage. An earlier change of mine removed the PageFlowRequestWrapper from the request before allowing a page (JSP) to run, but our JSF integration needs it.
tests: bvt in netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java?rev=190957&r1=190956&r2=190957&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FacesBackingBeanFactory.java Thu Jun 16 10:04:32 2005
@@ -61,7 +61,7 @@
if ( factoriesBean != null )
{
- PageflowFactory fcFactoryBean = factoriesBean.getFlowcontrollerFactory();
+ PageflowFactory fcFactoryBean = factoriesBean.getFacesBackingBeanFactory();
factory = ( FacesBackingBeanFactory ) getFactory( servletContext, fcFactoryBean, FacesBackingBeanFactory.class );
}
Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java?rev=190957&r1=190956&r2=190957&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java (original)
+++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowPageFilter.java Thu Jun 16 10:04:32 2005
@@ -112,7 +112,7 @@
_log.debug( "Request has error status code " + errStatusCode + ". Skipping filter." );
}
- continueChain( request, response, chain );
+ continueChainNoWrapper( request, response, chain );
return;
}
@@ -128,7 +128,7 @@
" does not have an appropriate file extension. Skipping filter." );
}
- continueChain( request, response, chain );
+ continueChainNoWrapper( request, response, chain );
return;
}
@@ -247,7 +247,7 @@
}
else
{
- continueChain( request, response, chain );
+ continueChainNoWrapper( request, response, chain );
}
}
@@ -291,7 +291,7 @@
try
{
- continueChain( request, response, chain );
+ chain.doFilter( request, response );
}
catch ( ServletException servletEx )
{
@@ -329,11 +329,11 @@
else
{
ImplicitObjectUtil.loadImplicitObjects( request, response, _servletContext, null );
- continueChain( request, response, chain );
+ continueChainNoWrapper( request, response, chain );
}
}
- private static void continueChain( ServletRequest request, ServletResponse response, FilterChain chain )
+ private static void continueChainNoWrapper( ServletRequest request, ServletResponse response, FilterChain chain )
throws IOException, ServletException
{
//