Author: rich Date: Sun Apr 24 18:20:49 2005 New Revision: 164512 URL: http://svn.apache.org/viewcvs?rev=164512&view=rev Log: Fixes for: - http://issues.apache.org/jira/browse/BEEHIVE-552 : shared flow actions don't count as actions for Jpf.NavigateTo.previousAction - http://issues.apache.org/jira/browse/BEEHIVE-553 : 'restoreQueryString' does not work with Jpf.NavigateTo.currentPage or Jpf.NavigateTo.previousPage - http://issues.apache.org/jira/browse/BEEHIVE-556 : Invalid warning about missing displayName when 'displayNameKey' is used
Also deleted a bunch of empty test directories, including the ones mentioned in http://issues.apache.org/jira/browse/BEEHIVE-490 , and fixed a few tests that were generating compile warnings about missing referenced JSPs. tests: bvt in netui BB: self (linux) Added: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp (with props) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml (with props) incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml (with props) Removed: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b14386/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b24356/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b27852/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b28133/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b28160/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/b34059/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/resources/image/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/global/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/images/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/legacy/html/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/legacy/imageAnchor/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/choiceRepeater/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/miniTests/jspSeesSharedFlow/subdir/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/resources/javascript/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/attributeTester/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/bundle/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/multiTree/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/tree/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/treeExprErrors/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/treeNodeLabel/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/treeNodeTest/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/treeThree/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/treeTwo/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempErrors/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/tempRelative/image/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeAutoErrors/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeClient/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeClientSubmit/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeSelect/ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tree/treeSelectDeprecated/ Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.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/PreviousActionInfo.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j189/Controller.jpf incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j519/Controller.jpf incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/diagnostics.properties Sun Apr 24 18:20:49 2005 @@ -209,8 +209,6 @@ The PageFlowController validator version attribute must be more recent than 1.0 to use the {0} attribute on \ the annotation, {1}. -error.attr-depends-on-attr-value = The {0} attribute requires a value of {1} for attribute {2}. - warning.shared-flow-field-no-annotation = \ Field {0} is of a type that extends {1}, but it has no @{2} annotation. It will not be initialized automatically. Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/BaseValidationRuleGrammar.java Sun Apr 24 18:20:49 2005 @@ -80,6 +80,7 @@ AnnotationInstance immediateParent = parentAnnotations[parentAnnotations.length - 1]; if ( CompilerUtils.getString( immediateParent, DISPLAY_NAME_ATTR, true ) == null + && CompilerUtils.getString( immediateParent, DISPLAY_NAME_KEY_ATTR, true ) == null && CompilerUtils.getString( annotation, MESSAGE_KEY_ATTR, true ) == null && CompilerUtils.getString( annotation, MESSAGE_ATTR, true ) == null ) { Modified: incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java (original) +++ incubator/beehive/trunk/netui/src/compiler-core/org/apache/beehive/netui/compiler/grammar/ForwardGrammar.java Sun Apr 24 18:20:49 2005 @@ -90,7 +90,7 @@ addMemberType( REDIRECT_ATTR, new AnnotationMemberType( null, this ) ); addMemberType( EXTERNAL_REDIRECT_ATTR, new AbsolutePathType( null , this ) ); addMemberType( NAVIGATE_TO_ATTR, new EnumType( NAVIGATE_TO_VALS, DEPRECATED_NAVIGATE_TO_VALS, null, this ) ); - addMemberType( RESTORE_QUERY_STRING_ATTR, new RestoreQueryStringType() ); + addMemberType( RESTORE_QUERY_STRING_ATTR, new AnnotationMemberType( null, this ) ); addMemberArrayGrammar( ACTION_OUTPUTS_ATTR, new ActionOutputGrammar( env, diags, runtimeVersionChecker ) ); } @@ -157,32 +157,6 @@ { addError( annotation, "error.action-invalid-form-bean-type", formBeanType.toString() ); } - } - } - - protected class RestoreQueryStringType - extends AnnotationMemberType - { - public RestoreQueryStringType() - { - super( ForwardGrammar.this.getRequiredRuntimeVersion(), ForwardGrammar.this ); - } - - public Object onCheck( AnnotationTypeElementDeclaration valueDecl, AnnotationValue member, - AnnotationInstance[] parentAnnotations, MemberDeclaration classMember, - int annotationArrayIndex ) - { - AnnotationInstance parentAnnotation = parentAnnotations[ parentAnnotations.length - 1 ]; - String navigateToVal = CompilerUtils.getEnumFieldName( parentAnnotation, NAVIGATE_TO_ATTR, true ); - - if ( ! NAVIGATE_TO_PREVIOUS_ACTION_STR.equals( navigateToVal ) ) - { - addError( member, "error.attr-depends-on-attr-value", RESTORE_QUERY_STRING_ATTR, - ANNOTATION_INTERFACE_PREFIX + NAVIGATE_TO_ENUM + '.' + NAVIGATE_TO_PREVIOUS_ACTION_STR, - NAVIGATE_TO_ATTR ); - } - - return null; } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/GlobalApp.java Sun Apr 24 18:20:49 2005 @@ -23,6 +23,8 @@ import org.apache.beehive.netui.pageflow.internal.InternalUtils; import org.apache.beehive.netui.pageflow.internal.InternalConstants; +import org.apache.struts.action.ActionForm; +import org.apache.struts.action.ActionMapping; /** @@ -65,5 +67,12 @@ public boolean isNestable() { return false; + } + + void savePreviousActionInfo( ActionForm form, HttpServletRequest request, ActionMapping mapping, + ServletContext servletContext ) + { + // Do nothing here -- Global.app actions do not 'count' as actions in the current page flow, unlike shared + // flow actions. This is basically deprecated behavior. } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PageFlowController.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- 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 Sun Apr 24 18:20:49 2005 @@ -774,7 +774,7 @@ if ( isLocalFile( forward ) ) // || PageFlowUtils.osSensitiveEndsWith( path, JPF_EXTENSION ) ) { _previousPageInfo = _currentPageInfo; - _currentPageInfo = new PreviousPageInfo( forward, form, mapping ); + _currentPageInfo = new PreviousPageInfo( forward, form, mapping, request.getQueryString() ); request.setAttribute( SAVED_PREVIOUS_PAGE_INFO_ATTR, Boolean.TRUE ); } } Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousActionInfo.java Sun Apr 24 18:20:49 2005 @@ -17,7 +17,6 @@ */ package org.apache.beehive.netui.pageflow; -import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionForm; import java.io.Serializable; @@ -27,11 +26,10 @@ * Used with <code>return-to="previousAction"</code> on <code>@jpf:forward</code>. */ public class PreviousActionInfo + extends PreviousInfo implements Serializable { - private ActionForm _form; private String _actionURI; - private String _queryString; /** @@ -39,32 +37,12 @@ * * @param form the form that was passed to the action. * @param actionURI the URI that was used to execute the action. + * @param queryString the query string from the previous action URI. */ public PreviousActionInfo( ActionForm form, String actionURI, String queryString ) { - _form = form; + super( form, queryString ); _actionURI = actionURI; - _queryString = queryString; - } - - /** - * Get the form that was passed to the action. - * - * @return the form that was passed to the action. - */ - public ActionForm getForm() - { - return _form; - } - - /** - * Set the form that was passed to the action. - * - * @param form the form that was passed to the action. - */ - public void setForm( ActionForm form ) - { - _form = form; } /** @@ -85,25 +63,5 @@ public void setActionURI( String actionURI ) { _actionURI = actionURI; - } - - /** - * Get the query string from the original request URI. - * - * @return the query string from the original request URI. - */ - public String getQueryString() - { - return _queryString; - } - - /** - * Set the query string from the original request URI. - * - * @param queryString the query string from the original request URI. - */ - public void setQueryString( String queryString ) - { - _queryString = queryString; } } Added: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java (added) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java Sun Apr 24 18:20:49 2005 @@ -0,0 +1,65 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package org.apache.beehive.netui.pageflow; + +import org.apache.struts.action.ActionForm; + +import java.io.Serializable; + +public abstract class PreviousInfo + implements Serializable +{ + private ActionForm _form; + private String _queryString; + + protected PreviousInfo( ActionForm form, String queryString ) + { + _form = form; + _queryString = queryString; + } + + /** + * Get the form bean that was used to initialize the previous page or action. + * + * @return the previous ActionForm instance, or <code>null</code> if there was none. + */ + public ActionForm getForm() + { + return _form; + } + + /** + * Get the query string from the previous page or action request. + * + * @return the previous query string, or <code>null</code> if there was none. + */ + public String getQueryString() + { + return _queryString; + } + + void setForm( ActionForm form ) + { + _form = form; + } + + void setQueryString( String queryString ) + { + _queryString = queryString; + } +} Propchange: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousInfo.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/PreviousPageInfo.java Sun Apr 24 18:20:49 2005 @@ -22,7 +22,6 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.config.ModuleConfig; -import javax.servlet.http.HttpServletRequest; import java.io.Serializable; /** @@ -31,10 +30,10 @@ * on <code>@jpf:forward</code>. */ public class PreviousPageInfo + extends PreviousInfo implements Serializable { private ActionForward _forward; - private ActionForm _form; private String _mappingPath; private transient ActionMapping _mapping; private Object _clientState; @@ -45,40 +44,21 @@ * used to initialize the page, and the associated ActionMapping, which represents the * action that forwarded to the page. * - * @param forward - * @param form - * @param mapping + * @param forward the ActionForward that contains the path to the page. + * @param form the form that was present for the page when it was rendered initially. + * @param mapping the ActionMapping associated with the action that forwarded to the page, or <code>null</code> + * if the page was requested directly. + * @param queryString the query string from the request URI. */ - public PreviousPageInfo( ActionForward forward, ActionForm form, ActionMapping mapping ) + public PreviousPageInfo( ActionForward forward, ActionForm form, ActionMapping mapping, String queryString ) { - _form = form; + super( form, queryString ); _mapping = mapping; _mappingPath = mapping != null ? mapping.getPath() : null; _forward = forward; } /** - * Get the form bean that was used to initialize the page. - * - * @return the ActionForm instance that was used to initialize the page, or <code>null</code> - * if there was none. - */ - public ActionForm getForm() - { - return _form; - } - - /** - * Set the form bean that was used to initialize the page. - * - * @param form the ActionForm instance that was used to initialize the page. - */ - public void setForm( ActionForm form ) - { - _form = form; - } - - /** * Get information about the action that forwarded to the page. * <br> * <br> @@ -86,7 +66,8 @@ * a session failover has occurred (i.e., after this object has been serialized and deserialized), then this method * will return <code>null</code> unless you first call [EMAIL PROTECTED] #reinitialize}. * - * @return an ActionMapping that contains information about the action that forwarded to this page. + * @return an ActionMapping that contains information about the action that forwarded to this page, or + * <code>null</code> if the page was requested directly. */ public ActionMapping getMapping() { Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/SharedFlowController.java Sun Apr 24 18:20:49 2005 @@ -107,9 +107,8 @@ boolean isSpecialForward ) { // - // Special case: if the given forward has a path to a page in the current pageflow, - // let that pageflow save the info on this page. Otherwise, don't ever save any - // info on what we're forwarding to. + // Special case: if the given forward has a path to a page in the current pageflow, let that pageflow save + // the info on this page. Otherwise, don't ever save any info on what we're forwarding to. // if ( ! isSpecialForward && forward != null ) // i.e., it's a straight Forward to a path, not a navigateTo, etc. { @@ -119,13 +118,22 @@ { if ( forward.getContextRelative() && forward.getPath().startsWith( currentJpf.getModulePath() ) ) { - currentJpf.savePreviousPageInfo( forward, form, mapping, request, servletContext, - isSpecialForward ); + currentJpf.savePreviousPageInfo( forward, form, mapping, request, servletContext, isSpecialForward ); } } } } - + + void savePreviousActionInfo( ActionForm form, HttpServletRequest request, ActionMapping mapping, + ServletContext servletContext ) + { + // + // Save this previous-action info in the *current page flow*. + // + PageFlowController currentJpf = PageFlowUtils.getCurrentPageFlow( request ); + if ( currentJpf != null ) currentJpf.savePreviousActionInfo( form, request, mapping, servletContext ); + } + /** * Remove this instance from the session. */ Modified: incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java (original) +++ incubator/beehive/trunk/netui/src/pageflow/org/apache/beehive/netui/pageflow/internal/DefaultActionForwardHandler.java Sun Apr 24 18:20:49 2005 @@ -335,19 +335,22 @@ // String fwdPath = retFwd.getPath(); String newQueryString = pageFlowFwd.getQueryString(); + int existingQueryPos = fwdPath.indexOf( '?' ); + // + // If the new Forward (the one with Jpf.NavigateTo.currentPage/previousPage) has a query string, use that. + // Otherwise, if the old Forward has no query string, restore the one from the PreviousPageInfo if + // appropriate. + // if ( newQueryString != null ) { - int existingQuery = fwdPath.indexOf( '?' ); - - if ( existingQuery != -1 ) - { - retFwd.setPath( fwdPath.substring( 0, existingQuery ) + newQueryString ); - } - else - { - retFwd.setPath( fwdPath + newQueryString ); - } + // Chop off the old query string if necessary. + if ( existingQueryPos != -1 ) fwdPath = fwdPath.substring( 0, existingQueryPos ); + retFwd.setPath( fwdPath + newQueryString ); + } + else if ( existingQueryPos == -1 ) + { + retFwd.setPath( fwdPath + getQueryString( pageFlowFwd, prevPageInfo ) ); } } @@ -392,19 +395,7 @@ pageFlowFwd.addOutputForm( prevActionInfo.getForm() ); } - String query = pageFlowFwd.getQueryString(); - if ( query == null ) query = ""; - - // - // If the restoreQueryString attribute was set, use the query string from the original action URI. - // - boolean restoreQueryString = pageFlowFwd.doesRestoreQueryString(); - if ( restoreQueryString ) - { - String prevQuery = prevActionInfo.getQueryString(); - if ( prevQuery != null ) query += ( query.length() > 0 ? "&" : "?" ) + prevQuery; - } - + String query = getQueryString( pageFlowFwd, prevActionInfo ); ActionForward fwd = new ActionForward( actionURI + query, pageFlowFwd.getRedirect() ); fwd.setContextRelative( true ); return fwd; @@ -421,6 +412,24 @@ assert false; // previous method always throws return null; } + } + + private static String getQueryString( Forward pageFlowFwd, PreviousInfo previousInfo ) + { + String query = pageFlowFwd.getQueryString(); + if ( query == null ) query = ""; + + // + // If the restoreQueryString attribute was set, use the query string from the original action URI. + // + boolean restoreQueryString = pageFlowFwd.doesRestoreQueryString(); + if ( restoreQueryString ) + { + String prevQuery = previousInfo.getQueryString(); + if ( prevQuery != null ) query += ( query.length() > 0 ? "&" : "?" ) + prevQuery; + } + + return query; } public ActionForward doNestingReturn( FlowControllerHandlerContext context, Forward pageFlowFwd, Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j189/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j189/Controller.jpf?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j189/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j189/Controller.jpf Sun Apr 24 18:20:49 2005 @@ -54,7 +54,7 @@ @Jpf.Action(forwards = { @Jpf.Forward(name = "success", - path = "index.jsp") + path = "form.jsp") }) protected Forward back(Bean form) { Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j519/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j519/Controller.jpf?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j519/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/bugs/j519/Controller.jpf Sun Apr 24 18:20:49 2005 @@ -16,12 +16,7 @@ @Jpf.Controller ( simpleActions={ @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage), - @Jpf.SimpleAction(name="goHome", path="index.jsp"), - - @Jpf.SimpleAction(name="goToExpandModes", path="expandModes.jsp"), - @Jpf.SimpleAction(name="goToExpandModes2", path="expandModes2.jsp"), - @Jpf.SimpleAction(name="goToExpandModes3", path="expandModes3.jsp"), - @Jpf.SimpleAction(name="goToExpandModes4", path="expandModes4.jsp") + @Jpf.SimpleAction(name="goHome", path="index.jsp") } ) Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf Sun Apr 24 18:20:49 2005 @@ -0,0 +1,16 @@ +package pageFlowCore.rerunPreviousSharedFlowAction; + +import org.apache.beehive.netui.pageflow.*; +import org.apache.beehive.netui.pageflow.annotations.*; + [EMAIL PROTECTED]( + simpleActions={ + @Jpf.SimpleAction(name="begin", path="index.jsp") + }, + sharedFlowRefs={ + @Jpf.SharedFlowRef(name="sf", type=SharedFlow.class) + } +) +public class Controller extends PageFlowController +{ +} Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs Sun Apr 24 18:20:49 2005 @@ -0,0 +1,14 @@ +package pageFlowCore.rerunPreviousSharedFlowAction; + +import org.apache.beehive.netui.pageflow.*; +import org.apache.beehive.netui.pageflow.annotations.*; + [EMAIL PROTECTED]( + simpleActions={ + @Jpf.SimpleAction(name="sharedAction", path="success.jsp"), + @Jpf.SimpleAction(name="prevAction", navigateTo=Jpf.NavigateTo.previousAction) + } +) +public class SharedFlow extends SharedFlowController +{ +} Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/SharedFlow.jpfs ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp Sun Apr 24 18:20:49 2005 @@ -0,0 +1,19 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> +<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%> +<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%> + + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>${pageFlow.URI}</h3> + + <netui:anchor action="sf.sharedAction">sf.sharedAction</netui:anchor> + </netui:body> +</netui:html> + + + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp Sun Apr 24 18:20:49 2005 @@ -0,0 +1,24 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> +<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%> +<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%> + + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>${pageFlow.URI}</h3> + + Success! + <br/> + <br/> + <netui:anchor action="sf.prevAction">sf.prevAction</netui:anchor> (should rerun 'sf.sharedAction' and stay on this page) + <br/> + <netui:anchor action="begin">start over</netui:anchor> + </netui:body> +</netui:html> + + + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf Sun Apr 24 18:20:49 2005 @@ -0,0 +1,16 @@ +package pageFlowCore.restoreQueryStringToPage; + +import org.apache.beehive.netui.pageflow.*; +import org.apache.beehive.netui.pageflow.annotations.*; + [EMAIL PROTECTED]( + simpleActions={ + @Jpf.SimpleAction(name="begin", path="page1.jsp"), + @Jpf.SimpleAction(name="goPage2", path="page2.jsp"), + @Jpf.SimpleAction(name="curPage", navigateTo=Jpf.NavigateTo.currentPage, restoreQueryString=true), + @Jpf.SimpleAction(name="prevPage", navigateTo=Jpf.NavigateTo.previousPage, restoreQueryString=true) + } +) +public class Controller extends PageFlowController +{ +} Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp Sun Apr 24 18:20:49 2005 @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> +<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%> +<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%> + + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>${pageFlow.URI}</h3> + + Page 1 + <br/> + <br/> + <netui:anchor action="curPage">curPage</netui:anchor> + (will restore whatever query string was passed to the page originally) + <br/> + <netui:anchor action="goPage2">goPage2</netui:anchor> + <br/> + <br/> + param: <b>${param.foo}</b> + </netui:body> +</netui:html> + + + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp Sun Apr 24 18:20:49 2005 @@ -0,0 +1,26 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> +<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%> +<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%> + + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>${pageFlow.URI}</h3> + + Page 2 + <br/> + <br/> + <netui:anchor action="prevPage">prevPage</netui:anchor> + (will restore whatever query string was passed to the first page originally) + <br/> + <br/> + param: <b>${param.foo}</b> + </netui:body> +</netui:html> + + + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/tags/encoding/Controller.jpf Sun Apr 24 18:20:49 2005 @@ -49,16 +49,6 @@ @Jpf.Action( forwards = { - @Jpf.Forward( name = "success", path = "uriSyntax.jsp" ) - } - ) - public Forward navigateUriSyntax() - { - return new Forward("success"); - } - - @Jpf.Action( - forwards = { @Jpf.Forward( name = "success", path = "utf8.jsp" ) } ) Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=164512&r1=164511&r2=164512&view=diff ============================================================================== --- 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 Sun Apr 24 18:20:49 2005 @@ -5700,8 +5700,36 @@ </features> </test> <test> + <name>RerunPreviousSharedFlowAction</name> + <description>Test of rerunning a shared flow action using Jpf.NavigateTo.previousAction.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>PageFlow</feature> + <feature>NavigateTo</feature> + </features> + </test> + <test> <name>RestoreQueryString</name> <description>Test of the restoreQueryString attribute, which restores the query string on a navigateTo=previousAction.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>PageFlow</feature> + <feature>NavigateTo</feature> + </features> + </test> + <test> + <name>RestoreQueryStringToPage</name> + <description>Test of using the 'restoreQueryString' attribute with navigateTo=Jpf.NavigateTo.previousPage and navigateTo=Jpf.NavigateTo.currentPage.</description> <webapp>coreWeb</webapp> <categories> <category>bvt</category> Added: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml Sun Apr 24 18:20:49 2005 @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> + <ses:sessionName>RerunPreviousSharedFlowAction</ses:sessionName> + <ses:tester>rich</ses:tester> + <ses:startDate>24 Apr 2005, 04:47:54.131 PM MDT</ses:startDate> + <ses:description>Test of rerunning a shared flow action using Jpf.NavigateTo.previousAction.</ses:description> + <ses:tests> + <ses:test> + <ses:testNumber>1</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/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>D704C8A5CC85EB0F19AAF8C14B75B56B</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=D704C8A5CC85EB0F19AAF8C14B75B56B</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>user-agent</ses:name> + <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/index.jsp";> + </head> + <body> + <h3>/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf</h3> + + <a href="/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/sf.sharedAction.do">sf.sharedAction</a> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>2</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/pageFlowCore/rerunPreviousSharedFlowAction/sf.sharedAction.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>D704C8A5CC85EB0F19AAF8C14B75B56B</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=D704C8A5CC85EB0F19AAF8C14B75B56B</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/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp";> + </head> + <body> + <h3>/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf</h3> + + Success! + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/sf.prevAction.do">sf.prevAction</a> (should rerun 'sf.sharedAction' and stay on this page) + <br/> + <a href="/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/begin.do">start over</a> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>3</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/pageFlowCore/rerunPreviousSharedFlowAction/sf.prevAction.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>D704C8A5CC85EB0F19AAF8C14B75B56B</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=D704C8A5CC85EB0F19AAF8C14B75B56B</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/pageFlowCore/rerunPreviousSharedFlowAction/sf.sharedAction.do</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/success.jsp";> + </head> + <body> + <h3>/pageFlowCore/rerunPreviousSharedFlowAction/Controller.jpf</h3> + + Success! + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/sf.prevAction.do">sf.prevAction</a> (should rerun 'sf.sharedAction' and stay on this page) + <br/> + <a href="/coreWeb/pageFlowCore/rerunPreviousSharedFlowAction/begin.do">start over</a> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + </ses:tests> + <ses:endDate>24 Apr 2005, 04:48:05.147 PM MDT</ses:endDate> + <ses:testCount>3</ses:testCount> +</ses:recorderSession> Propchange: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RerunPreviousSharedFlowAction.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml?rev=164512&view=auto ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml Sun Apr 24 18:20:49 2005 @@ -0,0 +1,528 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> + <ses:sessionName>RestoreQueryStringToPage</ses:sessionName> + <ses:tester>rich</ses:tester> + <ses:startDate>23 Apr 2005, 07:41:44.622 PM MDT</ses:startDate> + <ses:description>Test of using the 'restoreQueryString' attribute with navigateTo=Jpf.NavigateTo.previousPage and navigateTo=Jpf.NavigateTo.currentPage.</ses:description> + <ses:tests> + <ses:test> + <ses:testNumber>1</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/pageFlowCore/restoreQueryStringToPage/Controller.jpf</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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>user-agent</ses:name> + <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 1 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/curPage.do">curPage</a> + (will restore whatever query string was passed to the page originally) + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/goPage2.do">goPage2</a> + <br/> + <br/> + param: <b></b> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>2</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/pageFlowCore/restoreQueryStringToPage/Controller.jpf</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters> + <ses:parameter> + <ses:name>foo</ses:name> + <ses:value>got it!</ses:value> + </ses:parameter> + </ses:parameters> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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>user-agent</ses:name> + <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 1 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/curPage.do">curPage</a> + (will restore whatever query string was passed to the page originally) + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/goPage2.do">goPage2</a> + <br/> + <br/> + param: <b>got it!</b> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>3</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/pageFlowCore/restoreQueryStringToPage/goPage2.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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/pageFlowCore/restoreQueryStringToPage/Controller.jpf?foo=got%20it!</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page2.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 2 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/prevPage.do">prevPage</a> + (will restore whatever query string was passed to the first page originally) + <br/> + <br/> + param: <b></b> + </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/pageFlowCore/restoreQueryStringToPage/prevPage.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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/pageFlowCore/restoreQueryStringToPage/goPage2.do</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 1 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/curPage.do">curPage</a> + (will restore whatever query string was passed to the page originally) + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/goPage2.do">goPage2</a> + <br/> + <br/> + param: <b>got it!</b> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>5</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/pageFlowCore/restoreQueryStringToPage/curPage.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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/pageFlowCore/restoreQueryStringToPage/prevPage.do</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 1 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/curPage.do">curPage</a> + (will restore whatever query string was passed to the page originally) + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/goPage2.do">goPage2</a> + <br/> + <br/> + param: <b>got it!</b> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + <ses:test> + <ses:testNumber>6</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/pageFlowCore/restoreQueryStringToPage/curPage.do</ses:uri> + <ses:method>GET</ses:method> + <ses:parameters/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>ECE25D0E00A5661ED56E4DEC79802116</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=ECE25D0E00A5661ED56E4DEC79802116</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/pageFlowCore/restoreQueryStringToPage/curPage.do</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.7) Gecko/20050414 Firefox/1.0.3</ses:value> + </ses:header> + </ses:headers> + </ses:request> + <ses:response> + <ses:statusCode>200</ses:statusCode> + <ses:reason/> + <ses:responseBody><![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> + + <head> + <base href="http://localhost:8080/coreWeb/pageFlowCore/restoreQueryStringToPage/page1.jsp";> + </head> + <body> + <h3>/pageFlowCore/restoreQueryStringToPage/Controller.jpf</h3> + + Page 1 + <br/> + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/curPage.do">curPage</a> + (will restore whatever query string was passed to the page originally) + <br/> + <a href="/coreWeb/pageFlowCore/restoreQueryStringToPage/goPage2.do">goPage2</a> + <br/> + <br/> + param: <b>got it!</b> + </body> + +</html>]]></ses:responseBody> + </ses:response> + </ses:test> + </ses:tests> + <ses:endDate>23 Apr 2005, 07:42:29.617 PM MDT</ses:endDate> + <ses:testCount>6</ses:testCount> +</ses:recorderSession> Propchange: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RestoreQueryStringToPage.xml ------------------------------------------------------------------------------ svn:eol-style = native
