Author: dolander Date: Tue Jan 4 08:58:56 2005 New Revision: 124124 URL: http://svn.apache.org/viewcvs?view=rev&rev=124124 Log: Add support for scoping the tagId based upon the scopeId set in the script container. This is the first part of the change. The Form has not yet been changed and script container also needs an autogenerate attribute.
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.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/ScriptContainer.java incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.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/AbstractClassicTag.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java?view=diff&rev=124124&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r1=124123&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java&r2=124124 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/AbstractClassicTag.java Tue Jan 4 08:58:56 2005 @@ -19,21 +19,27 @@ import org.apache.beehive.netui.core.urls.URLRewriterService; import org.apache.beehive.netui.script.ExpressionEvaluationException; -import org.apache.beehive.netui.script.ExpressionEvaluator; +import org.apache.beehive.netui.tags.html.ScriptContainer; import org.apache.beehive.netui.tags.naming.FormDataNameInterceptor; import org.apache.beehive.netui.tags.naming.IndexedNameInterceptor; import org.apache.beehive.netui.tags.naming.NameInterceptor; import org.apache.beehive.netui.util.Bundle; import org.apache.beehive.netui.util.logging.Logger; import org.apache.struts.Globals; -import org.apache.struts.util.ResponseUtils; +import org.apache.struts.util.RequestUtils; import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.PageContext; import javax.servlet.jsp.tagext.BodyTagSupport; import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.util.*; +import javax.servlet.jsp.tagext.Tag; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; /** * AbstractBaseTag is the base tag for most of the NetUI tags. This tag provides default behavior @@ -133,11 +139,12 @@ */ protected final void write(String string) { + JspWriter writer = pageContext.getOut(); try { - ResponseUtils.write(pageContext, string); - } - catch (JspException e) { + writer.print(string); + } catch (IOException e) { logger.error(Bundle.getString("Tags_WriteException"), e); + RequestUtils.saveException((PageContext) pageContext, e); } } @@ -266,6 +273,28 @@ final protected String rewriteName(String name) { return URLRewriterService.rewriteName(pageContext.getServletContext(), pageContext.getRequest(), name); + } + + /** + * This method will generate a real id based upon the passed in tagId. The generated + * id will be constucted by searching upward for all the script containers that have a + * scope id set. These will form a fully qualified id. + * @param tagId The base tagId set on a tag + * @return an id value formed by considering all of the scope id's found in the tag hierarchy. + */ + final protected String getIdForTagId(String tagId) + { + Tag tag = this; + while (tag != null) { + if (tag instanceof ScriptContainer) { + String sid = ((ScriptContainer) tag).getScopeId(); + if (sid != null) { + tagId = sid + "." + tagId; + } + } + tag = tag.getParent(); + } + return tagId; } /////////////////////////// Generic Attribute Setting Support //////////////////////////// Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java?view=diff&rev=124124&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r1=124123&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java&r2=124124 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Form.java Tue Jan 4 08:58:56 2005 @@ -568,6 +568,7 @@ nextId = new Integer(0); _nextId = nextId.intValue(); + // @todo: what do we do about the id for a form? _formId = FORM_ID + getNextId(request); String tagId = getTagId(); if (tagId != null) { @@ -873,8 +874,6 @@ private void lookup(HttpServletRequest request, ServletContext servletContext) throws JspException { - HttpServletResponse response = (HttpServletResponse) pageContext.getResponse(); - // Look up the application module configuration information we need _appConfig = (ModuleConfig) request.getAttribute(Globals.MODULE_KEY); if (_appConfig == null) { // Backwards compatibility hack Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java?view=diff&rev=124124&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r1=124123&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java&r2=124124 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/Html.java Tue Jan 4 08:58:56 2005 @@ -115,7 +115,7 @@ private boolean _useLocale = false; // include xml:lang=defaultLocale.getLanguage() private ArrayList _errors; // errors - private org.apache.beehive.netui.tags.IErrorReporter _containerErrors; //Check to see if there is a parent error reporter + private IErrorReporter _containerErrors; //Check to see if there is a parent error reporter private int _uniqueId = 0; // unique id sequence private String _docType; // The document type 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=124124&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r1=124123&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/HtmlBaseTag.java&r2=124124 ============================================================================== --- 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 Jan 4 08:58:56 2005 @@ -493,7 +493,7 @@ // rewrite the id, save the original value so it can be used in maps String id = state.id; - state.id = rewriteName(id); + state.id = getIdForTagId(id); // Legacy Java Script support -- This writes out a single table with both the id and names // mixed. This is legacy support to match the pre beehive behavior. 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=124124&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=124123&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=124124 ============================================================================== --- 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 Jan 4 08:58:56 2005 @@ -282,8 +282,7 @@ public int doStartTag() throws JspException { - // if there is a scopeId, then we need to create a div to contains - // everything + // if there is a scopeId, then we need to create a div to contains everything if (_scopeId != null) { write("<div"); write(" scopeId=\""); @@ -302,16 +301,18 @@ public int doEndTag() throws JspException { - // if we wrote out the scopeId then we should end it. - if (_scopeId != null) { - write("</div>"); - } // Add the code to support the JavaScript framework addInitCode(); addAnchorRewriters(); // writeout the script. WriteRenderAppender writer = new WriteRenderAppender(pageContext); + + // if we wrote out the scopeId then we end it. + if (_scopeId != null) { + writer.append("</div>"); + } + writeScriptBlock(writer); localRelease(); return EVAL_PAGE; @@ -480,6 +481,7 @@ } /////////////////////////////////// Private Support //////////////////////////////////// + private String processIdMap(HashMap map, String mapEntry) { Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml?view=diff&rev=124124&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml&r1=124123&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml&r2=124124 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/MockPortal.xml Tue Jan 4 08:58:56 2005 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>MockPortal</ses:sessionName> <ses:tester>rich</ses:tester> - <ses:startDate>17 Dec 2004, 08:49:34.896 AM MST</ses:startDate> + <ses:startDate>21 Dec 2004, 01:48:30.931 PM MST</ses:startDate> <ses:description>rich</ses:description> <ses:tests> <ses:test> @@ -18,7 +18,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -44,7 +44,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -56,7 +56,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -102,7 +102,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestANetui_Form_0" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=submit&smokeTestA_submit=true" method="post"> - data: <input type="text" name="smokeTestA{pageFlow.data}" id="smokeTestAtb"> + data: <input type="text" name="smokeTestA{pageFlow.data}" id="tb"> <input type="submit" value="submit"> </form> @@ -127,7 +127,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestAtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -217,7 +217,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestBNetui_Form_0" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true" method="post"> - data: <input type="text" name="smokeTestB{pageFlow.data}" id="smokeTestBtb"> + data: <input type="text" name="smokeTestB{pageFlow.data}" id="tb"> <input type="submit" value="submit"> </form> @@ -242,7 +242,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestBtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -343,7 +343,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -377,7 +377,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -389,7 +389,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -468,7 +468,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestBNetui_Form_1" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true" method="post"> - data: <input type="text" name="smokeTestB{pageFlow.data}" id="smokeTestBtb"> + data: <input type="text" name="smokeTestB{pageFlow.data}" id="tb"> <input type="submit" value="submit"> </form> @@ -493,7 +493,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestBtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -547,7 +547,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -581,7 +581,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -593,7 +593,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -715,7 +715,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -741,7 +741,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -753,7 +753,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -799,7 +799,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestANetui_Form_0" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=submit&smokeTestA_submit=true" method="post"> - data: <input type="text" name="smokeTestA{pageFlow.data}" id="smokeTestAtb" value="aaa"> + data: <input type="text" name="smokeTestA{pageFlow.data}" id="tb" value="aaa"> <input type="submit" value="submit"> </form> @@ -824,7 +824,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestAtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -954,7 +954,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -980,7 +980,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -992,7 +992,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1113,7 +1113,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1139,7 +1139,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -1151,7 +1151,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1229,7 +1229,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestBNetui_Form_0" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true" method="post"> - data: <input type="text" name="smokeTestB{pageFlow.data}" id="smokeTestBtb" value="bbb"> + data: <input type="text" name="smokeTestB{pageFlow.data}" id="tb" value="bbb"> <input type="submit" value="submit"> </form> @@ -1254,7 +1254,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestBtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -1351,7 +1351,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>F8E55A904D5452632F4C7B233F8A0359</ses:value> + <ses:value>18BA9D4A12098713426A23C743D6BC13</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -1377,7 +1377,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=F8E55A904D5452632F4C7B233F8A0359; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=18BA9D4A12098713426A23C743D6BC13; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>host</ses:name> @@ -1389,7 +1389,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>28d5e24e:100e1b413b0:-7c93</ses:value> + <ses:value>79ab606:100f11afe7e:-6d65</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1435,7 +1435,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestANetui_Form_0" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestAaltAction=submit&smokeTestA_submit=true" method="post"> - data: <input type="text" name="smokeTestA{pageFlow.data}" id="smokeTestAtb" value="aaa"> + data: <input type="text" name="smokeTestA{pageFlow.data}" id="tb" value="aaa"> <input type="submit" value="submit"> </form> @@ -1460,7 +1460,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestAtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -1547,7 +1547,7 @@ <h3>Mock Portal Smoke Test</h3> <form id="smokeTestBNetui_Form_1" action="/coreWeb/mockportal/MockPortal.jsp?smokeTestBaltAction=submit&smokeTestB_submit=true" method="post"> - data: <input type="text" name="smokeTestB{pageFlow.data}" id="smokeTestBtb" value="bbb"> + data: <input type="text" name="smokeTestB{pageFlow.data}" id="tb" value="bbb"> <input type="submit" value="submit"> </form> @@ -1572,7 +1572,7 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.tb="smokeTestBtb" +netui_tagIdMap.tb="tb" // Build the netui_names table to map the tagId attributes @@ -1601,7 +1601,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>17 Dec 2004, 08:49:37.959 AM MST</ses:endDate> + <ses:endDate>21 Dec 2004, 01:48:34.576 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>7</ses:testCount> <ses:passedCount>2</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=124124&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml&r1=124123&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml&r2=124124 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/jsScriptScopeId.xml Tue Jan 4 08:58:56 2005 @@ -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>16 Dec 2004, 01:27:01.213 PM MST</ses:startDate> + <ses:startDate>04 Jan 2005, 08:19:14.017 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>6CDD964549BA441169FF0C6AC0C98216</ses:value> + <ses:value>414A26F39C009DEE316AFF80D61821B0</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=6CDD964549BA441169FF0C6AC0C98216; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=414A26F39C009DEE316AFF80D61821B0; $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>-ceca06a:100dd8bbe80:-7cbf</ses:value> + <ses:value>1674be06:1013a98144b:-7cab</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}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="one.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="one.firstName"> </td> </tr> </table> @@ -142,8 +142,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.one__firstName="firstName" -netui_tagIdMap.one__lastName="lastName" +netui_tagIdMap.one__firstName="one.firstName" +netui_tagIdMap.one__lastName="one.lastName" // Build the netui_names table to map the tagId attributes @@ -235,13 +235,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="two.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="two.firstName"> </td> </tr> </table> @@ -269,8 +269,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.two__firstName="firstName" -netui_tagIdMap.two__lastName="lastName" +netui_tagIdMap.two__firstName="two.firstName" +netui_tagIdMap.two__lastName="two.lastName" // Build the netui_names table to map the tagId attributes @@ -344,7 +344,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6CDD964549BA441169FF0C6AC0C98216</ses:value> + <ses:value>414A26F39C009DEE316AFF80D61821B0</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -378,7 +378,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6CDD964549BA441169FF0C6AC0C98216; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=414A26F39C009DEE316AFF80D61821B0; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -394,7 +394,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-ceca06a:100dd8bbe80:-7cbf</ses:value> + <ses:value>1674be06:1013a98144b:-7cab</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -449,7 +449,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6CDD964549BA441169FF0C6AC0C98216</ses:value> + <ses:value>414A26F39C009DEE316AFF80D61821B0</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -471,7 +471,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6CDD964549BA441169FF0C6AC0C98216; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=414A26F39C009DEE316AFF80D61821B0; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -487,7 +487,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-ceca06a:100dd8bbe80:-7cbf</ses:value> + <ses:value>1674be06:1013a98144b:-7cab</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -522,13 +522,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="one.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="one.firstName"> </td> </tr> </table> @@ -573,8 +573,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.one__firstName="firstName" -netui_tagIdMap.one__lastName="lastName" +netui_tagIdMap.one__firstName="one.firstName" +netui_tagIdMap.one__lastName="one.lastName" // Build the netui_names table to map the tagId attributes @@ -666,13 +666,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="two.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="two.firstName"> </td> </tr> </table> @@ -700,8 +700,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.two__firstName="firstName" -netui_tagIdMap.two__lastName="lastName" +netui_tagIdMap.two__firstName="two.firstName" +netui_tagIdMap.two__lastName="two.lastName" // Build the netui_names table to map the tagId attributes @@ -771,7 +771,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6CDD964549BA441169FF0C6AC0C98216</ses:value> + <ses:value>414A26F39C009DEE316AFF80D61821B0</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -805,7 +805,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6CDD964549BA441169FF0C6AC0C98216; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=414A26F39C009DEE316AFF80D61821B0; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -821,7 +821,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-ceca06a:100dd8bbe80:-7cbf</ses:value> + <ses:value>1674be06:1013a98144b:-7cab</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -876,7 +876,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>6CDD964549BA441169FF0C6AC0C98216</ses:value> + <ses:value>414A26F39C009DEE316AFF80D61821B0</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -898,7 +898,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=6CDD964549BA441169FF0C6AC0C98216; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=414A26F39C009DEE316AFF80D61821B0; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -914,7 +914,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-ceca06a:100dd8bbe80:-7cbf</ses:value> + <ses:value>1674be06:1013a98144b:-7cab</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -949,13 +949,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="one.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="one.firstName"> </td> </tr> </table> @@ -1000,8 +1000,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.one__firstName="firstName" -netui_tagIdMap.one__lastName="lastName" +netui_tagIdMap.one__firstName="one.firstName" +netui_tagIdMap.one__lastName="one.lastName" // Build the netui_names table to map the tagId attributes @@ -1093,13 +1093,13 @@ <tr class="tablehead"> <td>LastName:</td> <td> - <input type="text" name="{actionForm.lastName}" id="lastName"> + <input type="text" name="{actionForm.lastName}" id="two.lastName"> </td> </tr> <tr class="tablehead"> <td>FirstName:</td> <td> - <input type="text" name="{actionForm.firstName}" id="firstName"> + <input type="text" name="{actionForm.firstName}" id="two.firstName"> </td> </tr> </table> @@ -1127,8 +1127,8 @@ // to the real id written into the HTML if (netui_tagIdMap == null) var netui_tagIdMap = new Object(); -netui_tagIdMap.two__firstName="firstName" -netui_tagIdMap.two__lastName="lastName" +netui_tagIdMap.two__firstName="two.firstName" +netui_tagIdMap.two__lastName="two.lastName" // Build the netui_names table to map the tagId attributes @@ -1169,7 +1169,7 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>16 Dec 2004, 01:27:02.955 PM MST</ses:endDate> + <ses:endDate>04 Jan 2005, 08:19:15.870 AM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>5</ses:testCount> <ses:passedCount>2</ses:passedCount>
