Author: dolander Date: Tue Dec 7 09:16:00 2004 New Revision: 110112 URL: http://svn.apache.org/viewcvs?view=rev&rev=110112 Log: Reworking how the name and id attributes are generated for all HTML tags. Output name and id attributes for controls Start of the JavaScript support for a name and id lookup namespace.
Updated test results because we now output both a name and id for HTML Controls Added: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlControlState.java Removed: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlDataSourceState.java Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/IScriptReporter.java Tue Dec 7 09:16:00 2004 @@ -65,6 +65,9 @@ */ void addTagId(String tagId, String tagName); + void addTagIdMappings(String tagId, String realId, String realName); + + /** * This method will indicate that the ScriptReporter is supporting runAtClient features */ Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/AnchorBase.java Tue Dec 7 09:16:00 2004 @@ -341,8 +341,10 @@ // we assume that tagId will over have override id if both // are defined. - if (tagId != null) { - idScript = renderTagId(_state, null, true, false); + if (tagId != null) + { + _state.id = tagId; + idScript = renderNameAndId(_state,null); } else { _state.id = id; @@ -418,7 +420,7 @@ } } - // if the user override the onclick we will ignor this + // if the user override the onclick we will ignore this if (_state.onClick == null && _formSubmit && formAction != null) { String realFormName = getRealFormName(); _state.onClick = jsu.writeAnchorFormSubmitAction(realFormName, _state.href); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Button.java Tue Dec 7 09:16:00 2004 @@ -21,6 +21,7 @@ import org.apache.beehive.netui.tags.HtmlUtils; import org.apache.beehive.netui.tags.IHtmlAccessable; import org.apache.beehive.netui.tags.internal.PageFlowTagUtils; +import org.apache.beehive.netui.tags.ByRef; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.InputSubmitTag; import org.apache.beehive.netui.tags.rendering.TagRenderingBase; @@ -228,6 +229,7 @@ // Generate an HTML element _state.disabled = isDisabled(); + ByRef ref = new ByRef(); if (_action != null) { boolean isAction = PageFlowTagUtils.isAction(request, response, pageContext.getServletContext(), _action); if (isAction) { @@ -241,7 +243,8 @@ _state.name = buttonOutput; // don't write the id attribute - idScript = renderTagId(_state, buttonOutput, false, true); + Form parentForm = getNearestForm(); + idScript = renderNameAndId(_state, parentForm); } else { // set the error because the action is invalid @@ -249,7 +252,7 @@ } } else { - idScript = renderTagId(_state, null, true, true); + idScript = renderNameAndId(_state, null); } // report any errors that may have been generated. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/CheckBox.java Tue Dec 7 09:16:00 2004 @@ -264,7 +264,7 @@ return reportAndExit(EVAL_PAGE); ByRef ref = new ByRef(); - createName(_state, ref, OLDVALUE_SUFFIX); + nameHtmlControl(_state, ref); String hiddenParamName = _state.name + OLDVALUE_SUFFIX; ServletRequest req = pageContext.getRequest(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/FileUpload.java Tue Dec 7 09:16:00 2004 @@ -229,21 +229,7 @@ // Create the state for the input tag. ByRef ref = new ByRef(); - createName(_state, ref, null); - //String realName = doNaming(null); - //if (_dataSource != null) { - // _state.name = realName; - //} - - //String idScript = null; - //String tagId = getTagId(); - //if (tagId != null) { - // Form parentForm = getNearestForm(); - // if (parentForm != null) { - // parentForm.addTagID(tagId, _state.); - // } - // idScript = addTagIdMapping(tagId, realName); - //} + nameHtmlControl(_state, ref); if (hasErrors()) return reportAndExit(EVAL_PAGE); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Hidden.java Tue Dec 7 09:16:00 2004 @@ -156,7 +156,7 @@ // Create an appropriate "input" element based on our parameters ByRef ref = new ByRef(); - createName(_state, ref, null); + nameHtmlControl(_state, ref); if (_value != null) { StringBuilder sb = new StringBuilder(_value.length() + 16); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java Tue Dec 7 09:16:00 2004 @@ -17,15 +17,12 @@ */ package org.apache.beehive.netui.tags.html; -import org.apache.beehive.netui.tags.AbstractClassicTag; -import org.apache.beehive.netui.tags.IAttributeConsumer; -import org.apache.beehive.netui.tags.IHtmlAttrs; -import org.apache.beehive.netui.tags.IHtmlIdWriter; +import org.apache.beehive.netui.tags.*; +import org.apache.beehive.netui.tags.rendering.AbstractHtmlControlState; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender; import org.apache.beehive.netui.util.Bundle; -import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; @@ -492,6 +489,7 @@ * @param addToForm * @return String */ + /* protected final String renderTagId(AbstractHtmlState state, String realName, boolean outputAsId, boolean addToForm) { assert (state != null) : "Parameter 'state' must not be null."; @@ -519,6 +517,67 @@ return idScript; } + */ + + + /** + * Assumptions: + * <ul> + * <li>The state.name must be fully formed or the "real name" of the form.</li> + * <li>The state.id is the tagId value set on the tag and <b>has not</b> be rewritten yet to form the "real id"</li> + * </ul> + * @param state + * @param parentForm + * @return + */ + protected final String renderNameAndId(AbstractHtmlState state, Form parentForm) + { + //System.err.println("NameAndId:" + state.id); + if (state.id == null) + return null; + + boolean ctrlState = (state instanceof AbstractHtmlControlState); + + // form keeps track of this so that it can add this control to it's focus map + if (parentForm != null && ctrlState) { + parentForm.addTagID(state.id, ((AbstractHtmlControlState) state).name); + } + + // rewrite the id + String id = state.id; + state.id = rewriteName(id); + + // Find out if there is an Id writer... + //IHtmlIdWriter idWriter = getNearestIdWriter(); + //if (idWriter != null) { + + // map the tagId to the real id + //String idScript = addTagIdMappings(id, state.id, state.name); + + // @todo: add this back under the compat javascript flag + // add the state mapping + String idScript = null; + if (!ctrlState) { + //System.err.println("adding Id:" + id + " " + state.id); + idScript = addTagIdMapping(id, state.id); + } + else { + AbstractHtmlControlState cState = (AbstractHtmlControlState) state; + //System.err.println("adding Id:" + id + " " + cState.name + " " + cState.id); + if (cState.name != null) + idScript = addTagIdMapping(id, cState.name); + else + idScript = addTagIdMapping(id, state.id); + } + //if (idScript != null) + // javaScript.setRef(idScript); + return idScript; + //} + + //System.out.println("Writting:" + id + " " + state.id); + //String idScript = addTagIdMapping(id, state.id); + //return idScript; + } /** * Free the state variables of this base class. @@ -552,6 +611,24 @@ StringBuilder sb = new StringBuilder(32); StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb); jsu.getTagIdMapping(tagId, value, writer); + return sb.toString(); + } + + protected String addTagIdMappings(String tagId, String realId, String realName) + { + IScriptReporter scriptReporter = getScriptReporter(); + if (scriptReporter != null) { + scriptReporter.addTagIdMappings(tagId, realId, realName); + return null; + } + + // without a scripRepoter we need to create the actual + // JavaScript that will be written out + JavaScriptUtils jsu = getJavaScriptUtils((HttpServletRequest) pageContext.getRequest()); + StringBuilder sb = new StringBuilder(32); + StringBuilderRenderAppender writer = new StringBuilderRenderAppender(sb); + // @todo: need to do this correctly this needs to map to the other javascript + jsu.getTagIdMapping(tagId, realId, writer); return sb.toString(); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlDataSourceTag.java Tue Dec 7 09:16:00 2004 @@ -21,7 +21,7 @@ import org.apache.beehive.netui.tags.ExpressionHandling; import org.apache.beehive.netui.tags.IHtmlIdWriter; import org.apache.beehive.netui.tags.ByRef; -import org.apache.beehive.netui.tags.rendering.AbstractHtmlDataSourceState; +import org.apache.beehive.netui.tags.rendering.AbstractHtmlControlState; import javax.servlet.jsp.JspException; import java.util.List; @@ -112,50 +112,66 @@ } /** - * This method will create the name of the form element. The HTML tags support two forms of names, - * if ID transparency is turned on, then we will either use the id of the tag or generate a unique name. - * If ID transparency is turned off, then we use the expression as the name of the element. In some cases, - * a tag may need to write out a hidden field with additional information. If the - * hiddenSuffix is passed and ID transarency is on, the "name" + hiddenSuffix will also - * be written to the ID map. - * @param state - * @param javaScript - * @param hiddenSuffix hiddenSuffix a value of a hidden field that will be written to the - * ID map if an ID Map is being generated. - * @throws JspException + * This method will create the name of the form element (HTML Control) that has a name. The + * <b>name</b> attribute represent the "control name" for the control. This name is scoped + * into the form element. In addition, a control may have a <b>id</b> attribute which is + * specified by setting the <b>tagId</b>. These two value are set in this routine. The name + * is always the expression mapping the data to it's backing element and is conotrolled + * by the optional naming chain provided by the tag. The <b>tagId</b> specifies the <b>id</b> + * attribute. If this is present then we write out a JavaScript that allows mapping + * the tagId set on the tag to both the real <b>id</b> value and also the <b>name</b> value. + * The <b>id</b> is formed by passing the <b>tagId</b> to the URL rewritter service. + * @param state The tag state structure. This contains both the name and id attributes. The + * id attribute should be set with the initial value from the tagId. + * @param javaScript A ByRef element that will contain any JavaScript that should be written out + * by the calling tag. A value is returned only if tagId is set and there is not IScriptReporter + * found. + * @throws JspException Pass through the exception from applyNamingChain. */ - protected void createName(AbstractHtmlDataSourceState state, ByRef javaScript, String hiddenSuffix) + protected void nameHtmlControl(AbstractHtmlControlState state, ByRef javaScript) throws JspException { assert (javaScript != null) : "paramater 'javaScript' may not be null"; assert (state != null) : "parameter 'state' may not be null"; assert (_dataSource != null) : "dataSource is Null"; - // create the expression + // create the expression (name) String datasource = "{" + _dataSource + "}"; - String expr = applyNamingChain(datasource); + state.name = applyNamingChain(datasource); - // figure out how the id is being written out + Form parentForm = getNearestForm(); + String idScript = renderNameAndId(state,parentForm); + if (idScript != null) + javaScript.setRef(idScript); + + // if there is an id, we need to create the javascript and form + // focus support for it. + /* IHtmlIdWriter idWriter = getNearestIdWriter(); if (idWriter != null) { String id = getTagId(); if (id != null) { // form keeps track of this so that it can add this control to it's focus map + // @todo: should this be moved outside of the idWriter? Seems like it should Form parentForm = getNearestForm(); if (parentForm != null) - parentForm.addTagID(state.id, expr); + parentForm.addTagID(state.id, state.name); + // rewrite the id state.id = rewriteName(id); - String idScript = addTagIdMapping(state.id, expr); + // map the tagId to the real id + //String idScript = addTagIdMappings(id, state.id, state.name); + + // @todo: add this back under the compat javascript flag + // add the state mapping + String idScript = addTagIdMapping(state.id, state.name); if (idScript != null) javaScript.setRef(idScript); } - state.id = null; } - - state.name = expr; + */ } /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Image.java Tue Dec 7 09:16:00 2004 @@ -51,7 +51,6 @@ private ImageTag.State _state = new ImageTag.State(); private String _location = null; // The location hash to append to the url. - private String _id = null; private Map _params; /** @@ -322,14 +321,9 @@ // we assume that tagId will over have override id if both // are defined. // @todo: should we move the tagId stuff to the base class? - String tagId = getTagId(); - if (tagId != null) { - String realName = rewriteName(tagId); - scriptId = addTagIdMapping(tagId, realName); - _state.id = realName; - } - else if (_id != null) { - _state.id = _id; + //String tagId = getTagId(); + if (_state.id != null) { + scriptId = renderNameAndId(_state, null); } WriteRenderAppender writer = new WriteRenderAppender(pageContext); @@ -356,7 +350,6 @@ _state.clear(); _location = null; - _id = null; _params = null; } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ImageButton.java Tue Dec 7 09:16:00 2004 @@ -66,7 +66,6 @@ private String _page; // The module-relative URI of the image. private String _rolloverImage; // The roll-over image of the ImageButton. - private String _id; /** * Return the name of the Tag. @@ -291,16 +290,13 @@ public int doEndTag() throws JspException { ServletRequest req = pageContext.getRequest(); - String scriptId = null; + String idScript = null; String tmp = null; // we assume that tagId will over have override id if both // are defined. if (getTagId() != null) { - scriptId = renderTagId(_state, null, true, false); - } - else { - _state.id = _id; + idScript = renderNameAndId(_state,null); } HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); @@ -352,8 +348,8 @@ br.doStartTag(writer, _state); br.doEndTag(writer); - if (scriptId != null) - write(scriptId); + if (idScript != null) + write(idScript); // Evaluate the remainder of this page localRelease(); @@ -371,7 +367,6 @@ _page = null; _rolloverImage = null; - _id = null; } /** Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java Tue Dec 7 09:16:00 2004 @@ -119,9 +119,9 @@ return; } - public String writeIdMap(IScriptReporter scriptRepoter, String entries) + public String writeIdMap(IScriptReporter scriptRepoter, String mapObj, String entries) { - String s = getString("idMappingTable", new Object[]{entries}); + String s = getString(mapObj, new Object[]{entries}); if (scriptRepoter != null) { scriptRepoter.addScriptCode(s); return null; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Label.java Tue Dec 7 09:16:00 2004 @@ -114,18 +114,13 @@ // we assume that tagId will over have override id if both // are defined. - String tagId = getTagId(); - if (tagId != null) { - String realName = rewriteName(tagId); - scriptId = addTagIdMapping(tagId, realName); - _state.id = realName; + //String tagId = getTagId(); + if (_state.id != null) { + scriptId = renderNameAndId(_state, null); } - if (hasErrors()) { - reportErrors(); - localRelease(); - return EVAL_PAGE; - } + if (hasErrors()) + return reportAndExit(EVAL_PAGE); WriteRenderAppender writer = new WriteRenderAppender(pageContext); TagRenderingBase br = TagRenderingBase.Factory.getRendering(TagRenderingBase.LABEL_TAG, req); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java Tue Dec 7 09:16:00 2004 @@ -69,6 +69,8 @@ private ArrayList _codeBlocks; private HashMap _initNames; private HashMap _idMap; + private HashMap _idToIdMap; + private HashMap _idToNameMap; private HashMap _anchorRewriters; private boolean _runAtClient = false; private boolean _writeScript = false; @@ -133,6 +135,22 @@ _idMap.put(tagId, tagName); } + public void addTagIdMappings(String tagId, String realId, String realName) + { + assert (tagId != null) : "The parameter 'tagId' must not be null"; + assert (realId != null) : "The parameter 'realId' must not be null"; + + if (_idToIdMap == null) + _idToIdMap = new HashMap(); + _idToIdMap.put(tagId, realId); + + if (realName != null) { + if (_idToNameMap == null) + _idToNameMap = new HashMap(); + _idToNameMap.put(tagId,realName); + } + } + /** * This method will add a new method to the initialization code. * @param varClass the name of the variable containing the javascript feature @@ -382,7 +400,34 @@ protected void writeScriptBlock(AbstractRenderAppender sb) { boolean script = false; - processIdMap(); + JavaScriptUtils jsu = HtmlBaseTag.getJavaScriptUtils((HttpServletRequest) pageContext.getRequest()); + + // process the map + // @todo: need to make the writeNetuiNameFunction deal with different functions + + boolean writeFunctions = false; + String val = processIdMap(_idMap, "idMappingEntry"); + if (val != null) { + jsu.writeIdMap(this, "idMappingTable", val); + writeFunctions = true; + } + + val = processIdMap(_idToIdMap, "tagIdMappingEntry"); + if (val != null) { + jsu.writeIdMap(this, "tagIdMappingTable", val); + writeFunctions = true; + } + + val = processIdMap(_idToNameMap, "tagIdNameMappingEntry"); + if (val != null) { + jsu.writeIdMap(this, "tagIdNameMappingTable", val); + writeFunctions = true; + } + + if (writeFunctions) { + jsu.writeNetuiNameFunctions(this); + } + if (_codeBlocks != null && _codeBlocks.size() > 0) { if (!script) { @@ -422,25 +467,23 @@ /////////////////////////////////// Private Support //////////////////////////////////// - private void processIdMap() + private String processIdMap(HashMap map, String mapEntry) { // if no map or empty then return - if (_idMap == null || _idMap.size() == 0) - return; + if (map == null || map.size() == 0) + return null; StringBuilder results = new StringBuilder(128); - JavaScriptUtils jsu = HtmlBaseTag.getJavaScriptUtils((HttpServletRequest) pageContext.getRequest()); - Iterator ids = _idMap.keySet().iterator(); + Iterator ids = map.keySet().iterator(); while (ids.hasNext()) { Object id = ids.next(); - Object value = _idMap.get(id); + Object value = map.get(id); if (_scopeId != null) id = _scopeId + "__" + id; - String entry = JavaScriptUtils.getString("idMappingEntry", new Object[]{id, value}); + String entry = JavaScriptUtils.getString(mapEntry, new Object[]{id, value}); results.append(entry); } - jsu.writeIdMap(this, results.toString()); - jsu.writeNetuiNameFunctions(this); + return results.toString(); } /////////////////////////////////// Local Release //////////////////////////////////// @@ -463,7 +506,12 @@ _codeBlocks.clear(); if (_initNames != null) _initNames.clear(); + if (_idMap != null) _idMap.clear(); + if (_idToIdMap != null) + _idToIdMap.clear(); + if (_idToNameMap != null) + _idToNameMap.clear(); } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Select.java Tue Dec 7 09:16:00 2004 @@ -729,7 +729,7 @@ //Create hidden field for state tracking ByRef ref = new ByRef(); - createName(_state, ref, null); + nameHtmlControl(_state, ref); if (hasErrors()) return reportAndExit(EVAL_PAGE); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/SelectOption.java Tue Dec 7 09:16:00 2004 @@ -62,7 +62,6 @@ private String _text; // The message text to be displayed to the user for this tag (if any) private boolean _disabled; // Is this option disabled? private String _value; // The server value for this option - private String _id; private String _repeatingType; // The type of the repeater. private boolean _hasError = false; // Hack to avoid registering the same error in the SelectOption AND the Select. @@ -273,14 +272,8 @@ // we assume that tagId will over have override id if both // are defined. - String tagId = getTagId(); - if (tagId != null) { - String realName = rewriteName(tagId); - scriptId = addTagIdMapping(tagId, realName); - _state.id = realName; - } - else if (_id != null) { - _state.id = _id; + if (_state.id != null) { + scriptId = renderNameAndId(_state, null); } _state.disabled = _disabled; @@ -324,8 +317,6 @@ _disabled = false; _value = null; _hasError = false; - _id = null; - //_optionValue = null; } private boolean isRenderable(Select sel) Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Span.java Tue Dec 7 09:16:00 2004 @@ -91,7 +91,6 @@ private static final Logger logger = Logger.getInstance(Span.class); private SpanTag.State _state = new SpanTag.State(); - private String _id; /** * Return the name of the Tag. @@ -149,14 +148,8 @@ // we assume that tagId will over have override id if both // are defined. - String tagId = getTagId(); - if (tagId != null) { - String realName = rewriteName(tagId); - scriptId = addTagIdMapping(tagId, realName); - _state.id = realName; - } - else if (_id != null) { - _state.id = _id; + if (_state.id != null) { + scriptId = renderNameAndId(_state, null); } // push the evaluated expression when we are not client side bound... @@ -198,8 +191,6 @@ protected void localRelease() { super.localRelease(); - _state.clear(); - _id = null; } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextArea.java Tue Dec 7 09:16:00 2004 @@ -170,7 +170,7 @@ // setup the rest of the state. ByRef ref = new ByRef(); - createName(_state, ref, null); + nameHtmlControl(_state, ref); _state.disabled = isDisabled(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/TextBox.java Tue Dec 7 09:16:00 2004 @@ -248,7 +248,7 @@ // Create the state for the input tag ByRef ref = new ByRef(); - createName(_state, ref, null); + nameHtmlControl(_state, ref); _state.disabled = isDisabled(); Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/javaScript.properties Tue Dec 7 09:16:00 2004 @@ -60,9 +60,34 @@ \ var netui_names = new Object();\n\ {0}\n +# JavaScript that will become the mapping between the tagId and the real id +tagIdMappingTable=\ +// Build the netui_names table to map the tagId attributes\n\ +// to the real id written into the HTML\n\ +if (netui_tagIdMap == null)\n\ +\ var netui_tagIdMap = new Object();\n\ +{0}\n + +# JavaScript that will become the mapping between the tagId and the real name +tagIdNameMappingTable=\ +// Build the netui_names table to map the tagId attributes\n\ +// to the real id written into the HTML\n\ +if (netui_tagIdNameMap == null)\n\ +\ var netui_tagIdNameMap = new Object();\n\ +{0}\n + + # this is the individual entry into the mapping table for each mapping idMappingEntry=\ netui_names.{0}="{1}"\n + +# This is a mapping between tagId and id +tagIdMappingEntry=\ +netui_tagIdMap.{0}="{1}"\n + +# This is a mapping between tagId and name +tagIdNameMappingEntry=\ +netui_tagIdNameMap.{0}="{1}"\n # simple method to return the real id for the a scoped tagId getNetuiTagNameAdvanced=\ Added: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlControlState.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlControlState.java?view=auto&rev=110112 ============================================================================== --- (empty file) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlControlState.java Tue Dec 7 09:16:00 2004 @@ -0,0 +1,20 @@ +package org.apache.beehive.netui.tags.rendering; + +/** + * This class adds the name attribute to the base HTML state. The name attribute + * is used by the HTML Controls as the control name. For all successful controls + * durinig a form post the name and value are posted back. + */ +abstract public class AbstractHtmlControlState extends AbstractHtmlState +{ + public String name; + + /** + * Initialize the state values. + */ + public void clear() + { + super.clear(); + name = null; + } +} Deleted: /incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlDataSourceState.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/AbstractHtmlDataSourceState.java?view=auto&rev=110111 ============================================================================== Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputBooleanTag.java Tue Dec 7 09:16:00 2004 @@ -35,7 +35,7 @@ xhtml.put(INPUT_BOOLEAN_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public String type; public boolean disabled; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputFileTag.java Tue Dec 7 09:16:00 2004 @@ -34,7 +34,7 @@ xhtml.put(INPUT_FILE_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public boolean readonly; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputHiddenTag.java Tue Dec 7 09:16:00 2004 @@ -34,7 +34,7 @@ xhtml.put(INPUT_HIDDEN_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public String value; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputSubmitTag.java Tue Dec 7 09:16:00 2004 @@ -35,11 +35,10 @@ xhtml.put(INPUT_SUBMIT_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlState + public static class State extends AbstractHtmlControlState { public String type; public boolean disabled; - public String name; public String value; public void clear() @@ -48,7 +47,6 @@ type = null; disabled = false; - name = null; value = null; } } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/InputTextTag.java Tue Dec 7 09:16:00 2004 @@ -36,7 +36,7 @@ xhtml.put(INPUT_TEXT_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public String type; public boolean disabled; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/SelectTag.java Tue Dec 7 09:16:00 2004 @@ -35,7 +35,7 @@ xhtml.put(SELECT_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public boolean disabled; public boolean multiple; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java&r1=110111&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/rendering/TextAreaTag.java Tue Dec 7 09:16:00 2004 @@ -35,7 +35,7 @@ xhtml.put(TEXT_AREA_TAG, new XhtmlRendering()); } - public static class State extends AbstractHtmlDataSourceState + public static class State extends AbstractHtmlControlState { public int rows; public int cols; Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/B34263.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>B34263</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:32:25.683 PM MDT</ses:startDate> + <ses:startDate>04 Dec 2004, 09:28:03.795 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/bugs/b34263/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>8C4C4AD4D25F31DBE4D46D004C53B35E</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=8C4C4AD4D25F31DBE4D46D004C53B35E; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7f37</ses:value> + <ses:value>-2822f2fd:1009eb4ff6e:-7a0d</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -67,7 +76,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Bug 34263 </title> @@ -89,7 +98,7 @@ </tr> </table> <input type="submit" id="NameEnter" value="Enter"> - <input type="submit" name="actionOverride:DeleteName" value="Delete"> + <input type="submit" name="actionOverride:DeleteName" id="NameDelete" value="Delete"> </form> <form name="search" id="FormTwo" action="/coreWeb/bugs/b34263/EnterSearch.do" method="post"> <table> @@ -101,7 +110,7 @@ </tr> </table> <input type="submit" id="SearchEnter" value="Enter Search"> - <input type="submit" name="actionOverride:EnterAdvancedSearch" value="Advanced Search..."> + <input type="submit" name="actionOverride:EnterAdvancedSearch" id="SearchAdvanced" value="Advanced Search..."> </form> <form id="FormThree" action="/coreWeb/bugs/b34263/begin.do" method="post"> <table></table> @@ -179,9 +188,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:32:27.295 PM MDT</ses:endDate> + <ses:endDate>04 Dec 2004, 09:28:07.650 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/ButtonSubmitTagId.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>ButtonSubmitTagId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:34:41.989 PM MDT</ses:startDate> + <ses:startDate>04 Dec 2004, 09:30:42.433 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/tags/buttonSubmitTagId/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>8C4C4AD4D25F31DBE4D46D004C53B35E</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=8C4C4AD4D25F31DBE4D46D004C53B35E; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7e77</ses:value> + <ses:value>-2822f2fd:1009eb4ff6e:-7938</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -67,7 +76,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Bug 34263 </title> @@ -89,7 +98,7 @@ </tr> </table> <input type="submit" id="NameEnter" value="Enter"> - <input type="submit" name="actionOverride:DeleteName" value="Delete"> + <input type="submit" name="actionOverride:DeleteName" id="NameDelete" value="Delete"> </form> <hr /> <span>begin</span> @@ -168,7 +177,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6A091075362331B112002C36DF382B1A</ses:value> + <ses:value>8C4C4AD4D25F31DBE4D46D004C53B35E</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -202,7 +211,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6A091075362331B112002C36DF382B1A; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=8C4C4AD4D25F31DBE4D46D004C53B35E; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -218,7 +227,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7e77</ses:value> + <ses:value>-2822f2fd:1009eb4ff6e:-7938</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -238,7 +247,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Bug 34263 </title> @@ -260,7 +269,7 @@ </tr> </table> <input type="submit" id="NameEnter" value="Enter"> - <input type="submit" name="actionOverride:DeleteName" value="Delete"> + <input type="submit" name="actionOverride:DeleteName" id="NameDelete" value="Delete"> </form> <hr /> <span>EnterName</span> @@ -314,7 +323,7 @@ </html></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>pass</ses:testStatus> + <ses:testStatus>fail</ses:testStatus> </ses:testResults> </ses:test> <ses:test> @@ -343,7 +352,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6A091075362331B112002C36DF382B1A</ses:value> + <ses:value>8C4C4AD4D25F31DBE4D46D004C53B35E</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -377,7 +386,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6A091075362331B112002C36DF382B1A; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=8C4C4AD4D25F31DBE4D46D004C53B35E; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -393,7 +402,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7e77</ses:value> + <ses:value>-2822f2fd:1009eb4ff6e:-7938</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -413,7 +422,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Bug 34263 </title> @@ -435,7 +444,7 @@ </tr> </table> <input type="submit" id="NameEnter" value="Enter"> - <input type="submit" name="actionOverride:DeleteName" value="Delete"> + <input type="submit" name="actionOverride:DeleteName" id="NameDelete" value="Delete"> </form> <hr /> <span>DeleteName</span> @@ -489,13 +498,13 @@ </html></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>pass</ses:testStatus> + <ses:testStatus>fail</ses:testStatus> </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:34:43.561 PM MDT</ses:endDate> + <ses:endDate>04 Dec 2004, 09:30:44.165 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>3</ses:testCount> - <ses:passedCount>2</ses:passedCount> - <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> + <ses:passedCount>0</ses:passedCount> + <ses:failedCount>3</ses:failedCount> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScript.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>JsAllScript</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>01 Nov 2004, 09:52:43.729 PM MST</ses:startDate> + <ses:startDate>03 Dec 2004, 09:58:22.981 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -88,13 +88,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -220,7 +220,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -254,7 +254,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -270,7 +270,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -324,7 +324,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -346,7 +346,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -362,7 +362,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -394,13 +394,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -526,7 +526,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -560,7 +560,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -576,7 +576,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -630,7 +630,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -652,7 +652,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -668,7 +668,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -700,13 +700,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -832,7 +832,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -866,7 +866,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -882,7 +882,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -936,7 +936,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -958,7 +958,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -974,7 +974,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1006,13 +1006,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1138,7 +1138,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1172,7 +1172,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1188,7 +1188,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1242,7 +1242,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1264,7 +1264,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1280,7 +1280,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1312,13 +1312,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1448,7 +1448,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1482,7 +1482,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1498,7 +1498,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1552,7 +1552,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1574,7 +1574,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1590,7 +1590,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cea</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ce8</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1622,13 +1622,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1729,7 +1729,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>01 Nov 2004, 09:52:48.276 PM MST</ses:endDate> + <ses:endDate>03 Dec 2004, 09:58:26.726 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>11</ses:testCount> <ses:passedCount>5</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsAllScriptHtml.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>JsAllScriptHtml</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:37:49.769 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 09:58:26.866 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/javascript/jsAllScriptHtml/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -71,7 +80,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -83,13 +92,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -214,7 +223,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -248,7 +257,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -264,7 +273,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -289,7 +298,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -322,7 +331,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -344,7 +353,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -360,7 +369,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -384,7 +393,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -396,13 +405,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -527,7 +536,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -561,7 +570,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -577,7 +586,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -602,7 +611,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -635,7 +644,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -657,7 +666,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -673,7 +682,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -697,7 +706,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -709,13 +718,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -840,7 +849,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -874,7 +883,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -890,7 +899,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -915,7 +924,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -948,7 +957,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -970,7 +979,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -986,7 +995,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -1010,7 +1019,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -1022,13 +1031,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1153,7 +1162,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1187,7 +1196,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1203,7 +1212,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -1228,7 +1237,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -1261,7 +1270,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1283,7 +1292,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1299,7 +1308,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -1323,7 +1332,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -1335,13 +1344,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1470,7 +1479,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1504,7 +1513,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1520,7 +1529,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -1545,7 +1554,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -1578,7 +1587,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8C65D752D365502AB70A5E6E014351E1</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1600,7 +1609,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8C65D752D365502AB70A5E6E014351E1; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1616,7 +1625,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d7f</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cdc</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -1640,7 +1649,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -1652,13 +1661,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1758,9 +1767,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:37:53.595 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 09:58:31.994 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>11</ses:testCount> <ses:passedCount>5</ses:passedCount> <ses:failedCount>6</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsFind.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>JsFind</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>30 Jun 2004, 05:14:31.940 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 09:58:32.084 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>JSESSIONID=4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>5b1a0f2d:fd77517589:-5db3</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cd0</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -75,7 +75,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -87,7 +87,7 @@ <td>Type:</td> <td> <input type="hidden" name="wlw-select_key:{actionForm.type}OldValue" value="true"> -<select name="wlw-select_key:{actionForm.type}"> +<select name="wlw-select_key:{actionForm.type}" id="select"> <option value="value1">Foo Value</option> <option value="value2">Bar Value</option> <option value="value3">Baz Value</option></select> @@ -178,7 +178,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -212,7 +212,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>JSESSIONID=4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -228,7 +228,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>5b1a0f2d:fd77517589:-5db3</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cd0</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -247,7 +247,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -259,7 +259,7 @@ <td>Type:</td> <td> <input type="hidden" name="wlw-select_key:{actionForm.type}OldValue" value="true"> -<select name="wlw-select_key:{actionForm.type}"> +<select name="wlw-select_key:{actionForm.type}" id="select"> <option value="value1">Foo Value</option> <option value="value2" selected>Bar Value</option> <option value="value3">Baz Value</option></select> @@ -350,7 +350,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -384,7 +384,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>JSESSIONID=4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -400,7 +400,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>5b1a0f2d:fd77517589:-5db3</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cd0</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -419,7 +419,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -431,7 +431,7 @@ <td>Type:</td> <td> <input type="hidden" name="wlw-select_key:{actionForm.type}OldValue" value="true"> -<select name="wlw-select_key:{actionForm.type}"> +<select name="wlw-select_key:{actionForm.type}" id="select"> <option value="value1">Foo Value</option> <option value="value2">Bar Value</option> <option value="value3" selected>Baz Value</option></select> @@ -522,7 +522,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -556,7 +556,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>JSESSIONID=4D7960D9AEF903AB88A76C63329B843C</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -572,7 +572,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>5b1a0f2d:fd77517589:-5db3</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cd0</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -591,7 +591,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -603,7 +603,7 @@ <td>Type:</td> <td> <input type="hidden" name="wlw-select_key:{actionForm.type}OldValue" value="true"> -<select name="wlw-select_key:{actionForm.type}"> +<select name="wlw-select_key:{actionForm.type}" id="select"> <option value="value1" selected>Foo Value</option> <option value="value2">Bar Value</option> <option value="value3">Baz Value</option></select> @@ -673,9 +673,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>30 Jun 2004, 05:14:31.990 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 09:58:34.067 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>4</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>4</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/JsNoContainers.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>JsNoContainers</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:37:56.689 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 09:58:34.147 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/javascript/jsNoContainers/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7d6e</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7ccb</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -77,7 +86,7 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> <script language="JavaScript" type="text/JavaScript"> <!-- @@ -118,7 +127,7 @@ <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> <script language="JavaScript" type="text/JavaScript"> <!-- @@ -206,9 +215,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:37:58.492 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 09:58:37.271 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RtexpTagId.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>RtexpTagId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:45:14.188 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 10:07:34.233 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/tags/rtexpTagId/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7a59</ses:value> + <ses:value>-29203c0f:10099d5dab1:-799f</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -71,7 +80,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -83,13 +92,13 @@ <tr valign="top"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="tagid1"> </td> </tr> <tr valign="top"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="tagid2"> </td> </tr> </table> @@ -172,7 +181,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>168CA455F80FEB4D97D3ED3FA1F677A5</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -206,7 +215,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=168CA455F80FEB4D97D3ED3FA1F677A5; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -222,7 +231,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-7a59</ses:value> + <ses:value>-29203c0f:10099d5dab1:-799f</ses:value> </ses:header> <ses:header> <ses:name>testrecorder.playback.testnumber</ses:name> @@ -246,7 +255,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -258,13 +267,13 @@ <tr valign="top"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" value="sdf"> + <input type="text" name="{actionForm.firstName}" id="tagid1" value="sdf"> </td> </tr> <tr valign="top"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" value="sdf"> + <input type="text" name="{actionForm.lastName}" id="tagid2" value="sdf"> </td> </tr> </table> @@ -322,13 +331,13 @@ </html></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>pass</ses:testStatus> + <ses:testStatus>fail</ses:testStatus> </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:45:15.780 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 10:07:35.935 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>2</ses:testCount> - <ses:passedCount>1</ses:passedCount> - <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> + <ses:passedCount>0</ses:passedCount> + <ses:failedCount>2</ses:failedCount> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TagIds.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>TagIds</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>24 Jul 2004, 05:46:42.535 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 10:09:20.373 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/tags/tagIds/Controller.jpf</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4b58bc9d:fdf37c62e7:-79fa</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7934</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -67,7 +76,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title> Web Application Page </title> @@ -78,13 +87,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> <tr> @@ -92,7 +101,7 @@ <td> &nbsp; <input type="hidden" name="wlw-select_key:{actionForm.type}OldValue" value="true"> -<select name="wlw-select_key:{actionForm.type}"><option id="opt1" value="Select Option One">Select Option One</option> +<select name="wlw-select_key:{actionForm.type}" id="select"><option id="opt1" value="Select Option One">Select Option One</option> <option id="opt2" value="Select Option Two">Select Option Two</option> <option id="opt3" value="Select Option Three">Select Option Three</option></select> </td> @@ -171,9 +180,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>24 Jul 2004, 05:46:44.188 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 10:09:23.538 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlFormLabel.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>XhtmlFormLabel</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>04 Aug 2004, 12:09:31.367 PM MDT</ses:startDate> + <ses:startDate>03 Dec 2004, 10:11:38.417 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/xhtml/goFormLabelTest.do</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> + </ses:cookie> + </ses:cookies> <ses:headers> <ses:header> <ses:name>accept</ses:name> @@ -34,6 +39,10 @@ <ses:value>Keep-Alive, TE</ses:value> </ses:header> <ses:header> + <ses:name>cookie</ses:name> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> + </ses:header> + <ses:header> <ses:name>cookie2</ses:name> <ses:value>$Version="1"</ses:value> </ses:header> @@ -47,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4c6bf002:fe2af42bb4:-7956</ses:value> + <ses:value>-29203c0f:10099d5dab1:-789a</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -62,7 +71,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";> -<head> + <head> <title>Form Label Tests</title> <style type="text/css"> .normal {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;} @@ -87,19 +96,19 @@ <tr valign="top"> <td><label for="labelOne" class="normal">Value Three:</label></td> <td> - <input type="text" name="{actionForm.valueOne}" /> + <input type="text" name="{actionForm.valueOne}" id="labelOne" /> </td> </tr> <tr valign="top"> <td><label for="labelTwo" class="normal">Value Two:</label></td> <td> - <input type="text" name="{actionForm.valueTwo}" /> + <input type="text" name="{actionForm.valueTwo}" id="labelTwo" /> </td> </tr> <tr valign="top"> <td><label for="labelThree" class="normal">Value Three:</label></td> <td> - <input type="text" name="{actionForm.valueThree}" /> + <input type="text" name="{actionForm.valueThree}" id="labelThree" /> </td> </tr> </table> @@ -157,7 +166,7 @@ </html></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>pass</ses:testStatus> + <ses:testStatus>fail</ses:testStatus> </ses:testResults> </ses:test> <ses:test> @@ -186,7 +195,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>8D39D81D42F98F8CD92151BAE64636D6</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -220,7 +229,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=8D39D81D42F98F8CD92151BAE64636D6; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -236,7 +245,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>4c6bf002:fe2af42bb4:-7956</ses:value> + <ses:value>-29203c0f:10099d5dab1:-789a</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -251,7 +260,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";> -<head> + <head> <title>Label Post Results</title> <style type="text/css"> .normal {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;} @@ -292,13 +301,13 @@ </html>]]></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>fail</ses:testStatus> + <ses:testStatus>pass</ses:testStatus> </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>04 Aug 2004, 12:09:32.989 PM MDT</ses:endDate> + <ses:endDate>03 Dec 2004, 10:11:43.104 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>2</ses:testCount> <ses:passedCount>1</ses:passedCount> <ses:failedCount>1</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr183774.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>Cr183774</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>02 Dec 2004, 08:03:55.138 AM MST</ses:startDate> + <ses:startDate>03 Dec 2004, 09:55:12.140 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>53CCBC14C91712D19F8038529D9E0367</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=53CCBC14C91712D19F8038529D9E0367; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -48,7 +48,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-5b08d1d5:100944b8a1e:-7e26</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7e26</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -71,8 +71,8 @@ result should be an id attribute set in the resulting html. No need to postback. <hr> <form name="fooForm" action="/coreWeb/bugs/cr183774/testAction.do" method="post"> - <input type="hidden" name="{actionForm.bar}" value=""> - <input type="hidden" name="{actionForm.foo}" value=""> + <input type="hidden" id="barId" name="{actionForm.bar}" value=""> + <input type="hidden" id="fooId" name="{actionForm.foo}" value=""> <input type="submit" value="TestAction"> </form> </body> @@ -128,7 +128,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>02 Dec 2004, 08:03:55.977 AM MST</ses:endDate> + <ses:endDate>03 Dec 2004, 09:55:13.843 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>1</ses:testCount> <ses:passedCount>0</ses:passedCount> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml?view=diff&rev=110112&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml&r1=110111&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml&r2=110112 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml Tue Dec 7 09:16:00 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>jsScriptScopeId</ses:sessionName> <ses:tester>Daryl</ses:tester> - <ses:startDate>01 Nov 2004, 09:53:00.984 PM MST</ses:startDate> + <ses:startDate>03 Dec 2004, 09:58:40.916 AM MST</ses:startDate> <ses:description>Daryl</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -40,7 +40,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cc5</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cc3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -91,13 +91,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -198,13 +198,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -291,7 +291,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -325,7 +325,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -341,7 +341,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cc5</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cc3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -396,7 +396,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -418,7 +418,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -434,7 +434,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cc5</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cc3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -469,13 +469,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -576,13 +576,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -665,7 +665,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -699,7 +699,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -715,7 +715,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cc5</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cc3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -770,7 +770,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>B33C5C2CB9C5BC5C22E5604B14C44D62</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -792,7 +792,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=ED52D198272AB96E24BF9839B645DF20; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=B33C5C2CB9C5BC5C22E5604B14C44D62; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -808,7 +808,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7cc5</ses:value> + <ses:value>-29203c0f:10099d5dab1:-7cc3</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -843,13 +843,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -950,13 +950,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}"> + <input type="text" name="{actionForm.lastName}" id="lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}"> + <input type="text" name="{actionForm.firstName}" id="firstName"> </td> </tr> </table> @@ -1010,7 +1010,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>01 Nov 2004, 09:53:04.399 PM MST</ses:endDate> + <ses:endDate>03 Dec 2004, 09:58:45.973 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>5</ses:testCount> <ses:passedCount>2</ses:passedCount>
