Author: dolander Date: Fri Dec 10 09:36:59 2004 New Revision: 111529 URL: http://svn.apache.org/viewcvs?view=rev&rev=111529 Log: Update the location of the images and javascript so it points to the new location within the webapp (/resources/beehive/version1) Update the Tree so that the default location of the image can be set in the netui.config file Conditionally output the javascript lookup tables Update the test results and a couple of tests to use the ScriptHeader tag instead of explicitly including the .js file
Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.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/ScriptContainer.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/TagConfig.java Fri Dec 10 09:36:59 2004 @@ -2,6 +2,7 @@ import org.apache.beehive.netui.util.config.ConfigUtil; import org.apache.beehive.netui.util.config.bean.JspTagConfig; +import org.apache.beehive.netui.tags.tree.InheritableState; /** @@ -24,13 +25,17 @@ */ public static final String LEGACY_JAVA_SCRIPT_ONLY = "Legacy-JavaScript-Only"; - + // There are the javascript enum values private static final int JAVASCRIPT_DEFAULT = 1; private static final int JAVASCRIPT_LEGACY_ONLY = 2; private static final int JAVASCRIPT_INCLUDE_LEGACY = 3; + // This is the value of the javascript support for the webapp. This should + // be one of the enum values defined above. private static int javascriptMode = -1; + private static String defaultTreeImageLocation = null; + /** * Return true if the legacy JavaScript support should be written to the output stream. @@ -57,6 +62,29 @@ assert(javascriptMode != -1); return (javascriptMode == JAVASCRIPT_INCLUDE_LEGACY || javascriptMode == JAVASCRIPT_DEFAULT); } + + /** + * This method returns the default location for the tree images. This may be configured by setting + * the <tree-image-location> element in the netui.config file to the location of the images. + * This location should not include the context path of the webapp or the leading '/', but should be an absolute + * path within the webapp. + * <p><tree-image-location>resources/images</tree-image-location> + * </p> + * @return the default location of the tree images. + */ + public static String getTreeImageLocation() { + if (defaultTreeImageLocation == null) { + JspTagConfig tagConfig = ConfigUtil.getConfig().getJspTagConfig(); + if (tagConfig != null) { + String s = tagConfig.getTreeImageLocation(); + defaultTreeImageLocation = (s != null) ? s : InheritableState.DEFAULT_IMAGES; + } + else + defaultTreeImageLocation = InheritableState.DEFAULT_IMAGES; + } + assert(defaultTreeImageLocation != null); + return defaultTreeImageLocation; + } /** * This will set the JavaScript support level for the id and name attributes. 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=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/JavaScriptUtils.java&r2=111529 ============================================================================== --- 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 Fri Dec 10 09:36:59 2004 @@ -94,7 +94,7 @@ { String s = getString("singleIdMappingTable", new Object[]{ tagId, value}); - String meths = writeNetuiNameFunctions(null); + String meths = writeNetuiNameFunctions(null,true,true,true); if (meths != null) s += meths; writeScriptBlock(results, s); @@ -129,7 +129,7 @@ return s; } - public String writeNetuiNameFunctions(IScriptReporter scriptReporter) + public String writeNetuiNameFunctions(IScriptReporter scriptReporter, boolean writeLegacy, boolean writeId, boolean writeName) { if (_writeLookupMethods) return null; @@ -142,7 +142,7 @@ String s; // if we are supporting legacy javascript then output the original javascript method - if (TagConfig.isLegacyJavaScript()) { + if (TagConfig.isLegacyJavaScript() && writeLegacy) { s = getString("getNetuiTagNameAdvanced", null); if (scriptReporter != null) scriptReporter.addScriptFunction(s); @@ -154,20 +154,24 @@ // if we are supporting the default javascript then output the lookup methods for id and name if (TagConfig.isDefaultJavaScript()) { - s = getString("lookupIdByTagId", null); - if (scriptReporter != null) - scriptReporter.addScriptFunction(s); - else { - sb.append(s); - sb.append("\n"); + if (writeId) { + s = getString("lookupIdByTagId", null); + if (scriptReporter != null) + scriptReporter.addScriptFunction(s); + else { + sb.append(s); + sb.append("\n"); + } } - s = getString("lookupNameByTagId", null); - if (scriptReporter != null) - scriptReporter.addScriptFunction(s); - else { - sb.append(s); - sb.append("\n"); + if (writeName) { + s = getString("lookupNameByTagId", null); + if (scriptReporter != null) + scriptReporter.addScriptFunction(s); + else { + sb.append(s); + sb.append("\n"); + } } } 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=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptContainer.java&r2=111529 ============================================================================== --- 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 Fri Dec 10 09:36:59 2004 @@ -406,7 +406,10 @@ // process the map // @todo: need to make the writeNetuiNameFunction deal with different functions - boolean writeFunctions = false; + boolean writeLegacy = false; + boolean writeId = false; + boolean writeName = false; + String val; // if we are writing out legacy JavaScript support output the idMap @@ -414,7 +417,7 @@ val = processIdMap(_idMap, "idMappingEntry"); if (val != null) { jsu.writeIdMap(this, "idMappingTable", val); - writeFunctions = true; + writeLegacy = true; } } @@ -423,18 +426,18 @@ val = processIdMap(_idToIdMap, "tagIdMappingEntry"); if (val != null) { jsu.writeIdMap(this, "tagIdMappingTable", val); - writeFunctions = true; + writeId = true; } val = processIdMap(_idToNameMap, "tagIdNameMappingEntry"); if (val != null) { jsu.writeIdMap(this, "tagIdNameMappingTable", val); - writeFunctions = true; + writeName = true; } } - if (writeFunctions) { - jsu.writeNetuiNameFunctions(this); + if (writeLegacy || writeId || writeName) { + jsu.writeNetuiNameFunctions(this, writeLegacy, writeId, writeName); } Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/html/ScriptHeader.java Fri Dec 10 09:36:59 2004 @@ -103,12 +103,12 @@ sr.writeInitScript(writer); // write out all of the includes - // @todo: is there a type that we should be seting on this + // @todo: is there a type that we should be setting on this // @todo: this should be found in the renderers. if (_tree || _divPanel) { write("\n\t<script src=\""); write(req.getContextPath()); - write("/resources/javascript/netui-tree.js\"></script>"); + write("/resources/beehive/version1/javascript/netui-tree.js\"></script>"); } return EVAL_BODY_INCLUDE; Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/InheritableState.java Fri Dec 10 09:36:59 2004 @@ -9,7 +9,7 @@ /** * The default directory name for icon images. */ - public static final String DEFAULT_IMAGES = "resources/images"; + public static final String DEFAULT_IMAGES = "resources/beehive/version1/images"; /** * The names of tree state images that we need. Modified: incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r1=111528&p2=incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java (original) +++ incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/Tree.java Fri Dec 10 09:36:59 2004 @@ -566,7 +566,7 @@ PageContext pageContext = getPageContext(); if (_iState.getImageRoot() == null) _iState.setImageRoot(((HttpServletRequest) pageContext.getRequest()).getContextPath() + "/" + - InheritableState.DEFAULT_IMAGES); + TagConfig.getTreeImageLocation()); // errors should have been caught in doBeginTag TreeElement treeRoot = getTreeRoot(_expr); Modified: incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd&r1=111528&p2=incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd (original) +++ incubator/beehive/trunk/netui/src/util/schema/netui-config.xsd Fri Dec 10 09:36:59 2004 @@ -98,6 +98,7 @@ <xsd:sequence> <xsd:element name="doctype" type="xsd:string" minOccurs="0" maxOccurs="1"/> <xsd:element name="id-javascript" type="xsd:string" minOccurs="0" maxOccurs="1"/> + <xsd:element name="tree-image-location" type="xsd:string" minOccurs="0" maxOccurs="1"/> <!-- @TODO: This needs to be removed. We don't support this at the moment. --> <xsd:element name="id-transparency" type="xsd:string" minOccurs="0" maxOccurs="1" default="false"/> </xsd:sequence> Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/local-netui-config.xml Fri Dec 10 09:36:59 2004 @@ -50,6 +50,7 @@ <jsp-tag-config> <doctype>html4-loose</doctype> <id-javascript>Legacy-JavaScript-Only</id-javascript> + <tree-image-location>resources/images</tree-image-location> </jsp-tag-config> <iterator-factories> Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanel/index.jsp Fri Dec 10 09:36:59 2004 @@ -7,8 +7,7 @@ <title> Basic DivPanel </title> - <netui:scriptHeader /> - <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> + <netui:scriptHeader treeSupport='true'/> </head> <netui:body> <h4>Basic DivPanel</h4> Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/template/divPanelTree/index.jsp Fri Dec 10 09:36:59 2004 @@ -13,8 +13,7 @@ </style> <!-- This needs to be put here by the script container --> - <netui:scriptHeader /> - <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> + <netui:scriptHeader treeSupport='true'/> </head> <netui:body> <table width="100%" cellspacing="5"><tr><td width="20%" valign="top"> Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContent.xml Fri Dec 10 09:36:59 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>RichTreeClientContent</ses:sessionName> <ses:tester>null</ses:tester> - <ses:startDate>25 Jul 2004, 10:31:55.896 AM MDT</ses:startDate> + <ses:startDate>09 Dec 2004, 03:27:46.360 PM MST</ses:startDate> <ses:description>null</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/richTree/goClientContent.do</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</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=C91A963FD6C9F98C560C89EF405A95CE; $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>-7c7c6398:fdf71697fb:-7ada</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-729d</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -62,7 +71,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>content.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -81,7 +90,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .alien { position: absolute; @@ -265,7 +274,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>13865A1300B0F2A5A17AD7F56C0EC037</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -287,7 +296,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=13865A1300B0F2A5A17AD7F56C0EC037; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -303,7 +312,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ada</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-729d</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -318,7 +327,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>content.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -337,7 +346,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .alien { position: absolute; @@ -521,7 +530,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>13865A1300B0F2A5A17AD7F56C0EC037</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -543,7 +552,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=13865A1300B0F2A5A17AD7F56C0EC037; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -559,7 +568,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ada</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-729d</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -574,7 +583,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>content.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -593,7 +602,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .alien { position: absolute; @@ -781,7 +790,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>13865A1300B0F2A5A17AD7F56C0EC037</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -803,7 +812,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=13865A1300B0F2A5A17AD7F56C0EC037; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -819,7 +828,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ada</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-729d</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -834,7 +843,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>content.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -853,7 +862,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .alien { position: absolute; @@ -1004,9 +1013,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>25 Jul 2004, 10:31:58.570 AM MDT</ses:endDate> + <ses:endDate>09 Dec 2004, 03:27:47.441 PM 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/RichTreeClientContentAnchor.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeClientContentAnchor.xml Fri Dec 10 09:36:59 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>RichTreeClientContentAnchor</ses:sessionName> <ses:tester>null</ses:tester> - <ses:startDate>25 Jul 2004, 10:31:58.760 AM MDT</ses:startDate> + <ses:startDate>09 Dec 2004, 03:27:47.471 PM MST</ses:startDate> <ses:description>null</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/richTree/goClientContentAnchor.do</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</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=C91A963FD6C9F98C560C89EF405A95CE; $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>-7c7c6398:fdf71697fb:-7ad5</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7298</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -62,7 +71,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>clientContentAnchor.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -81,7 +90,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .anchor { position: absolute; @@ -252,7 +261,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>7B01C24B8D173FEE4818093FCF98C8FA</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -274,7 +283,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=7B01C24B8D173FEE4818093FCF98C8FA; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -290,7 +299,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ad5</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7298</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -305,7 +314,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>clientContentAnchor.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -324,7 +333,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .anchor { position: absolute; @@ -487,7 +496,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>7B01C24B8D173FEE4818093FCF98C8FA</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -509,7 +518,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=7B01C24B8D173FEE4818093FCF98C8FA; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -525,7 +534,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ad5</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7298</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -540,7 +549,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>clientContentAnchor.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -559,7 +568,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .anchor { position: absolute; @@ -726,7 +735,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>7B01C24B8D173FEE4818093FCF98C8FA</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -748,7 +757,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=7B01C24B8D173FEE4818093FCF98C8FA; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -764,7 +773,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ad5</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7298</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -779,7 +788,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>clientContentAnchor.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -798,7 +807,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .anchor { position: absolute; @@ -965,7 +974,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>7B01C24B8D173FEE4818093FCF98C8FA</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -987,7 +996,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=7B01C24B8D173FEE4818093FCF98C8FA; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -1003,7 +1012,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7ad5</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7298</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -1018,7 +1027,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>clientContentAnchor.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -1037,7 +1046,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <style type="text/css"> .anchor { position: absolute; @@ -1175,9 +1184,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>25 Jul 2004, 10:32:00.603 AM MDT</ses:endDate> + <ses:endDate>09 Dec 2004, 03:27:48.112 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>5</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>5</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/RichTreeRunAtClient.xml Fri Dec 10 09:36:59 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>RichTreeRunAtClient</ses:sessionName> <ses:tester>null</ses:tester> - <ses:startDate>25 Jul 2004, 10:32:25.419 AM MDT</ses:startDate> + <ses:startDate>09 Dec 2004, 03:27:57.365 PM MST</ses:startDate> <ses:description>null</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/richTree/goBaseClient.do</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</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=C91A963FD6C9F98C560C89EF405A95CE; $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>-7c7c6398:fdf71697fb:-7a90</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7253</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -62,7 +71,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>baseClient.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -81,7 +90,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <base href="http://localhost:8080/coreWeb/richTree/baseClient.jsp";> </head> <body> @@ -231,7 +240,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>75AF0835DB15F30B9BA931E773FA50A8</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -253,7 +262,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=75AF0835DB15F30B9BA931E773FA50A8; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -269,7 +278,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7a90</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7253</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -284,7 +293,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>baseClient.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -303,7 +312,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <base href="http://localhost:8080/coreWeb/richTree/baseClient.jsp";> </head> <body> @@ -461,7 +470,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>75AF0835DB15F30B9BA931E773FA50A8</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -483,7 +492,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=75AF0835DB15F30B9BA931E773FA50A8; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -499,7 +508,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-7c7c6398:fdf71697fb:-7a90</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7253</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -514,7 +523,7 @@ "http://www.w3.org/TR/html4/loose.dtd";> <html lang="en"> -<head> + <head> <title>baseClient.jsp</title> <link href="style.css" rel="stylesheet" type="text/css"> @@ -533,7 +542,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <base href="http://localhost:8080/coreWeb/richTree/baseClient.jsp";> </head> <body> @@ -658,9 +667,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>25 Jul 2004, 10:32:27.081 AM MDT</ses:endDate> + <ses:endDate>09 Dec 2004, 03:27:57.956 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>3</ses:testCount> <ses:passedCount>0</ses:passedCount> <ses:failedCount>3</ses:failedCount> -</ses:recorderSession> +</ses:recorderSession> \ No newline at end of file Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlImage.xml Fri Dec 10 09:36:59 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>XhtmlImage</ses:sessionName> <ses:tester>null</ses:tester> - <ses:startDate>08 Jul 2004, 01:42:39.124 PM MDT</ses:startDate> + <ses:startDate>09 Dec 2004, 03:29:36.316 PM MST</ses:startDate> <ses:description>null</ses:description> <ses:tests> <ses:test> @@ -15,7 +15,12 @@ <ses:uri>/coreWeb/xhtml/goImageTest.do</ses:uri> <ses:method>GET</ses:method> <ses:parameters/> - <ses:cookies/> + <ses:cookies> + <ses:cookie> + <ses:name>JSESSIONID</ses:name> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</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=C91A963FD6C9F98C560C89EF405A95CE; $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>5322191f:fd9ffc1336:-5a15</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7119</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>Image Tests</title> <style type="text/css"> .normal {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;} @@ -93,7 +102,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> </head> <body> <h1 class="normalHead">Image Tests</h1> @@ -180,7 +189,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>2FB8A421F6A5559DFEA8FFF537B99AE9</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -214,7 +223,7 @@ </ses:header> <ses:header> <ses:name>cookie</ses:name> - <ses:value>$Version=0; JSESSIONID=2FB8A421F6A5559DFEA8FFF537B99AE9; $Path=/coreWeb</ses:value> + <ses:value>$Version=0; JSESSIONID=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -230,7 +239,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>5322191f:fd9ffc1336:-5a15</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-7119</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -245,7 +254,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>Image Post Results</title> <style type="text/css"> .normal {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;} @@ -270,9 +279,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>08 Jul 2004, 01:42:43.770 PM MDT</ses:endDate> + <ses:endDate>09 Dec 2004, 03:29:37.898 PM 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/cr180865.xml Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml?view=diff&rev=111529&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml&r1=111528&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml&r2=111529 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/cr180865.xml Fri Dec 10 09:36:59 2004 @@ -2,7 +2,7 @@ <ses:recorderSession xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";> <ses:sessionName>Cr180865</ses:sessionName> <ses:tester>null</ses:tester> - <ses:startDate>01 Nov 2004, 09:48:29.133 PM MST</ses:startDate> + <ses:startDate>09 Dec 2004, 03:23:35.234 PM MST</ses:startDate> <ses:description>null</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>C91A963FD6C9F98C560C89EF405A95CE</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=C91A963FD6C9F98C560C89EF405A95CE; $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:-7e2b</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-76ad</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -89,7 +89,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <body> <p style="color:#339900;">This is a test of the &lt;divPanel>. There are three links which change the currently displayed page. Each 'page' contains a link. When the link is pressed, we hit the postback @@ -193,7 +193,7 @@ </html></ses:responseBody> </ses:response> <ses:testResults> - <ses:testStatus>pass</ses:testStatus> + <ses:testStatus>fail</ses:testStatus> </ses:testResults> </ses:test> <ses:test> @@ -214,7 +214,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -236,7 +236,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=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -252,7 +252,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7e2b</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-76ad</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -285,7 +285,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <body> <p style="color:#339900;">This is a test of the &lt;divPanel>. There are three links which change the currently displayed page. Each 'page' contains a link. When the link is pressed, we hit the postback @@ -410,7 +410,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -432,7 +432,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=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -448,7 +448,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7e2b</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-76ad</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -481,7 +481,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <body> <p style="color:#339900;">This is a test of the &lt;divPanel>. There are three links which change the currently displayed page. Each 'page' contains a link. When the link is pressed, we hit the postback @@ -606,7 +606,7 @@ <ses:cookies> <ses:cookie> <ses:name>JSESSIONID</ses:name> - <ses:value>ED52D198272AB96E24BF9839B645DF20</ses:value> + <ses:value>C91A963FD6C9F98C560C89EF405A95CE</ses:value> </ses:cookie> </ses:cookies> <ses:headers> @@ -628,7 +628,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=C91A963FD6C9F98C560C89EF405A95CE; $Path=/coreWeb</ses:value> </ses:header> <ses:header> <ses:name>cookie2</ses:name> @@ -644,7 +644,7 @@ </ses:header> <ses:header> <ses:name>testrecorder.playback.testid</ses:name> - <ses:value>-702fd6bf:fff796c3fc:-7e2b</ses:value> + <ses:value>-15b982e6:100b9dbf29a:-76ad</ses:value> </ses:header> <ses:header> <ses:name>user-agent</ses:name> @@ -677,7 +677,7 @@ </script> - <script src="/coreWeb/resources/javascript/netui-tree.js"></script> + <script src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script> <body> <p style="color:#339900;">This is a test of the &lt;divPanel>. There are three links which change the currently displayed page. Each 'page' contains a link. When the link is pressed, we hit the postback @@ -785,9 +785,9 @@ </ses:testResults> </ses:test> </ses:tests> - <ses:endDate>01 Nov 2004, 09:48:30.936 PM MST</ses:endDate> + <ses:endDate>09 Dec 2004, 03:23:35.274 PM MST</ses:endDate> <ses:sessionStatus>fail</ses:sessionStatus> <ses:testCount>4</ses:testCount> - <ses:passedCount>1</ses:passedCount> - <ses:failedCount>3</ses:failedCount> + <ses:passedCount>0</ses:passedCount> + <ses:failedCount>4</ses:failedCount> </ses:recorderSession>
