You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2005/12/05 19:08:40 UTC

svn commit: r354116 - in /beehive/trunk/netui: src/javascript/tagshtml/ test/webapps/drt/testRecorder/config/ test/webapps/drt/testRecorder/tests/ test/webapps/drt/web/tree/withscript/

Author: crogers
Date: Mon Dec  5 10:08:22 2005
New Revision: 354116

URL: http://svn.apache.org/viewcvs?rev=354116&view=rev
Log:
Fix for http://issues.apache.org/jira/browse/BEEHIVE-1018: Using runAtClient (XmlHttpRequest) for expanding a tree doesn't work when a node label contains a <script> tag.

Modified the netui-tree.js JavaScript to handle the issue with the innerHTML assignment in Mozilla and added a test (best run manually with Mozilla or Firefox).

tests: drt, bvt in netui (WinXP)
BB: self


Added:
    beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml   (with props)
    beehive/trunk/netui/test/webapps/drt/web/tree/withscript/
    beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java   (with props)
    beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp   (with props)
Modified:
    beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
    beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml

Modified: beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js?rev=354116&r1=354115&r2=354116&view=diff
==============================================================================
--- beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js (original)
+++ beehive/trunk/netui/src/javascript/tagshtml/netui-tree.js Mon Dec  5 10:08:22 2005
@@ -199,22 +199,24 @@
 		       reportNetUIError("Didn't find the CDATA");
 		       return;
 		   }
-	       
+
 		   var pElement = document.createElement("div");
-		   if (treeNode.nextSibling != null) {
-		       var sib = treeNode.nextSibling;
-		       pElement.innerHTML=txt.nodeValue;
+		   pElement.innerHTML=txt.nodeValue;
+		   var maxChild = pElement.childNodes.length;
+		   for (var n=0;n<maxChild;n++) {
+		       // appendChild()/insertBefore() move nodes,
+		       // get the first node in thecurrent array
 		       var newNode = pElement.childNodes[0];
-		       treeNode.parentNode.insertBefore(newNode,sib);
+		       if (treeNode.nextSibling != null) {
+		           var sib = treeNode.nextSibling;
+		           treeNode.parentNode.insertBefore(newNode,sib);
+		       }
+		       else {
+		           treeNode.parentNode.appendChild(newNode);
+		       }
 		       treeNode = newNode;
 		       //alert(dumpNodes(dump,pElement,0));
-		   }
-		   else {
-		       pElement.innerHTML=txt.nodeValue;
-		       var newNode = pElement.childNodes[0];
-		       treeNode.parentNode.appendChild(newNode);
-		       treeNode = newNode;
-		   }
+	       }
 	       }
 	       netUI.netUITree.init();
 	   }
@@ -402,7 +404,9 @@
     // now we walk the rows collapsing 
     while (div != null) {
         if (div.nodeName != "DIV") {
-            if (div.nodeType != 1) {
+            // argh, mozilla script.nodeType of 1 fails test,
+            // so check nodeName as well.
+            if (div.nodeType != 1 || div.nodeName == "SCRIPT") {
                 div = div.nextSibling;
                 continue;
             }

Modified: beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?rev=354116&r1=354115&r2=354116&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Mon Dec  5 10:08:22 2005
@@ -8168,6 +8168,20 @@
          </features>
       </test>
       <test>
+         <name>TreeNodeWithScript</name>
+         <description>Test expansion/contraction of tree nodes containing JavaScript in the label.</description>
+         <webapp>coreWeb</webapp>
+         <categories>
+            <category>bvt</category>
+            <category>bvt.struts11</category>
+            <category>trees</category>
+         </categories>
+         <features>
+            <feature>Tree</feature>
+            <feature>runAtClient</feature>
+         </features>
+      </test>
+      <test>
          <name>TreeParams</name>
          <description>Use the Parameter tag with the TreeItem</description>
          <webapp>coreWeb</webapp>

Added: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml?rev=354116&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml (added)
+++ beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml Mon Dec  5 10:08:22 2005
@@ -0,0 +1,777 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<recorderSession xmlns="http://beehive.apache.org/netui/tools/testrecorder/2004/session">
+<sessionName>TreeNodeWithScript</sessionName>
+<tester>crogers</tester>
+<startDate>02 Dec 2005, 01:23:50.071 PM MST</startDate>
+<description>Test expansion/contraction of tree nodes containing JavaScript in the label.</description>
+<tests>
+<test>
+<testNumber>1</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/tree/withscript/Controller.jpf</uri>
+<method>GET</method>
+<parameters>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+
+    <head>
+        <title>
+            Expansion/Contraction of Tree Nodes Containing Script
+        </title>
+    </head>
+    <body>
+        <script language="JavaScript" type="text/JavaScript" src="/coreWeb/resources/beehive/version1/javascript/netui-tree.js"></script>
+        <h3>Expansion/Contraction of Tree Nodes Containing Script</h3>
+        <p>A couple of the nodes in this tree have labels that contain
+        JavaScript. This caused a node expand/collapse problem in Mozilla.
+        </p>
+        <a href="/coreWeb/tree/withscript/resetTrees.do">Reset Trees</a><BR />
+        <hr>
+        <div style="height: 600px">
+        <table width="100%">
+        <tr><td valign="top" width="50%">
+        
+        <div netui:treeName="Tree1133">
+   <div netui:treeLevel="0">
+      <a href="#" netui:imageCollapse="/coreWeb/resources/beehive/version1/images/rootCollapsed.gif" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0" netui:expandLast="true" netui:imageExpand="/coreWeb/resources/beehive/version1/images/rootExpanded.gif"><img src="/coreWeb/resources/beehive/version1/images/rootCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0">&nbsp;TreeItem0&nbsp;</a>
+   </div>
+      <div netui:treeLevel="1">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0" netui:expandOnServer="true" netui:expandLast="true" netui:expandPath="tree/withscript"><img src="/coreWeb/resources/beehive/version1/images/lastNodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1">&nbsp;TreeItem0.1&nbsp;</a>
+   </div>
+   </div>
+
+        
+        </td></tr>
+        </table>
+        </div>
+    <script language="JavaScript" type="text/JavaScript">
+<!--
+
+// **** Start the NetUI Framework Generated JavaScript ****
+
+// write out the webapp name
+netUI.webAppName = "/coreWeb";
+
+if (netUI.netUITree == null) {
+    netUI.netUITree = new NetUITree();
+    netUI.netUITree.trees = new Object();
+}
+netUI.netUITree.trees.Tree1133 = new Object();
+netUI.netUITree.trees["Tree1133"].imgExpandName = "/coreWeb/resources/beehive/version1/images/" + "nodeCollapsed.gif";
+netUI.netUITree.trees["Tree1133"].imgCollapseName = "/coreWeb/resources/beehive/version1/images/" + "nodeExpanded.gif";
+netUI.netUITree.trees["Tree1133"].imgExpandLastName = "/coreWeb/resources/beehive/version1/images/" + "lastNodeCollapsed.gif";
+netUI.netUITree.trees["Tree1133"].imgCollapseLastName = "/coreWeb/resources/beehive/version1/images/" + "lastNodeExpanded.gif";
+netUI.netUITree.trees["Tree1133"].altExpand = "Expand Tree Element";
+netUI.netUITree.trees["Tree1133"].altCollapse = "Collapse Tree Element";
+netUI.netUITree.init();
+-->
+</script></body>
+
+</html>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>2</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/treeExpand.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>node</name>
+<value>0</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>3</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/tree/withscript/treeExpand.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>expandOnServer</name>
+<value>true</value>
+</parameter>
+<parameter>
+<name>node</name>
+<value>0.0</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<treeExpand><node>0.0</node><treeId>Tree1133</treeId><treeDiv>&lt;![CDATA[<div netui:treeLevel="2">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.0"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="Tree Node">&nbsp;TreeItem0.1.1<script language="JavaScript" type="text/JavaScript">function testScript(){document.bgColor='#FFFF00';}</script><span onmouseover=testScript() onmouseout="document.bgColor='#FFFFFF'">&nbsp;(...test script)</span>&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.0.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.1.1">&nbsp;TreeItem0.1.1.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lastLineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.0.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.1.2">&nbsp;TreeItem0.1.1.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="2">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1" netui:expandOnServer="true" netui:expandPath="tree/withscript"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="Tree Node">&nbsp;<script language="JavaScript" type="text/JavaScript">function testScript(){document.bgColor='#FFFF00';}</script><span onmouseover=testScript() onmouseout="document.bgColor='#FFFFFF'">&nbsp;(...test script)</span>TreeItem0.1.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="2">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lastLineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.2&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="Tree Node">&nbsp;<script language="JavaScript" type="text/JavaScript">function testScript(){document.bgColor='#FFFF00';}</script><span onmouseover=testScript() onmouseout="document.bgColor='#FFFFFF'">&nbsp;(...test script)</span>TreeItem0.1.3&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv></treeExpand>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>4</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/treeExpand.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>node</name>
+<value>0.0.0</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>5</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/tree/withscript/treeExpand.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>expandOnServer</name>
+<value>true</value>
+</parameter>
+<parameter>
+<name>node</name>
+<value>0.0.1</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<treeExpand><node>0.0.1</node><treeId>Tree1133</treeId><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.1">&nbsp;TreeItem0.1.2.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.1" netui:expandOnServer="true" netui:expandPath="tree/withscript"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.2">&nbsp;TreeItem0.1.2.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.2"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.2&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.3">&nbsp;TreeItem0.1.2.3&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.2.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.3.1">&nbsp;TreeItem0.1.2.3.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.2.1" netui:expandOnServer="true" netui:expandPath="tree/withscript"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.2.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.3.2">&nbsp;TreeItem0.1.2.3.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lastLineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.2.2&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.3.3">&nbsp;TreeItem0.1.2.3.3&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="3">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.3" netui:expandLast="true"><img src="/coreWeb/resources/beehive/version1/images/lastNodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4">&nbsp;TreeItem0.1.2.4&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4.1">&nbsp;TreeItem0.1.2.4.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.3.1"><img src="/coreWeb/resources/beehive/version1/images/nodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4.2">&nbsp;TreeItem0.1.2.4.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="5">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.3.1.0" netui:expandOnServer="true" netui:expandLast="true" netui:expandPath="tree/withscript"><img src="/coreWeb/resources/beehive/version1/images/lastNodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3.1.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4.2.1">&nbsp;TreeItem0.1.2.4.2.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <a href="#" netui:treeAnchor="collapse" netui:treeAnchorInit="true" netui:treeId="0.0.1.3.2" netui:expandLast="true"><img src="/coreWeb/resources/beehive/version1/images/lastNodeCollapsed.gif" style="vertical-align:bottom;" border="0" alt="Expand Tree Element"></a>
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3.2&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4.3">&nbsp;TreeItem0.1.2.4.3&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="5">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lastLineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.3.2.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.4.3.1">&nbsp;TreeItem0.1.2.4.3.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv></treeExpand>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>6</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/tree/withscript/treeExpand.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>expandOnServer</name>
+<value>true</value>
+</parameter>
+<parameter>
+<name>node</name>
+<value>0.0.1.1</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[<treeExpand><node>0.0.1.1</node><treeId>Tree1133</treeId><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.1.0&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.2.1">&nbsp;TreeItem0.1.2.2.1&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.1.1&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="Tree Node">&nbsp;<script language="JavaScript" type="text/JavaScript">function testScript(){document.bgColor='#FFFF00';}</script><span onmouseover=testScript() onmouseout="document.bgColor='#FFFFFF'">&nbsp;(...test script)</span>TreeItem0.1.2.2.2&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv><treeDiv>&lt;![CDATA[<div netui:treeLevel="4">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/spacer.gif" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/verticalLine.gif" style="vertical-align:bottom;" width="16px" border="0" alt="">
+      <img src="/coreWeb/resources/beehive/version1/images/lastLineJoin.gif" style="vertical-align:bottom;" border="0" alt="">
+      <a href="/coreWeb/tree/withscript/postback.do?netui_treeselected=0.0.1.1.2&amp;netui_treeid=testTree" style="text-decoration: none">&nbsp;<img src="/coreWeb/resources/beehive/version1/images/folder.gif" style="vertical-align:text-top" border="0" alt="TreeItem0.1.2.2.3">&nbsp;TreeItem0.1.2.2.3&nbsp;</a>
+   </div>
+   ]]&gt;</treeDiv></treeExpand>]]>
+</responseBody>
+</response>
+</test>
+<test>
+<testNumber>7</testNumber>
+<request>
+<protocol>HTTP</protocol>
+<protocolVersion>1.1</protocolVersion>
+<host>localhost</host>
+<port>8080</port>
+<uri>/coreWeb/treeCollapse.xhr</uri>
+<method>GET</method>
+<parameters>
+<parameter>
+<name>node</name>
+<value>0.0.1</value>
+</parameter>
+<parameter>
+<name>tree</name>
+<value>Tree1133</value>
+</parameter>
+</parameters>
+<cookies>
+<cookie>
+<name>JSESSIONID</name>
+<value>52756E2DA06E4601F188E6EA6F9C2807</value>
+</cookie>
+</cookies>
+<headers>
+<header>
+<name>accept</name>
+<value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</value>
+</header>
+<header>
+<name>accept-charset</name>
+<value>UTF-8,*</value>
+</header>
+<header>
+<name>accept-encoding</name>
+<value>gzip,deflate</value>
+</header>
+<header>
+<name>accept-language</name>
+<value>en-us,en;q=0.5</value>
+</header>
+<header>
+<name>cache-control</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>connection</name>
+<value>keep-alive</value>
+</header>
+<header>
+<name>cookie</name>
+<value>JSESSIONID=52756E2DA06E4601F188E6EA6F9C2807</value>
+</header>
+<header>
+<name>host</name>
+<value>localhost:8080</value>
+</header>
+<header>
+<name>keep-alive</name>
+<value>300</value>
+</header>
+<header>
+<name>pragma</name>
+<value>no-cache</value>
+</header>
+<header>
+<name>user-agent</name>
+<value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.12) Gecko/20050915 Firefox/1.0.7</value>
+</header>
+</headers>
+</request>
+<response>
+<statusCode>200</statusCode>
+<reason></reason>
+<responseBody>
+<![CDATA[]]>
+</responseBody>
+</response>
+</test>
+</tests>
+<endDate>02 Dec 2005, 01:24:24.580 PM MST</endDate>
+<testCount>7</testCount>
+</recorderSession>

Propchange: beehive/trunk/netui/test/webapps/drt/testRecorder/tests/TreeNodeWithScript.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java?rev=354116&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java (added)
+++ beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java Mon Dec  5 10:08:22 2005
@@ -0,0 +1,137 @@
+package tree.withscript;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
+import org.apache.beehive.netui.tags.tree.TreeElement;
+import org.apache.beehive.netui.tags.tree.TreeRootElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
+   }
+)
+
+public class Controller extends PageFlowController
+{
+    String _script = "<script language=\"JavaScript\" type=\"text/JavaScript\">function testScript(){document.bgColor='#FFFF00';}</script><span onmouseover=testScript() onmouseout=\"document.bgColor='#FFFFFF'\">&nbsp;(...test script)</span>";
+
+    TreeRootElement testTree;
+
+    public TreeRootElement getTestTree(){
+        return this.testTree;
+    }
+
+    public void setTestTree(TreeRootElement tree){
+        this.testTree = tree;
+    }
+
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="index.jsp")
+       }
+    )
+    protected Forward begin()
+    {
+        NameService ns = NameService.instance(getRequest().getSession());
+        ns.debugSetNameIntValue(1133);
+        return new Forward("index");
+    }
+
+
+    protected void onCreate()
+    {
+        testTree = new TreeRootElement("TreeItem0",false);
+        TreeElement item01 = new TreeElement("TreeItem0.1",false);
+        item01.setExpandOnServer(true);
+        testTree.addChild(item01);
+
+        TreeElement item011 = new TreeElement("TreeItem0.1.1"+_script,false);
+        item01.addChild(item011);
+        item011.addChild(new TreeElement("TreeItem0.1.1.1",false));
+        item011.addChild(new TreeElement("TreeItem0.1.1.2",false));
+
+        TreeElement item012 = new TreeElement(_script+"TreeItem0.1.2",false);
+        item012.setExpandOnServer(true);
+        item01.addChild(item012);
+        item012.addChild( new TreeElement("TreeItem0.1.2.1",false));
+
+        TreeElement item0122 = new TreeElement("TreeItem0.1.2.2",false);
+        item0122.setExpandOnServer(true);
+        item012.addChild(item0122);
+        item0122.addChild(new TreeElement("TreeItem0.1.2.2.1",false));
+
+        TreeElement item01222 = new TreeElement(_script+"TreeItem0.1.2.2.2",false);
+        item01222.setExpandOnServer(true);
+        item0122.addChild(item01222);
+        item0122.addChild( new TreeElement("TreeItem0.1.2.2.3",false));
+
+        TreeElement item0123 = new TreeElement("TreeItem0.1.2.3", false);
+        item012.addChild(item0123);
+        item0123.addChild( new TreeElement("TreeItem0.1.2.3.1",false));
+
+        TreeElement item01232 = new TreeElement("TreeItem0.1.2.3.2", false);
+        item01232.setExpandOnServer(true);
+        item0123.addChild(item01232);
+
+        TreeElement item012321 = new TreeElement("TreeItem0.1.2.3.2.1", false);
+        item012321.setExpandOnServer(true);
+        item01232.addChild(item012321);
+        item0123.addChild( new TreeElement("TreeItem0.1.2.3.3", false));
+
+        TreeElement item0124 = new TreeElement("TreeItem0.1.2.4",false);
+        item012.addChild(item0124);
+        item0124.addChild( new TreeElement("TreeItem0.1.2.4.1",false));
+
+        TreeElement item01242 = new TreeElement("TreeItem0.1.2.4.2",false);
+        item01242.setExpandOnServer(false);
+        item0124.addChild(item01242);
+
+        TreeElement item012421 = new TreeElement("TreeItem0.1.2.4.2.1",false);
+        item012421.setExpandOnServer(true);
+        item01242.addChild(item012421);
+        item012421.addChild(new TreeElement("TreeItem0.1.2.4.2.1.1",false));
+
+        TreeElement item01243 = new TreeElement("TreeItem0.1.2.4.3",false);
+        item01243.setExpandOnServer(false);
+        item0124.addChild(item01243);
+        item01243.addChild( new TreeElement("TreeItem0.1.2.4.3.1",false));
+        item01.addChild(new TreeElement(_script+"TreeItem0.1.3",false));
+    }
+
+
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success",
+                     navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward mySelectionAction()
+    {
+        System.out.println("TEST MESSAGE: mySelectionAction() was called.");
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myExpansionAction()
+    {
+        System.out.println("TEST MESSAGE: myExpansionAction() was called.");
+        Forward forward = new Forward("success");
+        return forward;
+    }
+    
+    
+    @Jpf.Action(forwards = { 
+    @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+})
+    protected Forward resetTrees()        {
+        Forward forward = new Forward("success");
+        onCreate();
+        return forward;
+    }
+}
+

Propchange: beehive/trunk/netui/test/webapps/drt/web/tree/withscript/Controller.java
------------------------------------------------------------------------------
    svn:eol-style = native

Added: beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp?rev=354116&view=auto
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp (added)
+++ beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp Mon Dec  5 10:08:22 2005
@@ -0,0 +1,30 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<netui:html>
+    <head>
+        <title>
+            Expansion/Contraction of Tree Nodes Containing Script
+        </title>
+    </head>
+    <netui:body>
+        <netui:scriptHeader></netui:scriptHeader>
+        <h3>Expansion/Contraction of Tree Nodes Containing Script</h3>
+        <p>A couple of the nodes in this tree have labels that contain
+        JavaScript. This caused a node expand/collapse problem in Mozilla.
+        </p>
+        <netui:anchor action="resetTrees">Reset Trees</netui:anchor><BR />
+        <hr>
+        <div style="height: 600px">
+        <table width="100%">
+        <tr><td valign="top" width="50%">
+        <netui:scriptContainer>
+        <netui:tree runAtClient="true"
+                    dataSource="pageFlow.testTree"
+                    selectionAction="postback"
+                    tagId="testTree" />
+        </netui:scriptContainer>
+        </td></tr>
+        </table>
+        </div>
+    </netui:body>
+</netui:html>

Propchange: beehive/trunk/netui/test/webapps/drt/web/tree/withscript/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native