Author: rich
Date: Fri Oct 1 14:43:38 2004
New Revision: 51760
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/BackingClassMethodBinding.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/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ActionChaining.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B15392.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalListenTo.xml
incubator/beehive/trunk/test/ant/buildWebappCore.xml
Log:
- Consolidated code that dealt with 1) form beans passed from one action to
another and 2) form beans returned from nested page flows. It's really the
same thing.
- Relaxed restrictions on the 'outputFormBean' and 'outputFormBeanType'
attributes. They can now be used on any action, not just actions in nested
page flows.
- Fixed an NPE when processing a @Jpf.Forward with an opaque path, like
path="http:foo".
- Fixed an NPE in CompilerUtils during compilation of .jpf files that used
controls.
- Fixed up some ordering issues in the MockPortal/MockPortalListenTo tests.
Nothing feature-related, but by flushing some buffers the test output became
more readable.
- Fixed a NoClassDefFoundError that was occurring during the netui DRT build
(looking for a Velocity class).
DRT/BVT: netui (WinXP)
BB: self (linux)
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/CompilerUtils.java
Fri Oct 1 14:43:38 2004
@@ -697,7 +697,6 @@
int extensionPos = fileRelativePath.lastIndexOf(
JAVA_FILE_EXTENSION_DOT );
assert extensionPos != -1 : "expected a .java file: " +
fileRelativePath;
webappRootPath += File.separatorChar;
- String base = webappRootPath + fileRelativePath;
// See if we can find the file by chopping out the temp-dir.
File retVal = new File( webappRootPath + fileRelativePath );
@@ -721,6 +720,7 @@
}
}
+ assert retVal != null : "could not find original file for " +
fileRelativePath;
return retVal.exists() ? retVal.getAbsoluteFile() : null;
}
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/apt/PageFlowAnnotationProcessor.java
Fri Oct 1 14:43:38 2004
@@ -52,16 +52,17 @@
protected BaseChecker getChecker( ClassDeclaration classDecl, Diagnostics
diagnostics )
{
- File originalFile = CompilerUtils.getOriginalFile( classDecl );
String className = classDecl.getQualifiedName();
if ( CompilerUtils.getAnnotation( classDecl, FACES_BACKING_TAG_NAME )
!= null )
{
+ File originalFile = CompilerUtils.getOriginalFile( classDecl );
FacesBackingInfo fbInfo = new FacesBackingInfo( originalFile,
className );
return new FacesBackingChecker( getEnv(), diagnostics, fbInfo );
}
else if ( CompilerUtils.isAssignableFrom( JPF_BASE_CLASS, classDecl,
getEnv() ) )
{
+ File originalFile = CompilerUtils.getOriginalFile( classDecl );
FlowControllerInfo fcInfo = new FlowControllerInfo( originalFile,
className );
if ( expectControllerAnnotation( classDecl,
JPF_FILE_EXTENSION_DOT, JPF_BASE_CLASS, diagnostics ) )
@@ -71,6 +72,7 @@
}
else if ( CompilerUtils.isAssignableFrom( SHARED_FLOW_BASE_CLASS,
classDecl, getEnv() ) )
{
+ File originalFile = CompilerUtils.getOriginalFile( classDecl );
FlowControllerInfo fcInfo = new FlowControllerInfo( originalFile,
className );
if ( expectControllerAnnotation( classDecl,
SHARED_FLOW_FILE_EXTENSION_DOT, SHARED_FLOW_BASE_CLASS,
@@ -81,6 +83,7 @@
}
else if ( CompilerUtils.isAssignableFrom( GLOBALAPP_BASE_CLASS,
classDecl, getEnv() ) )
{
+ File originalFile = CompilerUtils.getOriginalFile( classDecl );
FlowControllerInfo fcInfo = new FlowControllerInfo( originalFile,
className );
if ( expectControllerAnnotation( classDecl,
GLOBALAPP_FILE_EXTENSION_DOT, GLOBALAPP_BASE_CLASS,
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java
Fri Oct 1 14:43:38 2004
@@ -70,8 +70,6 @@
private static String[][] ATTR_DEPENDENCIES =
{
- { OUTPUT_FORM_BEAN_TYPE_ATTR, RETURN_ACTION_ATTR },
- { OUTPUT_FORM_BEAN_ATTR, RETURN_ACTION_ATTR },
{ REDIRECT_ATTR, PATH_ATTR, NAVIGATE_TO_ATTR },
{ EXTERNAL_REDIRECT_ATTR, PATH_ATTR },
{ RESTORE_QUERY_STRING_ATTR, NAVIGATE_TO_ATTR }
@@ -123,8 +121,7 @@
String valueName = memberDecl.getSimpleName();
boolean isReturnAction = valueName.equals( RETURN_ACTION_ATTR );
- if ( isReturnAction || valueName.equals( OUTPUT_FORM_BEAN_TYPE_ATTR )
||
- valueName.equals( OUTPUT_FORM_BEAN_ATTR ) )
+ if ( isReturnAction )
{
if ( ! CompilerUtils.isInNestedPageFlow( classMember ) )
{
Modified:
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
==============================================================================
---
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
(original)
+++
incubator/beehive/trunk/netui/src/compiler/org/apache/beehive/netui/compiler/grammar/WebappPathType.java
Fri Oct 1 14:43:38 2004
@@ -76,9 +76,15 @@
catch ( URISyntaxException e )
{
addError( value, "error.invalid-uri", e.getLocalizedMessage() );
+ return null;
}
//
+ // The path will be null for an 'opaque' URI, like
"news:comp.lang.java".
+ //
+ if ( filePath == null || filePath.length() == 0 ) return null;
+
+ //
// Make sure it's a filetype that should exist on the filesystem. If
not, ignore it.
//
if ( ! checkAnyExtension() )
@@ -103,7 +109,7 @@
File jpfFile = CompilerUtils.getOriginalFile(
CompilerUtils.getOuterClass( classMember ) );
File fileToCheck = null;
- if ( filePath.startsWith( "/" ) ) // relative to webapp root
+ if ( filePath.charAt( 0 ) == '/' ) // relative to webapp root
{
if ( _pathMustBeRelative )
{
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/FlowController.java
Fri Oct 1 14:43:38 2004
@@ -349,23 +349,6 @@
PageFlowActionMapping pfActionMapping =
mapping instanceof PageFlowActionMapping ? (
PageFlowActionMapping ) mapping : null;
-
- //
- // If a form was returned from nesting, use that.
- //
- ActionForm returningForm = RequestValues.getReturningForm( request
);
-
- if ( returningForm != null )
- {
- if ( _log.isDebugEnabled() )
- {
- _log.debug( "Got return form from nested PageFlow: " +
returningForm );
- }
-
- form = returningForm;
- RequestValues.removeReturningForm( request );
- }
-
Object unwrappedForm = InternalUtils.unwrapFormBean( form );
//
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/ForwardHandler.java
Fri Oct 1 14:43:38 2004
@@ -465,7 +465,7 @@
if ( retForm != null )
{
- RequestValues.setReturningForm( request, retForm );
+ RequestValues.setForwardedForm( request, retForm );
}
// @TODO 9.0 - delete this deprecated feature (following line)
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowRequestProcessor.java
Fri Oct 1 14:43:38 2004
@@ -267,7 +267,7 @@
// constructed, and shouldn't be instantiated anew or populated from
request
// parameters.
//
- ActionForm previousForm = InternalUtils.getForwardedForm( request,
false );
+ ActionForm previousForm = RequestValues.getForwardedForm( request,
false );
if ( previousForm != null )
{
@@ -367,7 +367,7 @@
//
// If a previous action forwarded us a form, use that -- don't
populate it from request parameters.
//
- ActionForm previousForm = InternalUtils.getForwardedForm( request,
true );
+ ActionForm previousForm = RequestValues.getForwardedForm( request,
true );
if ( previousForm != null )
{
@@ -866,13 +866,13 @@
// Look for a form-specific action path. This is used when there are
two actions with the same
// name, but different forms (in nesting).
//
- Object returningForm = InternalUtils.unwrapFormBean(
RequestValues.getReturningForm( request ) );
- String returningFormClassName = null;
+ Object forwardedForm = InternalUtils.unwrapFormBean(
RequestValues.getForwardedForm( request, false ) );
+ String forwardedFormClassName = null;
- if ( returningForm != null )
+ if ( forwardedForm != null )
{
- returningFormClassName = returningForm.getClass().getName();
- String qualifiedPath = path + '_' + makeFullyQualifiedBeanName(
returningFormClassName );
+ forwardedFormClassName = forwardedForm.getClass().getName();
+ String qualifiedPath = path + '_' + makeFullyQualifiedBeanName(
forwardedFormClassName );
ActionMapping mapping = ( ActionMapping )
moduleConfig.findActionConfig( qualifiedPath );
if ( mapping != null )
@@ -882,7 +882,7 @@
if ( _log.isDebugEnabled() )
{
_log.debug( "Found form-specific action mapping " +
qualifiedPath + " for " + path
- + ", form " + returningFormClassName );
+ + ", form " + forwardedFormClassName );
}
return mapping;
@@ -902,11 +902,11 @@
// We're going to bail out if there is a returningForm and the
selected mapping
// requires a different form type.
//
- if ( returningForm != null )
+ if ( forwardedForm != null )
{
String mappingFormName = mapping.getName();
- if ( mappingFormName == null || ! isCorrectFormType(
returningFormClassName, mapping ) )
+ if ( mappingFormName == null || ! isCorrectFormType(
forwardedFormClassName, mapping ) )
{
wrongForm = true;
}
@@ -942,14 +942,14 @@
if ( originalRequestURI != null )
{
- return processUnresolvedAction( path, originalRequestURI, request,
response, returningForm );
+ return processUnresolvedAction( path, originalRequestURI, request,
response, forwardedForm );
}
else
{
if ( !trySharedFlowAction( path, request, response ) )
{
return processUnresolvedAction( path, InternalUtils.decodeURI(
request ),
- request, response,
returningForm );
+ request, response,
forwardedForm );
}
}
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowUtils.java
Fri Oct 1 14:43:38 2004
@@ -20,6 +20,7 @@
import org.apache.beehive.netui.pageflow.config.PageFlowActionFormBean;
import org.apache.beehive.netui.pageflow.internal.ActionResultImpl;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
+import org.apache.beehive.netui.pageflow.internal.RequestValues;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
import org.apache.beehive.netui.pageflow.scoping.ScopedResponse;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
@@ -332,7 +333,7 @@
setOutputForms( mapping, fwd.getOutputForms(), request, overwrite
);
}
- InternalUtils.setForwardedForm( fwd.getFirstOutputForm( request ),
request );
+ RequestValues.setForwardedForm( request, fwd.getFirstOutputForm(
request ) );
}
/**
@@ -356,7 +357,7 @@
setOutputForms( mapping, fwd.getOutputForms(), request );
}
- InternalUtils.setForwardedForm( fwd.getFirstOutputForm( request ),
request );
+ RequestValues.setForwardedForm( request, fwd.getFirstOutputForm(
request ) );
}
/**
Modified:
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/BackingClassMethodBinding.java
==============================================================================
---
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/BackingClassMethodBinding.java
(original)
+++
incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/faces/internal/BackingClassMethodBinding.java
Fri Oct 1 14:43:38 2004
@@ -18,6 +18,7 @@
package org.apache.beehive.netui.pageflow.faces.internal;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
+import org.apache.beehive.netui.pageflow.internal.RequestValues;
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import javax.faces.el.MethodBinding;
@@ -107,7 +108,7 @@
Field field =
backingClass.getDeclaredField( formBeanMember );
field.setAccessible( true );
Object value = field.get( backingBean
);
- InternalUtils.setForwardedForm(
InternalUtils.wrapFormBean( value ), httpRequest );
+ RequestValues.setForwardedForm(
httpRequest, InternalUtils.wrapFormBean( value ) );
}
catch ( NoSuchFieldException e )
{
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
Fri Oct 1 14:43:38 2004
@@ -450,34 +450,6 @@
}
}
- /**
- * Set the forwarded form. This overrides the auto-generated form created
by processActionForm
- * and populated by processPopulate (in PageFlowRequestProcessor).
- */
- public static void setForwardedForm( ActionForm form, ServletRequest
request )
- {
- if ( form == null )
- {
- request.removeAttribute( FORWARDED_OUTPUT_FORM_ATTR );
- }
- else
- {
- request.setAttribute( FORWARDED_OUTPUT_FORM_ATTR, form );
- }
- }
-
- public static ActionForm getForwardedForm( ServletRequest request, boolean
removeFromRequest )
- {
- ActionForm form = ( ActionForm ) request.getAttribute(
FORWARDED_OUTPUT_FORM_ATTR );
-
- if ( removeFromRequest )
- {
- request.removeAttribute( FORWARDED_OUTPUT_FORM_ATTR );
- }
-
- return form;
- }
-
public static void addValidationError( String propertyName, ActionError
error, ServletRequest request )
{
ActionErrors errors = ( ActionErrors ) request.getAttribute(
Globals.ERROR_KEY );
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
Fri Oct 1 14:43:38 2004
@@ -19,7 +19,7 @@
import org.apache.struts.action.ActionForm;
-import javax.servlet.http.HttpServletRequest;
+import javax.servlet.ServletRequest;
import static
org.apache.beehive.netui.pageflow.internal.InternalConstants.ATTR_PREFIX;
@@ -32,21 +32,21 @@
private static final String FORWARDED_REQUEST_COUNT_ATTR = ATTR_PREFIX +
"forwardedRequestCount";
private static final String AVOID_DIRECT_RESPONSE_OUTPUT_ATTR =
ATTR_PREFIX + "_avoidDirectResponseOutput";
private static final String ORIGINAL_REQUEST_URI_ATTR = ATTR_PREFIX +
"origRequestURI";
- private static final String RETURNING_FORM_ATTR = ATTR_PREFIX +
"returningForm";
+ private static final String FORWARDED_FORMBEAN_ATTR = ATTR_PREFIX +
"forwardedForm";
- public static boolean isForwardedRequest( HttpServletRequest request )
+ public static boolean isForwardedRequest( ServletRequest request )
{
return request.getAttribute( FORWARDED_REQUEST_COUNT_ATTR ) != null;
}
- public static int getForwardedRequestCount( HttpServletRequest request )
+ public static int getForwardedRequestCount( ServletRequest request )
{
Integer count = ( Integer ) request.getAttribute(
FORWARDED_REQUEST_COUNT_ATTR );
return count != null ? count : 0;
}
- public static void setForwardedRequestCount( HttpServletRequest request,
int count )
+ public static void setForwardedRequestCount( ServletRequest request, int
count )
{
request.setAttribute( FORWARDED_REQUEST_COUNT_ATTR, count );
}
@@ -55,7 +55,7 @@
* Tell whether a special request attribute was set, indicating that we
should avoid writing to the response (or
* setting response error codes).
*/
- public static boolean avoidDirectResponseOutput( HttpServletRequest
request )
+ public static boolean avoidDirectResponseOutput( ServletRequest request )
{
Boolean avoid = ( Boolean ) request.getAttribute(
AVOID_DIRECT_RESPONSE_OUTPUT_ATTR );
return avoid != null && avoid;
@@ -65,33 +65,46 @@
* Set a special request attribute to indicate that we should avoid
writing to the response (or
* setting response error codes).
*/
- public static void setAvoidDirectResponseOutput( HttpServletRequest
request )
+ public static void setAvoidDirectResponseOutput( ServletRequest request )
{
request.setAttribute( AVOID_DIRECT_RESPONSE_OUTPUT_ATTR, Boolean.TRUE
);
}
- public static void setOriginalRequestURI( HttpServletRequest request,
String uri )
+ public static void setOriginalRequestURI( ServletRequest request, String
uri )
{
request.setAttribute( ORIGINAL_REQUEST_URI_ATTR, uri );
}
- public static String getOriginalRequestURI( HttpServletRequest request )
+ public static String getOriginalRequestURI( ServletRequest request )
{
return ( String ) request.getAttribute( ORIGINAL_REQUEST_URI_ATTR );
}
- public static void setReturningForm( HttpServletRequest request,
ActionForm form )
- {
- request.setAttribute( RETURNING_FORM_ATTR, form );
- }
-
- public static ActionForm getReturningForm( HttpServletRequest request )
- {
- return ( ActionForm ) request.getAttribute( RETURNING_FORM_ATTR );
- }
-
- public static void removeReturningForm( HttpServletRequest request )
+ /**
+ * Set the forwarded form. This overrides the auto-generated form created
by processActionForm
+ * and populated by processPopulate (in PageFlowRequestProcessor).
+ */
+ public static void setForwardedForm( ServletRequest request, ActionForm
form )
{
- request.removeAttribute( RETURNING_FORM_ATTR );
+ if ( form == null )
+ {
+ request.removeAttribute( FORWARDED_FORMBEAN_ATTR );
+ }
+ else
+ {
+ request.setAttribute( FORWARDED_FORMBEAN_ATTR, form );
+ }
+ }
+
+ public static ActionForm getForwardedForm( ServletRequest request, boolean
removeFromRequest )
+ {
+ ActionForm form = ( ActionForm ) request.getAttribute(
FORWARDED_FORMBEAN_ATTR );
+
+ if ( removeFromRequest )
+ {
+ request.removeAttribute( FORWARDED_FORMBEAN_ATTR );
+ }
+
+ return form;
}
}
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/mockportal/MockPortalTag.java
Fri Oct 1 14:43:38 2004
@@ -31,6 +31,15 @@
{
public int doStartTag() throws JspException
{
+ try
+ {
+ pageContext.getOut().flush();
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace();
+ throw new JspException( e );
+ }
return EVAL_BODY_INCLUDE;
}
@@ -38,8 +47,7 @@
{
try
{
- HttpServletResponse response = ( HttpServletResponse )
pageContext.getResponse();
- response.getWriter().flush();
+ pageContext.getOut().flush();
}
catch ( IOException e )
{
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ActionChaining.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ActionChaining.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ActionChaining.xml
Fri Oct 1 14:43:38 2004
@@ -1110,15 +1110,15 @@
<response>
<statusCode>200</statusCode>
<reason></reason>
- <responseBody><![CDATA[<html><head><title>Page Flow Error - No Matching
Action Method</title></head>
+ <responseBody><![CDATA[<html><head><title>Page Flow Error - Action Not
Found</title></head>
<body>
- <h1>Page Flow Error - No Matching Action Method</h1>
+ <h1>Page Flow Error - Action Not Found</h1>
<table border="1" cellspacing="0">
<tr><td><b>Page
Flow:</b></td><td>/miniTests/actionChaining/ActionChainingController.jpf</td></tr>
<tr><td><b>Action:</b></td><td>action5b</td></tr>
<tr><td><b>Form:</b></td><td>miniTests.actionChaining.ActionChainingController$SomeForm</td></tr>
</table><br />
- <span style="color:red">Could not find matching action method for
action=<b>action5b</b>,
form=<b>miniTests.actionChaining.ActionChainingController$SomeForm</b>.</span>
+ <span style="color:red">Unable to find matching action <b>action5b</b>.</span>
</body></html>]]></responseBody>
</response>
@@ -1136,4 +1136,4 @@
<testCount>10</testCount>
<passedCount>1</passedCount>
<failedCount>9</failedCount>
-</recorderSession>
\ No newline at end of file
+</recorderSession>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B15392.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B15392.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B15392.xml
Fri Oct 1 14:43:38 2004
@@ -142,15 +142,15 @@
<response>
<statusCode>200</statusCode>
<reason></reason>
- <responseBody><![CDATA[<html><head><title>Page Flow Error - No Matching
Action Method</title></head>
+ <responseBody><![CDATA[<html><head><title>Page Flow Error - Action Not
Found</title></head>
<body>
- <h1>Page Flow Error - No Matching Action Method</h1>
+ <h1>Page Flow Error - Action Not Found</h1>
<table border="1" cellspacing="0">
<tr><td><b>Page
Flow:</b></td><td>/bugs/b15392/nesting/Controller.jpf</td></tr>
<tr><td><b>Action:</b></td><td>begin</td></tr>
<tr><td><b>Form:</b></td><td>bugs.b15392.Controller$Form</td></tr>
</table><br />
- <span style="color:red">Could not find matching action method for
action=<b>begin</b>, form=<b>bugs.b15392.Controller$Form</b>.</span>
+ <span style="color:red">Unable to find matching action <b>begin</b>.</span>
</body></html>]]></responseBody>
</response>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml
Fri Oct 1 14:43:38 2004
@@ -2,8 +2,8 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
<ses:sessionName>MockPortal</ses:sessionName>
<ses:tester>rich</ses:tester>
- <ses:startDate>16 Sep 2004, 10:33:07.241 PM MDT</ses:startDate>
- <ses:description>Smoke test for portal-friendly request/session scoping
functionality.</ses:description>
+ <ses:startDate>01 Oct 2004, 12:55:02.768 PM MDT</ses:startDate>
+ <ses:description>Smoke test of scoping functionality, for accessing
multiple active page flows in a request/session.</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -18,7 +18,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +48,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -63,7 +67,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="green">Action was: <b>begin</b></font><br>
@@ -134,17 +146,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -173,13 +174,17 @@
</ses:parameter>
<ses:parameter>
<ses:name>smokeTestA{pageFlow.data}</ses:name>
- <ses:value>one</ses:value>
+ <ses:value>aaa</ses:value>
</ses:parameter>
</ses:parameters>
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -213,7 +218,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -236,7 +241,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="green">Action was: <b>submit</b></font><br>
@@ -261,7 +274,7 @@
<body>
<h3>Mock Portal Smoke Test</h3>
- data: <b><span>one</span></b>
+ data: <b><span>aaa</span></b>
<br/>
<br/>
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=begin&smokeTestA_submit=true">go
back</a>
@@ -302,17 +315,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -341,13 +343,17 @@
</ses:parameter>
<ses:parameter>
<ses:name>smokeTestB{pageFlow.data}</ses:name>
- <ses:value>two</ses:value>
+ <ses:value>bbb</ses:value>
</ses:parameter>
</ses:parameters>
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -381,7 +387,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -404,7 +410,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="black">PageFlow/StrutsModule type:
<b>mockportal.smokeTest.SmokeTestController</b></font><br>
@@ -426,7 +440,7 @@
<body>
<h3>Mock Portal Smoke Test</h3>
- data: <b><span>one</span></b>
+ data: <b><span>aaa</span></b>
<br/>
<br/>
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=begin&smokeTestA_submit=true">go
back</a>
@@ -459,7 +473,7 @@
<body>
<h3>Mock Portal Smoke Test</h3>
- data: <b><span>two</span></b>
+ data: <b><span>bbb</span></b>
<br/>
<br/>
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=begin&smokeTestB_submit=true">go
back</a>
@@ -468,17 +482,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -509,7 +512,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -535,7 +542,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -558,7 +565,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="green">Action was: <b>begin</b></font><br>
@@ -584,7 +599,7 @@
<h3>Mock Portal Smoke Test</h3>
<form id="smokeTestANetui_Form_0"
action="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=submit&smokeTestA_submit=true"
method="post">
- data: <input type="text" name="smokeTestA{pageFlow.data}"
value="one">
+ data: <input type="text" name="smokeTestA{pageFlow.data}"
value="aaa">
<input type="submit" value="submit">
</form>
@@ -615,7 +630,7 @@
<body>
<h3>Mock Portal Smoke Test</h3>
- data: <b><span>two</span></b>
+ data: <b><span>bbb</span></b>
<br/>
<br/>
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=begin&smokeTestB_submit=true">go
back</a>
@@ -624,17 +639,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -665,7 +669,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -691,7 +699,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -714,7 +722,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="green">Action was: <b>goNested</b></font><br>
@@ -769,7 +785,7 @@
<body>
<h3>Mock Portal Smoke Test</h3>
- data: <b><span>two</span></b>
+ data: <b><span>bbb</span></b>
<br/>
<br/>
<a
href="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=begin&smokeTestB_submit=true">go
back</a>
@@ -778,17 +794,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -819,7 +824,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -845,7 +854,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -868,7 +877,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="black">PageFlow/StrutsModule type:
<b>mockportal.smokeTest.nested.NestedController</b></font><br>
@@ -924,7 +941,7 @@
<h3>Mock Portal Smoke Test</h3>
<form id="smokeTestBNetui_Form_0"
action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true"
method="post">
- data: <input type="text" name="smokeTestB{pageFlow.data}"
value="two">
+ data: <input type="text" name="smokeTestB{pageFlow.data}"
value="bbb">
<input type="submit" value="submit">
</form>
@@ -934,17 +951,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -975,7 +981,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -1001,7 +1011,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=A44DFC7979BAE6FEC4388B27184CC87B</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -1024,7 +1034,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal (/mockportal)</title>
+</head>
+
+<h3>Mock Portal (/mockportal)</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet smokeTestA</b></td></tr><tr bordercolor="White"><td
bgcolor="#EEEEFF">
<font color="green">Action was: <b>done</b></font><br>
@@ -1050,7 +1068,7 @@
<h3>Mock Portal Smoke Test</h3>
<form id="smokeTestANetui_Form_0"
action="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=submit&smokeTestA_submit=true"
method="post">
- data: <input type="text" name="smokeTestA{pageFlow.data}"
value="one">
+ data: <input type="text" name="smokeTestA{pageFlow.data}"
value="aaa">
<input type="submit" value="submit">
</form>
@@ -1082,7 +1100,7 @@
<h3>Mock Portal Smoke Test</h3>
<form id="smokeTestBNetui_Form_1"
action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true"
method="post">
- data: <input type="text" name="smokeTestB{pageFlow.data}"
value="two">
+ data: <input type="text" name="smokeTestB{pageFlow.data}"
value="bbb">
<input type="submit" value="submit">
</form>
@@ -1092,17 +1110,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal (/mockportal)</title>
-</head>
-
-<h3>Mock Portal (/mockportal)</h3>
-<body>
-
-
@@ -1112,6 +1119,6 @@
</ses:response>
</ses:test>
</ses:tests>
- <ses:endDate>16 Sep 2004, 10:33:55.130 PM MDT</ses:endDate>
+ <ses:endDate>01 Oct 2004, 12:55:42.496 PM MDT</ses:endDate>
<ses:testCount>7</ses:testCount>
</ses:recorderSession>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalListenTo.xml
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalListenTo.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortalListenTo.xml
Fri Oct 1 14:43:38 2004
@@ -2,7 +2,7 @@
<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
<ses:sessionName>MockPortalListenTo</ses:sessionName>
<ses:tester>rich</ses:tester>
- <ses:startDate>16 Sep 2004, 10:36:55.149 PM MDT</ses:startDate>
+ <ses:startDate>01 Oct 2004, 12:56:54.389 PM MDT</ses:startDate>
<ses:description>Tests 'listenTo' and exception handling under our
simulated portal.</ses:description>
<ses:tests>
<ses:test>
@@ -18,7 +18,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -44,7 +48,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -63,7 +67,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal - listenTo</title>
+</head>
+
+<h3>Mock Portal - listenTo</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet a1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
<font color="green">Action was: <b>begin</b></font><br>
@@ -127,17 +139,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal - listenTo</title>
-</head>
-
-<h3>Mock Portal - listenTo</h3>
-<body>
-
-
@@ -168,7 +169,11 @@
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -194,7 +199,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -217,7 +222,15 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <ses:responseBody><![CDATA[<html>
+<head>
+<title>Mock Portal - listenTo</title>
+</head>
+
+<h3>Mock Portal - listenTo</h3>
+<body>
+
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet a1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
<font color="green">Action was: <b>bothHave</b></font><br>
@@ -283,17 +296,6 @@
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal - listenTo</title>
-</head>
-
-<h3>Mock Portal - listenTo</h3>
-<body>
-
-
@@ -313,18 +315,22 @@
<ses:method>GET</ses:method>
<ses:parameters>
<ses:parameter>
- <ses:name>b1_submit</ses:name>
+ <ses:name>a1_submit</ses:name>
<ses:value>true</ses:value>
</ses:parameter>
<ses:parameter>
- <ses:name>b1altAction</ses:name>
- <ses:value>begin</ses:value>
+ <ses:name>a1altAction</ses:name>
+ <ses:value>onlyA</ses:value>
</ses:parameter>
</ses:parameters>
<ses:cookies>
<ses:cookie>
<ses:name>JSESSIONID</ses:name>
- <ses:value>E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>32771D158CD69E50FE9822162E9E5BE2</ses:value>
+ </ses:cookie>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+
<ses:value>Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:cookie>
</ses:cookies>
<ses:headers>
@@ -350,7 +356,7 @@
</ses:header>
<ses:header>
<ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
+ <ses:value>JSESSIONID=32771D158CD69E50FE9822162E9E5BE2;
JSESSIONID=Bc1QHnhx5fNX27kEcPnk0kfpEu95zr0jOrNysz4j1lV47gZw1nI4!1461753637</ses:value>
</ses:header>
<ses:header>
<ses:name>host</ses:name>
@@ -373,70 +379,7 @@
<ses:response>
<ses:statusCode>200</ses:statusCode>
<ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
-<tr bordercolor="White"><td bgcolor="#EEEEFF">
-<b>Portlet a1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
-<font color="black">PageFlow/StrutsModule type:
<b>mockportal.listenTo.listenToA.aController</b></font><br>
-<font color="black">Current URL:
<b>/mockportal/listenTo/listenToA/index.jsp</b></font><br>
-</td></tr>
-<tr><td>
-<!--Generated by WebLogic Workshop-->
-
-
-
-
-<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
- <title>
- A
- </title>
- </head>
- <body>
- <h3>A</h3>
- <a
href="/coreWeb/mockportal/listenTo/ListenToPortal.jsp?a1altAction=bothHave&a1_submit=true">bothHave</a>
- <br>
- <a
href="/coreWeb/mockportal/listenTo/ListenToPortal.jsp?a1altAction=onlyA&a1_submit=true">onlyA</a>
- </body>
-</html>
-</td></tr>
-</table><br><br>
-<table border="1" cellspacing="1" cellpadding="5" width="100%">
-<tr bordercolor="White"><td bgcolor="#EEEEFF">
-<b>Portlet b1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
-<font color="green">Action was: <b>begin</b></font><br>
-<font color="green">Action result URI:
<b>/mockportal/listenTo/listenToB/index.jsp</b></font><br>
-<font color="green">Action result isRedirect: <b>false</b></font><br>
-<font color="black">PageFlow/StrutsModule type:
<b>mockportal.listenTo.listenToB.bController</b></font><br>
-<font color="black">Current URL:
<b>/mockportal/listenTo/listenToB/index.jsp</b></font><br>
-</td></tr>
-<tr><td>
-<!--Generated by WebLogic Workshop-->
-
-
-
-
-<!DOCTYPE HTML PUBLIC "//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
-<head>
- <title>
- B
- </title>
- </head>
- <body>
- <h3>B</h3>
-
- <font color="blue"><span></span></font>
- </body>
-</html>
-</td></tr>
-</table><br><br>
-
-
-
-<html>
+ <ses:responseBody><![CDATA[<html>
<head>
<title>Mock Portal - listenTo</title>
</head>
@@ -444,87 +387,7 @@
<h3>Mock Portal - listenTo</h3>
<body>
-
-
-
-
-
-</body>
-</html>]]></ses:responseBody>
- </ses:response>
- </ses:test>
- <ses:test>
- <ses:testNumber>4</ses:testNumber>
- <ses:request>
- <ses:protocol>HTTP</ses:protocol>
- <ses:protocolVersion>1.1</ses:protocolVersion>
- <ses:host>localhost</ses:host>
- <ses:port>8080</ses:port>
- <ses:uri>/coreWeb/mockportal/listenTo/ListenToPortal.jsp</ses:uri>
- <ses:method>GET</ses:method>
- <ses:parameters>
- <ses:parameter>
- <ses:name>a1_submit</ses:name>
- <ses:value>true</ses:value>
- </ses:parameter>
- <ses:parameter>
- <ses:name>a1altAction</ses:name>
- <ses:value>onlyA</ses:value>
- </ses:parameter>
- </ses:parameters>
- <ses:cookies>
- <ses:cookie>
- <ses:name>JSESSIONID</ses:name>
- <ses:value>E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
- </ses:cookie>
- </ses:cookies>
- <ses:headers>
- <ses:header>
- <ses:name>accept</ses:name>
-
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>accept-charset</ses:name>
- <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>accept-encoding</ses:name>
- <ses:value>gzip,deflate</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>accept-language</ses:name>
- <ses:value>en-us,en;q=0.5</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>connection</ses:name>
- <ses:value>keep-alive</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>cookie</ses:name>
-
<ses:value>JSESSIONID=E1225DB3C0C6EC5C9D2857F252AF86BA</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>host</ses:name>
- <ses:value>localhost:8080</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>keep-alive</ses:name>
- <ses:value>300</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>referer</ses:name>
-
<ses:value>http://localhost:8080/coreWeb/mockportal/listenTo/ListenToPortal.jsp?b1altAction=begin&b1_submit=true</ses:value>
- </ses:header>
- <ses:header>
- <ses:name>user-agent</ses:name>
- <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7) Gecko/20040803 Firefox/0.9.3</ses:value>
- </ses:header>
- </ses:headers>
- </ses:request>
- <ses:response>
- <ses:statusCode>200</ses:statusCode>
- <ses:reason/>
- <ses:responseBody><![CDATA[<table border="1" cellspacing="1"
cellpadding="5" width="100%">
+ <table border="1" cellspacing="1" cellpadding="5" width="100%">
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet a1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
<font color="green">Action was: <b>onlyA</b></font><br>
@@ -560,10 +423,10 @@
<tr bordercolor="White"><td bgcolor="#EEEEFF">
<b>Portlet b1</b></td></tr><tr bordercolor="White"><td bgcolor="#EEEEFF">
<font color="green">Action was: <b>onlyA</b></font><br>
-<font color="green">Action result URI:
<b>/mockportal/listenTo/listenToB/index.jsp</b></font><br>
+<font color="green">Action result URI:
<b>/mockportal/listenTo/listenToB/handled.jsp</b></font><br>
<font color="green">Action result isRedirect: <b>false</b></font><br>
<font color="black">PageFlow/StrutsModule type:
<b>mockportal.listenTo.listenToB.bController</b></font><br>
-<font color="black">Current URL:
<b>/mockportal/listenTo/listenToB/index.jsp</b></font><br>
+<font color="black">Current URL:
<b>/mockportal/listenTo/listenToB/handled.jsp</b></font><br>
</td></tr>
<tr><td>
<!--Generated by WebLogic Workshop-->
@@ -576,29 +439,20 @@
<html lang="en">
<head>
<title>
- B
+ handled bothHave
</title>
</head>
<body>
- <h3>B</h3>
-
+ handled bothHave
+ <br>
<font color="blue"><span>Note: doing nothing for action
/onlyA.</span></font>
+ <br>
+ <a
href="/coreWeb/mockportal/listenTo/ListenToPortal.jsp?b1altAction=begin&b1_submit=true">start
over</a>
</body>
</html>
</td></tr>
</table><br><br>
-
-
-<html>
-<head>
-<title>Mock Portal - listenTo</title>
-</head>
-
-<h3>Mock Portal - listenTo</h3>
-<body>
-
-
@@ -608,6 +462,6 @@
</ses:response>
</ses:test>
</ses:tests>
- <ses:endDate>16 Sep 2004, 10:37:32.713 PM MDT</ses:endDate>
- <ses:testCount>4</ses:testCount>
+ <ses:endDate>01 Oct 2004, 12:57:41.987 PM MDT</ses:endDate>
+ <ses:testCount>3</ses:testCount>
</ses:recorderSession>
Modified: incubator/beehive/trunk/test/ant/buildWebappCore.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/buildWebappCore.xml (original)
+++ incubator/beehive/trunk/test/ant/buildWebappCore.xml Fri Oct 1
14:43:38 2004
@@ -72,7 +72,7 @@
<!-- this path is separate for now because it includes the velocity
JARs used in the control compiler -->
<path id="controls.build.classpath">
<path refid="webapp.build.classpath"/>
- <fileset dir="${beehive.dir}\external\velocity">
+ <fileset dir="${beehive.dir}/external/velocity">
<include name="velocity*.jar"/>
</fileset>
</path>
@@ -96,7 +96,7 @@
<!-- JPF build -->
<!-- apt generates intermediate files Java files into a tmp directory;
WEB-INF/${tmp.sourcegen.dir} here -->
<path id="pageflow.build.classpath">
- <path refid="webapp.build.classpath"/>
+ <path refid="controls.build.classpath"/>
<fileset file="${netui-compiler.jar}"/>
</path>