Author: rich
Date: Wed Aug 25 17:41:49 2004
New Revision: 37051
Removed:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/pfErrors/
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/PfErrors.xml
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
incubator/beehive/trunk/netui/test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/forwards/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/pfPageInput.xml
Log:
Fixes for the following BVTs:
- AnyBean
- PfExceptions
- NonNormalizedPath
- PfErrors
- PfPageInput
Also, enabled assertions for running the DRTs. With assertions off,
PfExceptions will fail because it depends on production-mode being false, and
the production-mode value is derived from the assertions setting.
DRT/BVT: netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/genmodel/GenForwardModel.java
Wed Aug 25 17:41:49 2004
@@ -58,9 +58,7 @@
returnFormType = ( ClassType ) field.getType();
}
setReturnFormMember( returnFormMember );
- String formClassName =
- returnFormType != null ? CompilerUtils.getFormClassName(
returnFormType, parent.getEnv() ): null;
- setReturnFormType( formClassName );
+ setReturnFormType( returnFormType != null ?
CompilerUtils.getLoadableName( returnFormType ) : null );
//
// path, navigateTo, returnAction (mutually exclusive)
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/Forward.java
Wed Aug 25 17:41:49 2004
@@ -36,6 +36,8 @@
import org.apache.beehive.netui.util.FileUtils;
import org.apache.beehive.netui.pageflow.config.PageFlowActionForward;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
+import org.apache.beehive.netui.pageflow.internal.ContextCache;
+import org.apache.beehive.netui.pageflow.handler.ReloadableClassHandler;
/**
@@ -299,17 +301,18 @@
{
if ( _log.isDebugEnabled() )
{
- _log.debug( "Creating ActionForm of type " +
_returnFormType );
+ _log.debug( "Creating form bean of type " +
_returnFormType );
}
- ActionForm form = ( ActionForm ) Class.forName(
_returnFormType ).newInstance(); // TODO: need to cache this
- form.reset( mapping, request );
- addOutputForm( form );
- return form;
+ ReloadableClassHandler rch = ContextCache.get( request
).getReloadableClassHandler();
+ Object formBean = rch.newInstance( _returnFormType,
request );
+ ActionForm wrappedFormBean = InternalUtils.wrapFormBean(
formBean );
+ addOutputForm( wrappedFormBean );
+ return wrappedFormBean;
}
catch ( Exception e )
{
- _log.error( "Could not create instance of " +
_returnFormType, e );
+ _log.error( "Could not create form bean instance of " +
_returnFormType, e );
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java
Wed Aug 25 17:41:49 2004
@@ -366,7 +366,7 @@
*/
protected String getPreviousActionURI()
{
- return ( _previousActionInfo != null ?
_previousActionInfo.getActionURI() : null );
+ return _previousActionInfo != null ?
_previousActionInfo.getActionURI() : null;
}
/**
@@ -400,7 +400,7 @@
if ( curPageInfo != null )
{
ActionForward curForward = curPageInfo.getForward();
- return ( curForward != null ? curForward.getPath() : null );
+ return curForward != null ? curForward.getPath() : null;
}
else
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/ContextCache.java
Wed Aug 25 17:41:49 2004
@@ -32,6 +32,7 @@
import org.apache.beehive.netui.pageflow.handler.ExceptionsHandler;
import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.List;
import java.util.ArrayList;
@@ -76,6 +77,11 @@
public ExceptionsHandler getExceptionsHandler()
{
return _exceptionsHandler;
+ }
+
+ public static ContextCache get( HttpServletRequest request )
+ {
+ return get( InternalUtils.getServerAdapter().getServletContext(
request ) );
}
public static ContextCache get( ServletContext servletContext )
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultExceptionsHandler.java
Wed Aug 25 17:41:49 2004
@@ -131,7 +131,7 @@
if ( _log.isErrorEnabled() )
{
StringBuffer msg = new StringBuffer( "Throwable " ).append(
exClass.getName() );
- _log.error( msg.append( " unhandled by current page flow and
Global.app." ).toString(), ex );
+ _log.error( msg.append( " unhandled by the current page flow (and
any shared flow)" ).toString(), ex );
}
sendUnhandledExceptionError( ex, request, response );
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultServerAdapter.java
Wed Aug 25 17:41:49 2004
@@ -33,24 +33,23 @@
public class DefaultServerAdapter implements ServerAdapter
{
- private static boolean devMode = false;
- private static boolean modeInit = false;
- private static void initProductionMode() {
- try {
- assert(false);
+ private static boolean _productionMode = true;
+
+ static
+ {
+ try
+ {
+ assert false;
}
- catch (AssertionError e) {
- devMode = true;
+ catch ( AssertionError e )
+ {
+ _productionMode = false;
}
- modeInit = true;
}
public boolean isInProductionMode()
{
- if (!modeInit) {
- initProductionMode();
- }
- return ! devMode;
+ return _productionMode;
}
public ServletContext getServletContext( HttpServletRequest request )
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/InternalUtils.java
Wed Aug 25 17:41:49 2004
@@ -96,8 +96,7 @@
HttpServletResponse response,
Throwable cause, int productionTimeErrorCode )
throws IOException
{
- if ( SERVER_ADAPTER.isInProductionMode()
- && ! RequestValues.avoidDirectResponseOutput( request ) )
+ if ( SERVER_ADAPTER.isInProductionMode() && !
RequestValues.avoidDirectResponseOutput( request ) )
{
if ( _log.isErrorEnabled() )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/RequestValues.java
Wed Aug 25 17:41:49 2004
@@ -33,13 +33,13 @@
public static boolean isForwardedRequest( HttpServletRequest request )
{
- return ( request.getAttribute( FORWARDED_REQUEST_COUNT_ATTR ) != null
);
+ return request.getAttribute( FORWARDED_REQUEST_COUNT_ATTR ) != null;
}
public static int getForwardedRequestCount( HttpServletRequest request )
{
Integer count = ( Integer ) request.getAttribute(
FORWARDED_REQUEST_COUNT_ATTR );
- return count != null ? count.intValue() : 0;
+ return count != null ? count : 0;
}
public static void setForwardedRequestCount( HttpServletRequest request,
int count )
@@ -54,7 +54,7 @@
public static boolean avoidDirectResponseOutput( HttpServletRequest
request )
{
Boolean avoid = ( Boolean ) request.getAttribute(
AVOID_DIRECT_RESPONSE_OUTPUT_ATTR );
- return avoid != null && avoid.booleanValue();
+ return avoid != null && avoid;
}
/**
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/util/PageflowTagUtils.java
Wed Aug 25 17:41:49 2004
@@ -125,7 +125,7 @@
StringBuffer value = new StringBuffer();
- String pageURI = servletRequest.getRequestURI();
+ String pageURI = InternalUtils.decodeURI( servletRequest );
int lastSlash = pageURI.lastIndexOf( '/' );
if ( lastSlash != -1 )
{
Modified: incubator/beehive/trunk/netui/test/ant/testRecorder.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Wed Aug 25
17:41:49 2004
@@ -90,7 +90,7 @@
<echo>Start a NetUI test server</echo>
<parallel>
- <ant target="start" antfile="${app.build.file}"
inheritAll="false"/>
+ <ant target="start.with.asserts" antfile="${app.build.file}"
inheritAll="false"/>
<sequential>
<echo>Wait for server to start at URL: ${waitfor.url}</echo>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/forwards/Controller.jpf
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/forwards/Controller.jpf
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/forwards/Controller.jpf
Wed Aug 25 17:41:49 2004
@@ -46,7 +46,8 @@
@Jpf.Controller
public class Controller extends PageFlowController
{
- public static class Redirector extends DefaultHandler implements
ForwardRedirectHandler
+ public static class Redirector
+ extends
org.apache.beehive.netui.pageflow.internal.DefaultForwardRedirectHandler
{
public void redirect( String uri, HttpServletRequest request,
HttpServletResponse response )
throws IOException, ServletException
@@ -57,12 +58,6 @@
writer.println( "Fake redirect to: <b>" + uri + "</b><br><br>" );
writer.println( "<a href=\"begin.do\">go back</a>" );
writer.println( "</body></html>" );
- }
-
- public void forward( String uri, HttpServletRequest request,
HttpServletResponse response )
- throws IOException, ServletException
- {
- request.getRequestDispatcher( uri ).forward( request, response );
}
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Wed Aug 25 17:41:49 2004
@@ -3425,19 +3425,6 @@
</features>
</test>
<test>
- <name>PfErrors</name>
- <description>Errors in the PageFlowController class</description>
- <webapp>coreWeb</webapp>
- <categories>
- <category>bvt</category>
- <category>corePageFlow</category>
- </categories>
- <features>
- <feature>PageFlow</feature>
- <feature>Errors</feature>
- </features>
- </test>
- <test>
<name>PfExceptions</name>
<description>Exception-handling in page flows</description>
<webapp>coreWeb</webapp>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/pfPageInput.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/pfPageInput.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/pfPageInput.xml
Wed Aug 25 17:41:49 2004
@@ -1124,7 +1124,6 @@
pi3:
<ul>
-
subarray: <ul>
<li><span>hi</span></li>
