You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/05/10 17:54:24 UTC

svn commit: r405785 [10/20] - in /beehive/trunk/netui: external/struts/ external/struts/legacy/jakarta-struts-1.1-lib/ src/bootstrap/ src/bootstrap/org/apache/beehive/netui/tools/tld/xdoclet/ src/compiler-apt/ src/compiler-apt/META-INF/services/ src/co...

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

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j290/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j290/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j290/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j290/Controller.java Wed May 10 08:49:42 2006
@@ -1,120 +1,120 @@
-package bugs.j290;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-
-/**
- * This is the default controller for a blank web application.
- */
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    private String _action;
-    private String _text;
-    public Bean hiddenBean;
-    public BeanTwo beanTwo;
-
-    public String getAction()
-    {
-        return _action;
-    }
-
-    public String getText()
-    {
-        return _text;
-    }
-
-    @Jpf.Action(
-            forwards = {
-            @Jpf.Forward(name = "index", path = "index.jsp")
-            }
-            )
-    protected Forward begin()
-    {
-        _action = "begin";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
-    protected Forward post(Bean postForm)
-    {
-        _action = "post";
-        _text = postForm.getText();
-        postForm.setText("");
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        useFormBean="hiddenBean",
-        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
-    protected Forward post2(Bean postForm)
-    {
-        _action = "post2";
-        _text = postForm.getText();
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        useFormBean="beanTwo",
-        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
-    protected Forward post3(BeanTwo postForm)
-    {
-        _action = "post3";
-        _text = postForm.getText();
-        return new Forward("index");
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is created.
-     */
-    protected void onCreate()
-    {
-	hiddenBean = new Bean();
-        hiddenBean.setText("hiddenBean Defined");
-	
-	beanTwo = new BeanTwo();
-        beanTwo.setText("beanTwo Defined");
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is destroyed.
-     */
-    protected void onDestroy(HttpSession session)
-    {
-    }
-
-    public static class Bean implements Serializable
-    {
-        private String _text;
-
-        public String getText()
-        {
-            return _text;
-        }
-
-        public void setText(String value)
-        {
-            _text = value;
-        }
-    }
-
-    public static class BeanTwo implements Serializable
-    {
-        private String _text;
-
-        public String getText()
-        {
-            return _text;
-        }
-
-        public void setText(String value)
-        {
-            _text = value;
-        }
-    }
-}
+package bugs.j290;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import javax.servlet.http.HttpSession;
+import java.io.Serializable;
+
+/**
+ * This is the default controller for a blank web application.
+ */
+@Jpf.Controller
+public class Controller extends PageFlowController
+{
+    private String _action;
+    private String _text;
+    public Bean hiddenBean;
+    public BeanTwo beanTwo;
+
+    public String getAction()
+    {
+        return _action;
+    }
+
+    public String getText()
+    {
+        return _text;
+    }
+
+    @Jpf.Action(
+            forwards = {
+            @Jpf.Forward(name = "index", path = "index.jsp")
+            }
+            )
+    protected Forward begin()
+    {
+        _action = "begin";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
+    protected Forward post(Bean postForm)
+    {
+        _action = "post";
+        _text = postForm.getText();
+        postForm.setText("");
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        useFormBean="hiddenBean",
+        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
+    protected Forward post2(Bean postForm)
+    {
+        _action = "post2";
+        _text = postForm.getText();
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        useFormBean="beanTwo",
+        forwards = { @Jpf.Forward(name = "index", navigateTo = Jpf.NavigateTo.currentPage)})
+    protected Forward post3(BeanTwo postForm)
+    {
+        _action = "post3";
+        _text = postForm.getText();
+        return new Forward("index");
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is created.
+     */
+    protected void onCreate()
+    {
+	hiddenBean = new Bean();
+        hiddenBean.setText("hiddenBean Defined");
+	
+	beanTwo = new BeanTwo();
+        beanTwo.setText("beanTwo Defined");
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is destroyed.
+     */
+    protected void onDestroy(HttpSession session)
+    {
+    }
+
+    public static class Bean implements Serializable
+    {
+        private String _text;
+
+        public String getText()
+        {
+            return _text;
+        }
+
+        public void setText(String value)
+        {
+            _text = value;
+        }
+    }
+
+    public static class BeanTwo implements Serializable
+    {
+        private String _text;
+
+        public String getText()
+        {
+            return _text;
+        }
+
+        public void setText(String value)
+        {
+            _text = value;
+        }
+    }
+}

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

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Controller.java Wed May 10 08:49:42 2006
@@ -1,103 +1,103 @@
-package bugs.j297;
-
-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 javax.servlet.http.HttpSession;
-
-@Jpf.Controller (
-)
-public class Controller extends PageFlowController
-{
-    private String _action;
-    private TreeElement _root;
-
-    public TreeElement getRoot()
-    {
-        return _root;
-    }
-    public void setRoot(TreeElement tree) 
-    {
-	_root = tree;
-    }
-    
-    public String getAction() {
-	return _action;
-    }
-
-    @Jpf.Action(
-       forwards={
-        @Jpf.Forward(name="index", path="Test.jsp")
-       }
-    )
-    protected Forward begin()
-    {
-        NameService ns = NameService.instance(getRequest().getSession());
-	ns.debugSetNameIntValue(653);
-	_action="begin";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-       forwards={
-        @Jpf.Forward(name="index", path="Test.jsp")
-       }
-    )
-    protected Forward select()
-    {
-	_action="select";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-       forwards={
-        @Jpf.Forward(name="index", path="Test.jsp")
-       }
-    )
-    protected Forward subTreeSelect()
-    {
-	_action="subTreeSelect";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-       forwards={
-        @Jpf.Forward(name="index", path="Test.jsp")
-       }
-    )
-    protected Forward selectOverride()
-    {
-	_action="selectOverride";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="index", path="Test.jsp")
-        }
-    )
-    protected Forward reset()
-    {
-        _root = null;
-	_action="reset";
-        return new Forward("index");
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is created.
-     */
-    protected void onCreate()
-    {
-    }
-
-    /**
-     * Callback that is invoked when this controller instance is destroyed.
-     */
-    protected void onDestroy(HttpSession session)
-    {
-    }
-}
-
+package bugs.j297;
+
+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 javax.servlet.http.HttpSession;
+
+@Jpf.Controller (
+)
+public class Controller extends PageFlowController
+{
+    private String _action;
+    private TreeElement _root;
+
+    public TreeElement getRoot()
+    {
+        return _root;
+    }
+    public void setRoot(TreeElement tree) 
+    {
+	_root = tree;
+    }
+    
+    public String getAction() {
+	return _action;
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward begin()
+    {
+        NameService ns = NameService.instance(getRequest().getSession());
+	ns.debugSetNameIntValue(653);
+	_action="begin";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward select()
+    {
+	_action="select";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward subTreeSelect()
+    {
+	_action="subTreeSelect";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+       forwards={
+        @Jpf.Forward(name="index", path="Test.jsp")
+       }
+    )
+    protected Forward selectOverride()
+    {
+	_action="selectOverride";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="Test.jsp")
+        }
+    )
+    protected Forward reset()
+    {
+        _root = null;
+	_action="reset";
+        return new Forward("index");
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is created.
+     */
+    protected void onCreate()
+    {
+    }
+
+    /**
+     * Callback that is invoked when this controller instance is destroyed.
+     */
+    protected void onDestroy(HttpSession session)
+    {
+    }
+}
+

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Test.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Test.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Test.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Test.jsp Wed May 10 08:49:42 2006
@@ -1,50 +1,50 @@
-<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
-<netui:html>
-<head>
-    <title>Dynamic Tree with RunAtClient and ExpandOnClient
-    </title>
-</head>
-<netui:body>
-<h4>Verify Action Override</h4>
-<p style="color:green">Verify that the action on a treeItem
-overrides the inheritted action and is not applied to the children.
-</p>
-<netui:anchor action="reset">Reset</netui:anchor><br>
-Action: ${pageFlow.action}<br>
-<!--Begin scriptContainer-->
-<div style="border: thin solid;height: 300px;">
-<netui:scriptContainer>
-    <netui:scriptHeader/>
-    <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
-        selectionAction="select" tagId="tree" runAtClient="true"
-	iconRoot="/coreWeb/tree/images"
-        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; text-decoration: none;"
-	unselectedStyle="text-decoration: none"
-    >
-            <netui:treeItem expanded="true">
-                <netui:treeLabel>0</netui:treeLabel>
-                <netui:treeItem expanded="true">
-                    <netui:treeLabel>0.0 [sts]</netui:treeLabel>
-                    <netui:treePropertyOverride selectionAction="subTreeSelect" />
-                    <netui:treeItem action="selectOverride" expanded="true">
-                        <netui:treeLabel>0.0.0 [O]</netui:treeLabel>
-                        <netui:treeItem icon="alien.gif">0.0.0.0 [sts]</netui:treeItem>
-                        <netui:treeItem icon="alien.gif">0.0.0.1 [sts]</netui:treeItem>
-                    </netui:treeItem>
-                </netui:treeItem>
-                <netui:treeItem expanded="true" action="selectOverride">
-                    <netui:treeLabel>0.1 [0]</netui:treeLabel>
-                    <netui:treeItem icon="cool.gif">0.1.0</netui:treeItem>
-                    <netui:treeItem icon="cool.gif">0.1.1</netui:treeItem>
-                </netui:treeItem>
-                <netui:treeItem expanded="true"><netui:treeLabel>0.2</netui:treeLabel>
-                    <netui:treeItem icon="cool.gif" action="selectOverride">0.2.0 [O]</netui:treeItem>
-                    <netui:treeItem icon="cool.gif">0.2.1</netui:treeItem>
-		</netui:treeItem>
-            </netui:treeItem>
-    </netui:tree>
-</netui:scriptContainer>
-</div>
-<!--End scriptContainer-->
-   </netui:body>
-</netui:html>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<netui:html>
+<head>
+    <title>Dynamic Tree with RunAtClient and ExpandOnClient
+    </title>
+</head>
+<netui:body>
+<h4>Verify Action Override</h4>
+<p style="color:green">Verify that the action on a treeItem
+overrides the inheritted action and is not applied to the children.
+</p>
+<netui:anchor action="reset">Reset</netui:anchor><br>
+Action: ${pageFlow.action}<br>
+<!--Begin scriptContainer-->
+<div style="border: thin solid;height: 300px;">
+<netui:scriptContainer>
+    <netui:scriptHeader/>
+    <netui:tree dataSource="pageFlow.root" escapeForHtml="true"
+        selectionAction="select" tagId="tree" runAtClient="true"
+	iconRoot="/coreWeb/tree/images"
+        selectedStyle="background-color: #FFD185; font-color: #FFFFFF; text-decoration: none;"
+	unselectedStyle="text-decoration: none"
+    >
+            <netui:treeItem expanded="true">
+                <netui:treeLabel>0</netui:treeLabel>
+                <netui:treeItem expanded="true">
+                    <netui:treeLabel>0.0 [sts]</netui:treeLabel>
+                    <netui:treePropertyOverride selectionAction="subTreeSelect" />
+                    <netui:treeItem action="selectOverride" expanded="true">
+                        <netui:treeLabel>0.0.0 [O]</netui:treeLabel>
+                        <netui:treeItem icon="alien.gif">0.0.0.0 [sts]</netui:treeItem>
+                        <netui:treeItem icon="alien.gif">0.0.0.1 [sts]</netui:treeItem>
+                    </netui:treeItem>
+                </netui:treeItem>
+                <netui:treeItem expanded="true" action="selectOverride">
+                    <netui:treeLabel>0.1 [0]</netui:treeLabel>
+                    <netui:treeItem icon="cool.gif">0.1.0</netui:treeItem>
+                    <netui:treeItem icon="cool.gif">0.1.1</netui:treeItem>
+                </netui:treeItem>
+                <netui:treeItem expanded="true"><netui:treeLabel>0.2</netui:treeLabel>
+                    <netui:treeItem icon="cool.gif" action="selectOverride">0.2.0 [O]</netui:treeItem>
+                    <netui:treeItem icon="cool.gif">0.2.1</netui:treeItem>
+		</netui:treeItem>
+            </netui:treeItem>
+    </netui:tree>
+</netui:scriptContainer>
+</div>
+<!--End scriptContainer-->
+   </netui:body>
+</netui:html>

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j297/Test.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j299/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j299/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j299/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j299/index.jsp Wed May 10 08:49:42 2006
@@ -1,19 +1,19 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
-<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
-<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
-<netui:html>
-    <head>
-        <netui:base/>
-    </head>
-    <netui:body>
-        Causes Script error <br />
-        <netui:anchor onMouseDown="alert(\'OnMOUSEDOWN\')" href="index.jsp">Script Error For onmousedown when formatted this way.</netui:anchor>
-    <br />
-        The following generate valid javascript:
-    <br />
-        <netui:anchor onMouseDown='alert("onmousedown")' href="index.jsp">No script error when double quotes switched with single quotes</netui:anchor>
-        <a href="index.jsp" onmousedown="alert('onmousedown')">No script error when html anchor tag is used with the same formatting as netui:anchor which returns a script error</a>
-        <a href="index.jsp" onmousedown='alert("onmousedown")'>No script error</a>
-   </netui:body>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<%@ taglib prefix="netui-data" uri="http://beehive.apache.org/netui/tags-databinding-1.0"%>
+<%@ taglib prefix="netui-template" uri="http://beehive.apache.org/netui/tags-template-1.0"%>
+<netui:html>
+    <head>
+        <netui:base/>
+    </head>
+    <netui:body>
+        Causes Script error <br />
+        <netui:anchor onMouseDown="alert(\'OnMOUSEDOWN\')" href="index.jsp">Script Error For onmousedown when formatted this way.</netui:anchor>
+    <br />
+        The following generate valid javascript:
+    <br />
+        <netui:anchor onMouseDown='alert("onmousedown")' href="index.jsp">No script error when double quotes switched with single quotes</netui:anchor>
+        <a href="index.jsp" onmousedown="alert('onmousedown')">No script error when html anchor tag is used with the same formatting as netui:anchor which returns a script error</a>
+        <a href="index.jsp" onmousedown='alert("onmousedown")'>No script error</a>
+   </netui:body>
 </netui:html> 

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j324/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j324/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j324/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j324/Controller.java Wed May 10 08:49:42 2006
@@ -1,65 +1,65 @@
-package bugs.j324;
-
-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.tags.tree.TreeElement;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="index.jsp")
-   }
-)
-
-public class Controller extends PageFlowController
-{
-    private TreeElement selectExpandJspTree1;
-    private String _action = "begin";
-
-    //Actions and Events (Select and Expand)
-    public TreeElement getSelectExpandJspTree1(){ return this.selectExpandJspTree1; }
-    public void setSelectExpandJspTree1(TreeElement selectExpandJspTree1){ this.selectExpandJspTree1= selectExpandJspTree1; }
-    public String getAction() {return _action;}
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success",
-                     navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward mySelectionAction()
-    {
-	_action="mySelectionAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward myExpansionAction()
-    {
-	_action="myExpansionAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward myTreeAction()
-    {
-	_action="myTreeAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-    
-    @Jpf.Action(forwards = { 
-    @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-})
-    protected Forward resetTrees()        {
-	_action="resetTrees";
-        Forward forward = new Forward("success");
-        selectExpandJspTree1= null;
-        return forward;
-    }
-
-}
+package bugs.j324;
+
+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.tags.tree.TreeElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="index.jsp")
+   }
+)
+
+public class Controller extends PageFlowController
+{
+    private TreeElement selectExpandJspTree1;
+    private String _action = "begin";
+
+    //Actions and Events (Select and Expand)
+    public TreeElement getSelectExpandJspTree1(){ return this.selectExpandJspTree1; }
+    public void setSelectExpandJspTree1(TreeElement selectExpandJspTree1){ this.selectExpandJspTree1= selectExpandJspTree1; }
+    public String getAction() {return _action;}
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success",
+                     navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward mySelectionAction()
+    {
+	_action="mySelectionAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myExpansionAction()
+    {
+	_action="myExpansionAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myTreeAction()
+    {
+	_action="myTreeAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+    
+    @Jpf.Action(forwards = { 
+    @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+})
+    protected Forward resetTrees()        {
+	_action="resetTrees";
+        Forward forward = new Forward("success");
+        selectExpandJspTree1= null;
+        return forward;
+    }
+
+}

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j324/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j324/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j324/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j324/index.jsp Wed May 10 08:49:42 2006
@@ -1,29 +1,29 @@
-<%@ 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>
-            Netui Tree Requirements
-        </title>
-    </head>
-    <netui:body>
-<H3>Override expansionAction</H3>
-<netui:anchor action="resetTrees">Reset Trees</netui:anchor><BR />
-<p style="color:green">This test will verify that a treePropertyOverride
-works to override both the selectionAction and expansionAction.
-</p>
-Action: ${pageFlow.action}<br><br>
-<netui:tree dataSource="pageFlow.selectExpandJspTree1" selectionAction="myTreeAction" expansionAction="myTreeAction" tagId="selectExpandJspTree1" >
-   <netui:treeItem><netui:treeLabel>TreeItem1</netui:treeLabel>
-      <netui:treePropertyOverride selectionAction="mySelectionAction" expansionAction="myExpansionAction" />
-      <netui:treeItem><netui:treeLabel>TreeItem1.1</netui:treeLabel>
-        <netui:treeItem>TreeItem1.1.1</netui:treeItem>
-      </netui:treeItem>
-   </netui:treeItem>
-</netui:tree>
-
-<BR />
-
-</netui:body>
-
+<%@ 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>
+            Netui Tree Requirements
+        </title>
+    </head>
+    <netui:body>
+<H3>Override expansionAction</H3>
+<netui:anchor action="resetTrees">Reset Trees</netui:anchor><BR />
+<p style="color:green">This test will verify that a treePropertyOverride
+works to override both the selectionAction and expansionAction.
+</p>
+Action: ${pageFlow.action}<br><br>
+<netui:tree dataSource="pageFlow.selectExpandJspTree1" selectionAction="myTreeAction" expansionAction="myTreeAction" tagId="selectExpandJspTree1" >
+   <netui:treeItem><netui:treeLabel>TreeItem1</netui:treeLabel>
+      <netui:treePropertyOverride selectionAction="mySelectionAction" expansionAction="myExpansionAction" />
+      <netui:treeItem><netui:treeLabel>TreeItem1.1</netui:treeLabel>
+        <netui:treeItem>TreeItem1.1.1</netui:treeItem>
+      </netui:treeItem>
+   </netui:treeItem>
+</netui:tree>
+
+<BR />
+
+</netui:body>
+
 </netui:html>       

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j326/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j326/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j326/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j326/Controller.java Wed May 10 08:49:42 2006
@@ -1,72 +1,72 @@
-package bugs.j326;
-
-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.tags.tree.TreeElement;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="index.jsp")
-   }
-)
-public class Controller extends PageFlowController
-{
-    private String _action = "begin";
-    private TreeElement selectExpandJspTree1;
-
-    //Actions and Events (Select and Expand)
-    public TreeElement getSelectExpandJspTree1()
-    {
-	return this.selectExpandJspTree1;
-    }
-    public void setSelectExpandJspTree1(TreeElement selectExpandJspTree1)
-    {
-	this.selectExpandJspTree1= selectExpandJspTree1;
-    }
-
-    public String getAction() {
-	return _action;
-    }
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success",
-                     navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward mySelectionAction()
-    {
-	_action = "mySelectionAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward myExpansionAction()
-    {
-	_action = "myExpansionAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward myTreeAction()
-    {
-	_action = "myTreeAction";
-        Forward forward = new Forward("success");
-        return forward;
-    }
-    
-    @Jpf.Action(forwards = { 
-    @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-})
-    protected Forward resetTrees()        {
-	_action = "resetTrees";
-        Forward forward = new Forward("success");
-        selectExpandJspTree1= null;
-        return forward;
-    }
-}
+package bugs.j326;
+
+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.tags.tree.TreeElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="index.jsp")
+   }
+)
+public class Controller extends PageFlowController
+{
+    private String _action = "begin";
+    private TreeElement selectExpandJspTree1;
+
+    //Actions and Events (Select and Expand)
+    public TreeElement getSelectExpandJspTree1()
+    {
+	return this.selectExpandJspTree1;
+    }
+    public void setSelectExpandJspTree1(TreeElement selectExpandJspTree1)
+    {
+	this.selectExpandJspTree1= selectExpandJspTree1;
+    }
+
+    public String getAction() {
+	return _action;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success",
+                     navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward mySelectionAction()
+    {
+	_action = "mySelectionAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myExpansionAction()
+    {
+	_action = "myExpansionAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myTreeAction()
+    {
+	_action = "myTreeAction";
+        Forward forward = new Forward("success");
+        return forward;
+    }
+    
+    @Jpf.Action(forwards = { 
+    @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+})
+    protected Forward resetTrees()        {
+	_action = "resetTrees";
+        Forward forward = new Forward("success");
+        selectExpandJspTree1= null;
+        return forward;
+    }
+}

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j326/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j326/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j326/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j326/index.jsp Wed May 10 08:49:42 2006
@@ -1,34 +1,34 @@
-<%@ 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>
-            Netui Tree Requirements
-        </title>
-    </head>
-    <netui:body>
-<H3>Mixed Content</H3>
-<netui:anchor action="resetTrees">Reset Trees</netui:anchor><BR />
-<p style="color:green">This test verifies that labels defined in bodies don't
-actually get rendered if the treeItem also contains children.  This is a 
-a mixed content situation, and we don't allow it.  Instead, the tree needs
-to use treeLabel to define it's labels.  Below you should only see labels for TreeItem1.1.1.  All other labels should be blank.
-</p>
-Action: ${pageFlow.action}<br>
-<netui:tree dataSource="pageFlow.selectExpandJspTree1"
-	selectionAction="myTreeAction" expansionAction="myTreeAction"
-	tagId="selectExpandJspTree1" >
-   <netui:treeItem>TreeItem1
-      <netui:treePropertyOverride selectionAction="mySelectionAction"
-		expansionAction="myExpansionAction" />
-      <netui:treeItem>TreeItem1.1
-        <netui:treeItem>TreeItem1.1.1</netui:treeItem>
-      </netui:treeItem>
-   </netui:treeItem>
-</netui:tree>
-
-<BR />
-
-</netui:body>
-
+<%@ 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>
+            Netui Tree Requirements
+        </title>
+    </head>
+    <netui:body>
+<H3>Mixed Content</H3>
+<netui:anchor action="resetTrees">Reset Trees</netui:anchor><BR />
+<p style="color:green">This test verifies that labels defined in bodies don't
+actually get rendered if the treeItem also contains children.  This is a 
+a mixed content situation, and we don't allow it.  Instead, the tree needs
+to use treeLabel to define it's labels.  Below you should only see labels for TreeItem1.1.1.  All other labels should be blank.
+</p>
+Action: ${pageFlow.action}<br>
+<netui:tree dataSource="pageFlow.selectExpandJspTree1"
+	selectionAction="myTreeAction" expansionAction="myTreeAction"
+	tagId="selectExpandJspTree1" >
+   <netui:treeItem>TreeItem1
+      <netui:treePropertyOverride selectionAction="mySelectionAction"
+		expansionAction="myExpansionAction" />
+      <netui:treeItem>TreeItem1.1
+        <netui:treeItem>TreeItem1.1.1</netui:treeItem>
+      </netui:treeItem>
+   </netui:treeItem>
+</netui:tree>
+
+<BR />
+
+</netui:body>
+
 </netui:html>       

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j346/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j346/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j346/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j346/Controller.java Wed May 10 08:49:42 2006
@@ -1,23 +1,23 @@
-package bugs.j346;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.tags.tree.TreeElement;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="index.jsp"),
-      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
-   }
-)
-
-public class Controller extends PageFlowController
-{
-
-    TreeElement tree1;
-
-    public TreeElement getTree1(){ return this.tree1; }
-    public void setTree1(TreeElement tree1){ this.tree1= tree1; }
-
-}
-
+package bugs.j346;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.netui.tags.tree.TreeElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="index.jsp"),
+      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
+   }
+)
+
+public class Controller extends PageFlowController
+{
+
+    TreeElement tree1;
+
+    public TreeElement getTree1(){ return this.tree1; }
+    public void setTree1(TreeElement tree1){ this.tree1= tree1; }
+
+}
+

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j346/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j346/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j346/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j346/index.jsp Wed May 10 08:49:42 2006
@@ -1,21 +1,21 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-    <head>
-        <title>
-            Netui Tree Requirements
-        </title>
-    </head>
-    <netui:body>
-<H3>If this text and the tree appears below, the test passes. Normally there is an NPE when you hit this page.</H3>
-<BR />
-<netui:tree dataSource="pageFlow.tree1" selectionAction="postback" tagId="tree1" >
-   <netui:treeItem>Hello.</netui:treeItem>
-   <netui:treeItem>Goodbye.</netui:treeItem>                                        
-</netui:tree>
-
-</netui:body>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+    <head>
+        <title>
+            Netui Tree Requirements
+        </title>
+    </head>
+    <netui:body>
+<H3>If this text and the tree appears below, the test passes. Normally there is an NPE when you hit this page.</H3>
+<BR />
+<netui:tree dataSource="pageFlow.tree1" selectionAction="postback" tagId="tree1" >
+   <netui:treeItem>Hello.</netui:treeItem>
+   <netui:treeItem>Goodbye.</netui:treeItem>                                        
+</netui:tree>
+
+</netui:body>
 </netui:html>       

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j359/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j359/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j359/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j359/index.jsp Wed May 10 08:49:42 2006
@@ -1,9 +1,9 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
-<netui:html idScope="foo">
-<head>
-</head>
-<body>
-Verify that the div is not generated by the netui HTML tag.
-</body>
-</netui:html>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<netui:html idScope="foo">
+<head>
+</head>
+<body>
+Verify that the div is not generated by the netui HTML tag.
+</body>
+</netui:html>

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j410/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j410/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j410/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j410/index.jsp Wed May 10 08:49:42 2006
@@ -1,20 +1,20 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
-<netui:html>
-   <head>
-      <title>
-	scriptHeader tag
-      </title>
-   </head>
-<netui:body>
-        <p style="color:green">This test will test various configurations
-	of the ScriptBlock tag.  It verifies that we create valid
-	script blocks.  you should see two alerts and no errors on
-	the Java Console.</p>
-<netui:scriptBlock>alert('alert one');</netui:scriptBlock>
-<netui:scriptBlock></netui:scriptBlock>
-<netui:scriptBlock>
-alert('alert two');
-</netui:scriptBlock>
-</netui:body>
-</netui:html>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%>
+<netui:html>
+   <head>
+      <title>
+	scriptHeader tag
+      </title>
+   </head>
+<netui:body>
+        <p style="color:green">This test will test various configurations
+	of the ScriptBlock tag.  It verifies that we create valid
+	script blocks.  you should see two alerts and no errors on
+	the Java Console.</p>
+<netui:scriptBlock>alert('alert one');</netui:scriptBlock>
+<netui:scriptBlock></netui:scriptBlock>
+<netui:scriptBlock>
+alert('alert two');
+</netui:scriptBlock>
+</netui:body>
+</netui:html>

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j430/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j430/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j430/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j430/Controller.java Wed May 10 08:49:42 2006
@@ -1,17 +1,17 @@
-package bugs.j430;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="index.jsp")
-   }
-)
-
-public class Controller extends PageFlowController
-{
-    private String _string = null;
-    public String getString(){ return _string; }
-}
-
+package bugs.j430;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="index.jsp")
+   }
+)
+
+public class Controller extends PageFlowController
+{
+    private String _string = null;
+    public String getString(){ return _string; }
+}
+

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j430/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j430/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j430/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j430/index.jsp Wed May 10 08:49:42 2006
@@ -1,15 +1,15 @@
-<%@ 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>
-            Binding a parameter map to a string
-        </title>
-    </head>
-<netui:body>
-   <netui:anchor action="begin">Post
-      <netui:parameterMap map="${pageFlow.string}" />
-   </netui:anchor>
-
-</netui:body>
+<%@ 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>
+            Binding a parameter map to a string
+        </title>
+    </head>
+<netui:body>
+   <netui:anchor action="begin">Post
+      <netui:parameterMap map="${pageFlow.string}" />
+   </netui:anchor>
+
+</netui:body>
 </netui:html>       

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j461/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j461/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j461/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j461/Controller.java Wed May 10 08:49:42 2006
@@ -1,100 +1,100 @@
-package bugs.j461;
-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.tags.tree.TreeElement;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="index.jsp"),
-      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
-   }
-)
-
-public class Controller extends PageFlowController
-{
-   
-   /**
-    * A tree containing the list of products to browse.
-    */
-    private TreeElement productTree;
-    
-	//public TreeElement childTree;
-	
-
-    public TreeElement getProductTree(){
-        return this.productTree;
-    }
-    
-    public void setProductTree(TreeElement productTree){
-    	this.productTree = productTree;
-    }
-
-   protected void onCreate() {
-      makeTree();
-	
-   }
-
-/**
- * This is an action that puts the name of the node selected into the
- * request so that it may be used on the page. 
- * The response is always back to the current page.
- * If a tree node has been selected, 
- * then an attribute with name 'productName' is put into the request.
- */
-
-@Jpf.Action( forwards={
-   @Jpf.Forward( name="success", navigateTo=Jpf.NavigateTo.currentPage )
-} )
-public Forward select() {
-   // the node name is provided in the parameter list; I want the label
-   return new Forward( "success" );
-}
-
-
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success",
-                     path = "index.jsp")
-    })
-    protected Forward newAction1()
-    {
-        Forward forward = new Forward("success");
-        return forward;
-    }
-
-	public void makeTree() {
-		productTree = new TreeElement("Root Node",true);
-		productTree.addChild(0, new TreeElement("CHILDNODE",false));
-		//productTree.removeChild(0);
-	}
-
-
-
-	public void reset(){
-		makeTree();
-	}
-     @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward resetTree()
-    {
-		reset();
-		return new Forward("success");
-	}
-
-	public void removeaKid(){
-		productTree.removeChild(0);
-	}
-     @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward removeKid()
-    {
-		removeaKid();
-		return new Forward("success");
-	}
-
-
-
-}
-
+package bugs.j461;
+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.tags.tree.TreeElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="index.jsp"),
+      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage)
+   }
+)
+
+public class Controller extends PageFlowController
+{
+   
+   /**
+    * A tree containing the list of products to browse.
+    */
+    private TreeElement productTree;
+    
+	//public TreeElement childTree;
+	
+
+    public TreeElement getProductTree(){
+        return this.productTree;
+    }
+    
+    public void setProductTree(TreeElement productTree){
+    	this.productTree = productTree;
+    }
+
+   protected void onCreate() {
+      makeTree();
+	
+   }
+
+/**
+ * This is an action that puts the name of the node selected into the
+ * request so that it may be used on the page. 
+ * The response is always back to the current page.
+ * If a tree node has been selected, 
+ * then an attribute with name 'productName' is put into the request.
+ */
+
+@Jpf.Action( forwards={
+   @Jpf.Forward( name="success", navigateTo=Jpf.NavigateTo.currentPage )
+} )
+public Forward select() {
+   // the node name is provided in the parameter list; I want the label
+   return new Forward( "success" );
+}
+
+
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success",
+                     path = "index.jsp")
+    })
+    protected Forward newAction1()
+    {
+        Forward forward = new Forward("success");
+        return forward;
+    }
+
+	public void makeTree() {
+		productTree = new TreeElement("Root Node",true);
+		productTree.addChild(0, new TreeElement("CHILDNODE",false));
+		//productTree.removeChild(0);
+	}
+
+
+
+	public void reset(){
+		makeTree();
+	}
+     @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward resetTree()
+    {
+		reset();
+		return new Forward("success");
+	}
+
+	public void removeaKid(){
+		productTree.removeChild(0);
+	}
+     @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward removeKid()
+    {
+		removeaKid();
+		return new Forward("success");
+	}
+
+
+
+}
+

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j461/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j461/index.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j461/index.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j461/index.jsp Wed May 10 08:49:42 2006
@@ -1,20 +1,20 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-    <head>
-        <title>
-            Netui Tree - Tree Creation - basic pageFlow tree
-        </title>
-    </head>
-    <netui:body>
-		<netui:anchor action="resetTree">Reset </netui:anchor><BR />
-		<netui:anchor action="removeKid">REMOVE CHILD </netui:anchor><br/>
-
-	<p>
-		<netui:tree dataSource="pageFlow.productTree" selectionAction="select" tagId="tree1"/>
-		
-	</p>
-	</netui:body>
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+    <head>
+        <title>
+            Netui Tree - Tree Creation - basic pageFlow tree
+        </title>
+    </head>
+    <netui:body>
+		<netui:anchor action="resetTree">Reset </netui:anchor><BR />
+		<netui:anchor action="removeKid">REMOVE CHILD </netui:anchor><br/>
+
+	<p>
+		<netui:tree dataSource="pageFlow.productTree" selectionAction="select" tagId="tree1"/>
+		
+	</p>
+	</netui:body>
 </netui:html>

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Controller.java Wed May 10 08:49:42 2006
@@ -1,36 +1,36 @@
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * $Header:$
- */
-package bugs.j475;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action
-        (forwards = {
-            @Jpf.Forward(name = "success",
-                     path = "Test.jsp")
-    })
-    public Forward begin ()
-    {
-        return new Forward ("success");
-    }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package bugs.j475;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller
+public class Controller extends PageFlowController
+{
+    @Jpf.Action
+        (forwards = {
+            @Jpf.Forward(name = "success",
+                     path = "Test.jsp")
+    })
+    public Forward begin ()
+    {
+        return new Forward ("success");
+    }
+}

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Test.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Test.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Test.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Test.jsp Wed May 10 08:49:42 2006
@@ -1,33 +1,33 @@
-<%@ 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>JavaScript Bug</title>
-</head>
-<netui:body>
-<script>
-    function test (element)
-    {
-        var testAttrId = lookupIdByTagId ("testElem", element);
-        alert ("HTML:" + testAttrId);
-        testAttrId = getNetuiTagName ("testElem", element);
-        alert ("HTML:" + testAttrId);
-        var testAttr = document.getElementById (testAttrId);
-        alert ("HTML:" + testAttr.innerHTML);
-    }
-</script>
-<netui:anchor href="TestXml.jsp">Xml Document</netui:anchor>
-<netui:scriptContainer generateIdScope="true">
-<table>
-    <tr>
-        <td>
-                <a href="Test.jsp" onClick="test (this);">bar</a><br>
-                <netui:span tagId="testElem" value="span" />
-        </td>
-    </tr>
-</table>
-</netui:scriptContainer>
-</netui:body>
-</netui:html>
-
-
+<%@ 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>JavaScript Bug</title>
+</head>
+<netui:body>
+<script>
+    function test (element)
+    {
+        var testAttrId = lookupIdByTagId ("testElem", element);
+        alert ("HTML:" + testAttrId);
+        testAttrId = getNetuiTagName ("testElem", element);
+        alert ("HTML:" + testAttrId);
+        var testAttr = document.getElementById (testAttrId);
+        alert ("HTML:" + testAttr.innerHTML);
+    }
+</script>
+<netui:anchor href="TestXml.jsp">Xml Document</netui:anchor>
+<netui:scriptContainer generateIdScope="true">
+<table>
+    <tr>
+        <td>
+                <a href="Test.jsp" onClick="test (this);">bar</a><br>
+                <netui:span tagId="testElem" value="span" />
+        </td>
+    </tr>
+</table>
+</netui:scriptContainer>
+</netui:body>
+</netui:html>
+
+

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j475/Test.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j475/TestXml.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j475/TestXml.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j475/TestXml.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j475/TestXml.jsp Wed May 10 08:49:42 2006
@@ -1,33 +1,33 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<netui:html documentType="xhtml1-transitional">
-<head>
-   <title>JavaScript Bug</title>
-</head>
-<netui:body>
-<script>
-    function test (element)
-    {
-        var testAttrId = lookupIdByTagId ("testElem", element);
-        alert ("XML:" + testAttrId);
-        testAttrId = getNetuiTagName ("testElem", element);
-        alert ("XML:" + testAttrId);
-        var testAttr = document.getElementById (testAttrId);
-        alert ("XML:" + testAttr.innerHTML);
-    }
-</script>
-<netui:anchor href="Test.jsp">Html Document</netui:anchor>
-<netui:scriptContainer generateIdScope="true">
-<table>
-    <tr>
-        <td>
-                <a href="TestXml.jsp" onClick="test (this);">bar</a><br>
-                <netui:span tagId="testElem" value="span" />
-        </td>
-    </tr>
-</table>
-</netui:scriptContainer>
-</netui:body>
-</netui:html>
-
-
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<netui:html documentType="xhtml1-transitional">
+<head>
+   <title>JavaScript Bug</title>
+</head>
+<netui:body>
+<script>
+    function test (element)
+    {
+        var testAttrId = lookupIdByTagId ("testElem", element);
+        alert ("XML:" + testAttrId);
+        testAttrId = getNetuiTagName ("testElem", element);
+        alert ("XML:" + testAttrId);
+        var testAttr = document.getElementById (testAttrId);
+        alert ("XML:" + testAttr.innerHTML);
+    }
+</script>
+<netui:anchor href="Test.jsp">Html Document</netui:anchor>
+<netui:scriptContainer generateIdScope="true">
+<table>
+    <tr>
+        <td>
+                <a href="TestXml.jsp" onClick="test (this);">bar</a><br>
+                <netui:span tagId="testElem" value="span" />
+        </td>
+    </tr>
+</table>
+</netui:scriptContainer>
+</netui:body>
+</netui:html>
+
+

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j475/TestXml.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j478/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j478/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j478/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j478/Controller.java Wed May 10 08:49:42 2006
@@ -1,185 +1,185 @@
-package bugs.j478;
-
-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.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRootElement;
-
-@Jpf.Controller (
-   simpleActions={
-      @Jpf.SimpleAction(name="begin", path="attributes.jsp"),
-      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage),
-      @Jpf.SimpleAction(name="goHome", path="attributes.jsp")
-   }
-)
-
-public class Controller extends PageFlowController
-{
-
-    //Attributes
-    TreeElement attrJspTree1;
-    TreeElement attrJspTree2;
-    TreeElement attrJspTree3;
-    TreeElement attrJspTree4;
-
-    TreeRootElement attrDynTree1;
-    TreeRootElement attrDynTree2;
-    TreeElement attrDynTree3;
-    TreeElement attrDynTree4;
-
-
-//Methods
-
-    //Tree Creation
-    public TreeRootElement getAttrDynTree1(){ return this.attrDynTree1; }
-    public void setAttrDynTree1(TreeRootElement attrDynTree1){ this.attrDynTree1= attrDynTree1; }
-
-    public TreeRootElement getAttrDynTree2(){ return this.attrDynTree2; }
-    public void setAttrDynTree2(TreeRootElement attrDynTree2){ this.attrDynTree2= attrDynTree2; }
-
-    public TreeElement getAttrDynTree3(){ return this.attrDynTree3; }
-    public void setAttrDynTree3(MyTreeElement attrDynTree3){ this.attrDynTree3= attrDynTree3; }
-
-    public TreeElement getAttrDynTree4(){ return this.attrDynTree4; }
-    public void setAttrDynTree4(TreeElement attrDynTree4){ this.attrDynTree4 = attrDynTree4; }
-
-   
-    //Attributes
-    public TreeElement getAttrJspTree1(){ return this.attrJspTree1; }
-    public void setAttrJspTree1(TreeElement attrJspTree1){ this.attrJspTree1= attrJspTree1; }
-
-    public TreeElement getAttrJspTree2(){ return this.attrJspTree2; }
-    public void setAttrJspTree2(TreeElement attrJspTree2){ this.attrJspTree2= attrJspTree2; }
-
-    public TreeElement getAttrJspTree3(){ return this.attrJspTree3; }
-    public void setAttrJspTree3(TreeElement attrJspTree3){ this.attrJspTree3= attrJspTree3; }
-
-    public TreeElement getAttrJspTree4(){ return this.attrJspTree4; }
-    public void setAttrJspTree4(TreeElement attrJspTree4){ this.attrJspTree4= attrJspTree4; }
-
-   
-
-   protected void onCreate() {
-      attrDynTree1 = new TreeRootElement( "Dynamic Tree 1", true );
-     attrDynTree1.setTitle("HELLOOOOOOOOOO. This should appear in the HTML source.");
-      attrDynTree1.addChild( new TreeElement("TreeElement1 named in the page flow", false) );
-      attrDynTree1.getChild(0).addChild( new TreeElement("TreeElement2 named in the page flow", false) );
-	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement3 named in the page flow", false) );
-	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement4 named in the page flow", false) );
-	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement5 named in the page flow", false) );
-	attrDynTree1.getChild(0).getChild(0).getChild(2).setDisabled(true);
-
-      attrDynTree2= new TreeRootElement( "Dynamic Tree 2", true );
-      attrDynTree2.addChild( new TreeElement("NOT disabled", false) );
-      attrDynTree2.getChild(0).addChild( new TreeElement("not disabled", false) );
-	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("disabled", false) );
-	attrDynTree2.getChild(0).getChild(0).getChild(0).setDisabled(false);
-	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("not disabled", false) );
-	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("disabled", false) );
-	attrDynTree2.getChild(0).getChild(0).getChild(2).setDisabled(true);
-
-
-	attrDynTree2.setRootNodeExpandedImage("rootminus.gif");
-	attrDynTree2.setRootNodeCollapsedImage("rootplus.gif");
-
-
-      attrDynTree3= new TreeElement( "Dynamic Tree 3", true );
-      attrDynTree3.addChild( new TreeElement("NOT disabled", true) );
-      attrDynTree3.getChild(0).addChild( new TreeElement("not disabled", true) );
-	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
-	attrDynTree3.getChild(0).getChild(0).getChild(0).setDisabled(true);
-	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("not disabled", true) );
-	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
-	attrDynTree3.getChild(0).getChild(0).getChild(2).setDisabled(true);
-
-
-  	attrDynTree4= new TreeElement( "Dynamic Tree 4", true );
-	attrDynTree4.addChild( new TreeElement("NOT disabled", true) );
-	attrDynTree4.getChild(0).addChild( new TreeElement("not disabled", true) );
-	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
-	attrDynTree4.getChild(0).getChild(0).getChild(0).setDisabled(true);
-	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("not disabled", true) );
-	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
-	attrDynTree4.getChild(0).getChild(0).getChild(2).setDisabled(true);
-
-    }
-
-    @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 myOverrideExpansionAction()
-    {
-        System.out.println("TEST MESSAGE: myOverrideExpansionAction() was been called.");
-        Forward forward = new Forward("success");
-        return forward;
-    }
-    
-    @Jpf.Action(forwards = {
-        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
-    })
-    protected Forward myOverrideSelectionAction()
-    {
-        System.out.println("TEST MESSAGE: myOverrideSelectionAction() 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();
-        
-        //Attributes
-        attrJspTree1 = null;
-        attrJspTree2 = null;
-        attrJspTree3 = null;
-        attrJspTree4 = null;
-                  
-        return forward;
-    }
-
-    class MyTreeElement extends TreeElement{
-
-        public MyTreeElement()
-        {
-            super();
-        }
-
-        public MyTreeElement(String s, boolean b)
-        {
-            super(s, b);
-        }
-    }
-
-
-    class MyTreeRootElement extends TreeRootElement{
-
-    }
-}
-
+package bugs.j478;
+
+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.tags.tree.TreeElement;
+import org.apache.beehive.netui.tags.tree.TreeRootElement;
+
+@Jpf.Controller (
+   simpleActions={
+      @Jpf.SimpleAction(name="begin", path="attributes.jsp"),
+      @Jpf.SimpleAction(name="postback", navigateTo=Jpf.NavigateTo.currentPage),
+      @Jpf.SimpleAction(name="goHome", path="attributes.jsp")
+   }
+)
+
+public class Controller extends PageFlowController
+{
+
+    //Attributes
+    TreeElement attrJspTree1;
+    TreeElement attrJspTree2;
+    TreeElement attrJspTree3;
+    TreeElement attrJspTree4;
+
+    TreeRootElement attrDynTree1;
+    TreeRootElement attrDynTree2;
+    TreeElement attrDynTree3;
+    TreeElement attrDynTree4;
+
+
+//Methods
+
+    //Tree Creation
+    public TreeRootElement getAttrDynTree1(){ return this.attrDynTree1; }
+    public void setAttrDynTree1(TreeRootElement attrDynTree1){ this.attrDynTree1= attrDynTree1; }
+
+    public TreeRootElement getAttrDynTree2(){ return this.attrDynTree2; }
+    public void setAttrDynTree2(TreeRootElement attrDynTree2){ this.attrDynTree2= attrDynTree2; }
+
+    public TreeElement getAttrDynTree3(){ return this.attrDynTree3; }
+    public void setAttrDynTree3(MyTreeElement attrDynTree3){ this.attrDynTree3= attrDynTree3; }
+
+    public TreeElement getAttrDynTree4(){ return this.attrDynTree4; }
+    public void setAttrDynTree4(TreeElement attrDynTree4){ this.attrDynTree4 = attrDynTree4; }
+
+   
+    //Attributes
+    public TreeElement getAttrJspTree1(){ return this.attrJspTree1; }
+    public void setAttrJspTree1(TreeElement attrJspTree1){ this.attrJspTree1= attrJspTree1; }
+
+    public TreeElement getAttrJspTree2(){ return this.attrJspTree2; }
+    public void setAttrJspTree2(TreeElement attrJspTree2){ this.attrJspTree2= attrJspTree2; }
+
+    public TreeElement getAttrJspTree3(){ return this.attrJspTree3; }
+    public void setAttrJspTree3(TreeElement attrJspTree3){ this.attrJspTree3= attrJspTree3; }
+
+    public TreeElement getAttrJspTree4(){ return this.attrJspTree4; }
+    public void setAttrJspTree4(TreeElement attrJspTree4){ this.attrJspTree4= attrJspTree4; }
+
+   
+
+   protected void onCreate() {
+      attrDynTree1 = new TreeRootElement( "Dynamic Tree 1", true );
+     attrDynTree1.setTitle("HELLOOOOOOOOOO. This should appear in the HTML source.");
+      attrDynTree1.addChild( new TreeElement("TreeElement1 named in the page flow", false) );
+      attrDynTree1.getChild(0).addChild( new TreeElement("TreeElement2 named in the page flow", false) );
+	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement3 named in the page flow", false) );
+	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement4 named in the page flow", false) );
+	attrDynTree1.getChild(0).getChild(0).addChild( new TreeElement("TreeElement5 named in the page flow", false) );
+	attrDynTree1.getChild(0).getChild(0).getChild(2).setDisabled(true);
+
+      attrDynTree2= new TreeRootElement( "Dynamic Tree 2", true );
+      attrDynTree2.addChild( new TreeElement("NOT disabled", false) );
+      attrDynTree2.getChild(0).addChild( new TreeElement("not disabled", false) );
+	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("disabled", false) );
+	attrDynTree2.getChild(0).getChild(0).getChild(0).setDisabled(false);
+	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("not disabled", false) );
+	attrDynTree2.getChild(0).getChild(0).addChild( new TreeElement("disabled", false) );
+	attrDynTree2.getChild(0).getChild(0).getChild(2).setDisabled(true);
+
+
+	attrDynTree2.setRootNodeExpandedImage("rootminus.gif");
+	attrDynTree2.setRootNodeCollapsedImage("rootplus.gif");
+
+
+      attrDynTree3= new TreeElement( "Dynamic Tree 3", true );
+      attrDynTree3.addChild( new TreeElement("NOT disabled", true) );
+      attrDynTree3.getChild(0).addChild( new TreeElement("not disabled", true) );
+	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
+	attrDynTree3.getChild(0).getChild(0).getChild(0).setDisabled(true);
+	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("not disabled", true) );
+	attrDynTree3.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
+	attrDynTree3.getChild(0).getChild(0).getChild(2).setDisabled(true);
+
+
+  	attrDynTree4= new TreeElement( "Dynamic Tree 4", true );
+	attrDynTree4.addChild( new TreeElement("NOT disabled", true) );
+	attrDynTree4.getChild(0).addChild( new TreeElement("not disabled", true) );
+	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
+	attrDynTree4.getChild(0).getChild(0).getChild(0).setDisabled(true);
+	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("not disabled", true) );
+	attrDynTree4.getChild(0).getChild(0).addChild( new TreeElement("disabled", true) );
+	attrDynTree4.getChild(0).getChild(0).getChild(2).setDisabled(true);
+
+    }
+
+    @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 myOverrideExpansionAction()
+    {
+        System.out.println("TEST MESSAGE: myOverrideExpansionAction() was been called.");
+        Forward forward = new Forward("success");
+        return forward;
+    }
+    
+    @Jpf.Action(forwards = {
+        @Jpf.Forward(name = "success", navigateTo=Jpf.NavigateTo.currentPage)
+    })
+    protected Forward myOverrideSelectionAction()
+    {
+        System.out.println("TEST MESSAGE: myOverrideSelectionAction() 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();
+        
+        //Attributes
+        attrJspTree1 = null;
+        attrJspTree2 = null;
+        attrJspTree3 = null;
+        attrJspTree4 = null;
+                  
+        return forward;
+    }
+
+    class MyTreeElement extends TreeElement{
+
+        public MyTreeElement()
+        {
+            super();
+        }
+
+        public MyTreeElement(String s, boolean b)
+        {
+            super(s, b);
+        }
+    }
+
+
+    class MyTreeRootElement extends TreeRootElement{
+
+    }
+}
+

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributes.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributes.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributes.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributes.jsp Wed May 10 08:49:42 2006
@@ -1,77 +1,77 @@
-<%@ page language="java" contentType="text/html;charset=UTF-8"%>
-
-<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
-<netui:html>
-    <head>
-        <title>Root Image Testing</title>
-        <link href="attributesStyle.css" rel="stylesheet" type="text/css">
-    </head>
-    <netui:body>
-<H3>Root Image Testing</H3>
-<netui:anchor action="resetTrees">Reset Trees</netui:anchor>
-<p>JSP static tree - Root node images are set correctly</p>
-<netui:tree
-	rootNodeCollapsedImage="rootplus.gif"
-	rootNodeExpandedImage="rootminus.gif"
-	itemIcon="alien.gif"
-	disabledStyle="color: #00FF7F; font-weight:bold;"
-	lastNodeCollapsedImage="plusbottom.gif"
-	lastNodeExpandedImage="minusbottom.gif"
-	nodeCollapsedImage="plus.gif"
-	nodeExpandedImage="minus.gif"
-	verticalLineImage="line.gif"
-	lineJoinImage="join.gif"
-	lastLineJoinImage="joinbottom.gif"
-	imageRoot="."
-	dataSource="pageFlow.attrJspTree1"
-	selectionAction="postback"
-	tagId="attrJspTree1">
-    <netui:treeItem expanded="true"><netui:treeLabel>My Attribute Tree</netui:treeLabel>
-       <netui:treeItem expanded="true"><netui:treeLabel>TreeItem1</netui:treeLabel>
-          <netui:treeItem>TreeItem1.1</netui:treeItem>
-       </netui:treeItem>
-    </netui:treeItem>
-</netui:tree>
-<br />
-
-<p>Dynamic pageFlow tree - Root node images and all others are set in the JSP.  Root node images do not appear in the rendered HTML but the other lastNode, itemIcon, etc. images do appear as expected</p>
-<netui:tree
-	rootNodeCollapsedImage="rootplus.gif"
-	rootNodeExpandedImage="rootminus.gif"
-	itemIcon="alien.gif"
-	disabledStyle="color: #00FF7F; font-weight:bold;"
-	lastNodeCollapsedImage="plusbottom.gif"
-	lastNodeExpandedImage="minusbottom.gif"
-	nodeCollapsedImage="plus.gif"
-	nodeExpandedImage="minus.gif"
-	verticalLineImage="line.gif"
-	lineJoinImage="join.gif"
-	lastLineJoinImage="joinbottom.gif"
-	imageRoot="."
-	dataSource="pageFlow.attrDynTree1"
-	selectionAction="postback"
-	tagId="attrDynTree1" />
-
-<p>None ITreeRootElement used for the root.  Set the root here</p>
-<netui:tree
-	rootNodeCollapsedImage="rootplus.gif"
-	rootNodeExpandedImage="rootminus.gif"
-	itemIcon="alien.gif"
-	disabledStyle="color: #00FF7F; font-weight:bold;"
-	lastNodeCollapsedImage="plusbottom.gif"
-	lastNodeExpandedImage="minusbottom.gif"
-	nodeCollapsedImage="plus.gif"
-	nodeExpandedImage="minus.gif"
-	verticalLineImage="line.gif"
-	lineJoinImage="join.gif"
-	lastLineJoinImage="joinbottom.gif"
-	imageRoot="."
-	dataSource="pageFlow.attrDynTree3"
-	selectionAction="postback"
-	tagId="attrDynTree3" >
-</netui:tree>
-    </netui:body>
-
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+    <head>
+        <title>Root Image Testing</title>
+        <link href="attributesStyle.css" rel="stylesheet" type="text/css">
+    </head>
+    <netui:body>
+<H3>Root Image Testing</H3>
+<netui:anchor action="resetTrees">Reset Trees</netui:anchor>
+<p>JSP static tree - Root node images are set correctly</p>
+<netui:tree
+	rootNodeCollapsedImage="rootplus.gif"
+	rootNodeExpandedImage="rootminus.gif"
+	itemIcon="alien.gif"
+	disabledStyle="color: #00FF7F; font-weight:bold;"
+	lastNodeCollapsedImage="plusbottom.gif"
+	lastNodeExpandedImage="minusbottom.gif"
+	nodeCollapsedImage="plus.gif"
+	nodeExpandedImage="minus.gif"
+	verticalLineImage="line.gif"
+	lineJoinImage="join.gif"
+	lastLineJoinImage="joinbottom.gif"
+	imageRoot="."
+	dataSource="pageFlow.attrJspTree1"
+	selectionAction="postback"
+	tagId="attrJspTree1">
+    <netui:treeItem expanded="true"><netui:treeLabel>My Attribute Tree</netui:treeLabel>
+       <netui:treeItem expanded="true"><netui:treeLabel>TreeItem1</netui:treeLabel>
+          <netui:treeItem>TreeItem1.1</netui:treeItem>
+       </netui:treeItem>
+    </netui:treeItem>
+</netui:tree>
+<br />
+
+<p>Dynamic pageFlow tree - Root node images and all others are set in the JSP.  Root node images do not appear in the rendered HTML but the other lastNode, itemIcon, etc. images do appear as expected</p>
+<netui:tree
+	rootNodeCollapsedImage="rootplus.gif"
+	rootNodeExpandedImage="rootminus.gif"
+	itemIcon="alien.gif"
+	disabledStyle="color: #00FF7F; font-weight:bold;"
+	lastNodeCollapsedImage="plusbottom.gif"
+	lastNodeExpandedImage="minusbottom.gif"
+	nodeCollapsedImage="plus.gif"
+	nodeExpandedImage="minus.gif"
+	verticalLineImage="line.gif"
+	lineJoinImage="join.gif"
+	lastLineJoinImage="joinbottom.gif"
+	imageRoot="."
+	dataSource="pageFlow.attrDynTree1"
+	selectionAction="postback"
+	tagId="attrDynTree1" />
+
+<p>None ITreeRootElement used for the root.  Set the root here</p>
+<netui:tree
+	rootNodeCollapsedImage="rootplus.gif"
+	rootNodeExpandedImage="rootminus.gif"
+	itemIcon="alien.gif"
+	disabledStyle="color: #00FF7F; font-weight:bold;"
+	lastNodeCollapsedImage="plusbottom.gif"
+	lastNodeExpandedImage="minusbottom.gif"
+	nodeCollapsedImage="plus.gif"
+	nodeExpandedImage="minus.gif"
+	verticalLineImage="line.gif"
+	lineJoinImage="join.gif"
+	lastLineJoinImage="joinbottom.gif"
+	imageRoot="."
+	dataSource="pageFlow.attrDynTree3"
+	selectionAction="postback"
+	tagId="attrDynTree3" >
+</netui:tree>
+    </netui:body>
+
 </netui:html>       

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributes.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributesStyle.css
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributesStyle.css?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributesStyle.css (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributesStyle.css Wed May 10 08:49:42 2006
@@ -1,12 +1,12 @@
-.myDisabledClass {
-    color: #6600FF ;
-    background-color: #CCFFFF ;
-    font-family: "Arial" ; 
-    font-weight: bold;
-}
-
-.myTreeClass {
-    color: #FFCC99;
-    font-family: "Courier"; 
-    font-weight: bold;
-}
+.myDisabledClass {
+    color: #6600FF ;
+    background-color: #CCFFFF ;
+    font-family: "Arial" ; 
+    font-weight: bold;
+}
+
+.myTreeClass {
+    color: #FFCC99;
+    font-family: "Courier"; 
+    font-weight: bold;
+}

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j478/attributesStyle.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Controller.java?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Controller.java Wed May 10 08:49:42 2006
@@ -1,24 +1,24 @@
-package bugs.j480;
-
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    public String getFoo ()
-    {
-        return "foo";
-    }
-
-    @Jpf.Action
-        (forwards = {
-            @Jpf.Forward(name = "success",
-                     path = "Test.jsp")
-    })
-    public Forward begin ()
-    {
-        return new Forward ("success");
-    }
+package bugs.j480;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller
+public class Controller extends PageFlowController
+{
+    public String getFoo ()
+    {
+        return "foo";
+    }
+
+    @Jpf.Action
+        (forwards = {
+            @Jpf.Forward(name = "success",
+                     path = "Test.jsp")
+    })
+    public Forward begin ()
+    {
+        return new Forward ("success");
+    }
 }

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

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Test.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Test.jsp?rev=405785&r1=405784&r2=405785&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Test.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Test.jsp Wed May 10 08:49:42 2006
@@ -1,10 +1,10 @@
-<%@ taglib prefix="util" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/tagid"%>
-<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
-<netui:html>
-<head><title>Test Tag File</title></head>
-<netui:body>
-   <netui:scriptContainer generateIdScope="true">
-      <util:NestedGenerator/>
-   </netui:scriptContainer>
-</netui:body>
-</netui:html>
+<%@ taglib prefix="util" tagdir="/WEB-INF/tags/org/apache/beehive/netui/test/tagid"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<netui:html>
+<head><title>Test Tag File</title></head>
+<netui:body>
+   <netui:scriptContainer generateIdScope="true">
+      <util:NestedGenerator/>
+   </netui:scriptContainer>
+</netui:body>
+</netui:html>

Propchange: beehive/trunk/netui/test/webapps/drt/web/bugs/j480/Test.jsp
------------------------------------------------------------------------------
    svn:eol-style = native