Author: dolander
Date: Fri Feb 4 08:16:53 2005
New Revision: 151366
URL: http://svn.apache.org/viewcvs?view=rev&rev=151366
Log:
Fix the URL encoding in the select and expansion/collapse links in the Tree.
In XHTML (XML) it is required to use an character entity for '&'.
Added:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/treeTest.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlTree.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/Controller.jpf
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified:
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java?view=diff&r1=151365&r2=151366
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-html/org/apache/beehive/netui/tags/tree/TreeRenderer.java
Fri Feb 4 08:16:53 2005
@@ -19,7 +19,6 @@
import org.apache.beehive.netui.core.URLCodec;
import org.apache.beehive.netui.pageflow.PageFlowUtils;
-import org.apache.beehive.netui.pageflow.PageFlowController;
import org.apache.beehive.netui.pageflow.internal.AdapterManager;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
@@ -291,8 +290,8 @@
String uri = null;
try {
- uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,false);
- //uri = PageFlowTagUtils.rewriteActionURL(pageContext,
action, params, null);
+ boolean xml = TagRenderingBase.Factory.isXHTML(_req);
+ uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,xml);
}
catch (URISyntaxException e) {
// report the error...
@@ -451,7 +450,8 @@
params.put(TreeElement.TREE_ID, _trs.tagId);
String uri = null;
try {
- uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,false);
+ boolean xml = TagRenderingBase.Factory.isXHTML(_req);
+ uri =
PageFlowUtils.getRewrittenActionURI(_servletContext,_req,_res,action,params,null,xml);
}
catch (URISyntaxException e) {
// report the error...
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/Controller.jpf?view=diff&r1=151365&r2=151366
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/Controller.jpf
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/Controller.jpf
Fri Feb 4 08:16:53 2005
@@ -23,10 +23,13 @@
import org.apache.beehive.netui.pageflow.annotations.Jpf;
import org.apache.beehive.netui.tags.html.HtmlConstants;
import java.util.HashMap;
+import org.apache.beehive.netui.tags.tree.TreeElement;
@Jpf.Controller()
public class Controller extends PageFlowController
{
+ private TreeElement _tree1;
+
// checkbox tests
private String[] checkBoxOptions = {"CBG Option 1", "CBG Option 2", "CBG
Option 3"};
private String[] checkBoxMapOptions = {"Map Option 1", "Map Option 2"};
@@ -55,6 +58,14 @@
public Options[] getOpts() {return opts;}
public String getLabelOne() {return labelOne;}
+ public TreeElement getTree1() {
+ return _tree1;
+ }
+
+ public void setTree1(TreeElement tn) {
+ _tree1 = tn;
+ }
+
protected void onCreate()
{
// version that is used by all the options
@@ -112,6 +123,24 @@
protected Forward goAnchorTest()
{
return new Forward("success");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "treeTest.jsp")
+ })
+ protected Forward goTreeTest()
+ {
+ return new Forward("success");
+ }
+
+ @Jpf.Action(forwards = {
@org.apache.beehive.netui.pageflow.annotations.Jpf.Forward(name = "success",
navigateTo =
org.apache.beehive.netui.pageflow.annotations.Jpf.NavigateTo.currentPage)})
+ protected Forward postback()
+ {
+ Forward forward = new Forward("success");
+ return forward;
}
/**
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/index.jsp?view=diff&r1=151365&r2=151366
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/index.jsp
(original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/index.jsp Fri
Feb 4 08:16:53 2005
@@ -24,6 +24,7 @@
<li><netui:anchor styleClass="normal" action="goImageTest"
rel="start">Image Test</netui:anchor></li>
<li><netui:anchor styleClass="normal" action="goLabelTest"
rel="start">Label Test</netui:anchor></li>
<li><netui:anchor styleClass="normal" action="goFormLabelTest"
rel="start">Form Label Test</netui:anchor></li>
+ <li><netui:anchor styleClass="normal" action="goTreeTest" rel="start">Tree
Test</netui:anchor></li>
</ul>
</netui:body>
</netui:html>
Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/treeTest.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/treeTest.jsp?view=auto&rev=151366
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/treeTest.jsp
(added)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/xhtml/treeTest.jsp
Fri Feb 4 08:16:53 2005
@@ -0,0 +1,41 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="beehive-netui-tags-databinding.tld" prefix="netui-data"%>
+<%@ taglib uri="beehive-netui-tags-html.tld" prefix="netui"%>
+<%@ taglib uri="beehive-netui-tags-template.tld" prefix="netui-template"%>
+<netui:html documentType="xhtml1-transitional">
+ <head>
+ <title>Tree Test</title>
+ <style type="text/css">
+ .normal {color: #000099;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
+ li {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;}
+ .normalError {color: #ff0033;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
+ .normalHead {color: #000099;font-family:Verdana;
font-size:8pt;font-weight: strong;margin:0,0,0,0;}
+ .title {color: #000099;font-family:Verdana;
font-size:12pt;margin:2,0,5,0;}
+ .resultDiv {border: thin solid;height: 400px;}
+ </style>
+ <netui:base />
+ </head>
+ <netui:body>
+ <h1 class="normalHead">Tree Tests</h1>
+ <netui:tree dataSource="pageFlow.tree1"
+ selectionAction="postback" tagId="tree">
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0</netui:treeLabel>
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0.0</netui:treeLabel>
+ <netui:treeItem action="postback">
+ <netui:treeLabel>0.0.0</netui:treeLabel>
+ <netui:treeItem
action="postback">0.0.0.0</netui:treeItem>
+ <netui:treeItem
action="postback">0.0.0.1</netui:treeItem>
+ </netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true" action="postback">
+ <netui:treeLabel>0.1</netui:treeLabel>
+ <netui:treeItem action="postback">0.1.0</netui:treeItem>
+ <netui:treeItem action="postback">0.1.1</netui:treeItem>
+ </netui:treeItem>
+ <netui:treeItem expanded="true"
action="postback">0.2</netui:treeItem>
+ </netui:treeItem>
+ </netui:tree>
+ </netui:body>
+</netui:html>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&r1=151365&r2=151366
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Fri Feb 4 08:16:53 2005
@@ -6825,5 +6825,20 @@
<feature>XHTML</feature>
</features>
</test>
+ <test>
+ <name>XhtmlTree</name>
+ <description>XHTML validation of the Tree tags</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>drt</category>
+ <category>xhtml</category>
+ </categories>
+ <features>
+ <feature>Tree</feature>
+ <feature>XHTML</feature>
+ </features>
+ </test>
</tests>
</testDefinitions>
Added:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlTree.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlTree.xml?view=auto&rev=151366
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlTree.xml
(added)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/XhtmlTree.xml
Fri Feb 4 08:16:53 2005
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ses:recorderSession
xmlns:ses="http://beehive.apache.org/netui/tools/testrecorder/2004/session";>
+ <ses:sessionName>XhtmlTree</ses:sessionName>
+ <ses:tester>Daryl</ses:tester>
+ <ses:startDate>04 Feb 2005, 08:56:00.949 AM MST</ses:startDate>
+ <ses:description>Verification of the XHTML rendering of a
tree.</ses:description>
+ <ses:tests>
+ <ses:test>
+ <ses:testNumber>1</ses:testNumber>
+ <ses:request>
+ <ses:protocol>HTTP</ses:protocol>
+ <ses:protocolVersion>1.1</ses:protocolVersion>
+ <ses:host>localhost</ses:host>
+ <ses:port>8080</ses:port>
+ <ses:uri>/coreWeb/xhtml/goTreeTest.do</ses:uri>
+ <ses:method>GET</ses:method>
+ <ses:parameters/>
+ <ses:cookies>
+ <ses:cookie>
+ <ses:name>JSESSIONID</ses:name>
+ <ses:value>F668AB9360C1C85318143F11F8DDB3BE</ses:value>
+ </ses:cookie>
+ </ses:cookies>
+ <ses:headers>
+ <ses:header>
+ <ses:name>accept</ses:name>
+
<ses:value>text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-charset</ses:name>
+ <ses:value>ISO-8859-1,utf-8;q=0.7,*;q=0.7</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-encoding</ses:name>
+ <ses:value>gzip,deflate</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>accept-language</ses:name>
+ <ses:value>en-us,en;q=0.5</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>connection</ses:name>
+ <ses:value>keep-alive</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>cookie</ses:name>
+
<ses:value>JSESSIONID=F668AB9360C1C85318143F11F8DDB3BE</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>host</ses:name>
+ <ses:value>localhost:8080</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>keep-alive</ses:name>
+ <ses:value>300</ses:value>
+ </ses:header>
+ <ses:header>
+ <ses:name>user-agent</ses:name>
+ <ses:value>Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
rv:1.7.5) Gecko/20041107 Firefox/1.0</ses:value>
+ </ses:header>
+ </ses:headers>
+ </ses:request>
+ <ses:response>
+ <ses:statusCode>200</ses:statusCode>
+ <ses:reason/>
+ <ses:responseBody><![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD
XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml";>
+
+ <head>
+ <title>Tree Test</title>
+ <style type="text/css">
+ .normal {color: #000099;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
+ li {color: #000099;font-family:Verdana; font-size:8pt;margin:0,0,0,0;}
+ .normalError {color: #ff0033;font-family:Verdana;
font-size:8pt;margin:0,0,0,0;}
+ .normalHead {color: #000099;font-family:Verdana;
font-size:8pt;font-weight: strong;margin:0,0,0,0;}
+ .title {color: #000099;font-family:Verdana;
font-size:12pt;margin:2,0,5,0;}
+ .resultDiv {border: thin solid;height: 400px;}
+ </style>
+ <base href="http://localhost:8080/coreWeb/xhtml/treeTest.jsp"; />
+ </head>
+ <body>
+ <h1 class="normalHead">Tree Tests</h1>
+ <div>
+ <div>
+ <a
href="/coreWeb/xhtml/postback.do?netui_treenode=0&netui_treeid=tree"><img
src="/coreWeb/resources/images/handledownlast.gif"
style="vertical-align:middle;" border="0" alt="" /></a>
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treenode=0.0&netui_treeid=tree"><img
src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt="" /></a>
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.0&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.0 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treenode=0.0.0&netui_treeid=tree"><img
src="/coreWeb/resources/images/handlerightlast.gif"
style="vertical-align:middle;" border="0" alt="" /></a>
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.0.0&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.0.0 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treenode=0.1&netui_treeid=tree"><img
src="/coreWeb/resources/images/handledownmiddle.gif"
style="vertical-align:middle;" border="0" alt="" /></a>
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.1&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.1 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="" />
+ <img src="/coreWeb/resources/images/linemiddlenode.gif"
style="vertical-align:middle;" border="0" alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.1.0&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.1.0 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <img src="/coreWeb/resources/images/linevertical.gif"
style="vertical-align:middle;" width="16px" border="0" alt="" />
+ <img src="/coreWeb/resources/images/linelastnode.gif"
style="vertical-align:middle;" border="0" alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.1.1&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.1.1 </a>
+ </div>
+ <div>
+ <img src="/coreWeb/resources/images/spacer.gif" width="16px" border="0"
alt="" />
+ <img src="/coreWeb/resources/images/linelastnode.gif"
style="vertical-align:middle;" border="0" alt="" />
+ <a
href="/coreWeb/xhtml/postback.do?netui_treeselected=0.2&netui_treeid=tree"> <img
src="/coreWeb/resources/images/folder_16_pad.gif"
style="vertical-align:middle" border="0" alt="Tree Node" /> 0.2 </a>
+ </div>
+</div>
+
+ </body>
+
+</html>]]></ses:responseBody>
+ </ses:response>
+ </ses:test>
+ </ses:tests>
+ <ses:endDate>04 Feb 2005, 08:56:12.556 AM MST</ses:endDate>
+ <ses:testCount>1</ses:testCount>
+</ses:recorderSession>
\ No newline at end of file
