svn commit: r344895 [3/12] - in /beehive/trunk/netui: src/pageflow/org/apache/beehive/netui/pageflow/ src/pageflow/org/apache/beehive/netui/pageflow/internal/ test/webapps/drt/src/formBean/test1/ test/webapps/drt/src/global/ test/webapps/drt/src/pageFl...

[ri...@apache.org]

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j166/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j166/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j166/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j166/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,11 +1,11 @@
 package bugs.j166;
 
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 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 javax.servlet.http.HttpSession;
 
 /**
  * This is the default controller for a blank web application.

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j172/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j172/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j172/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j172/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,7 +1,8 @@
 package bugs.j172;
 
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j172/shared/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j172/shared/SharedFlow.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j172/shared/SharedFlow.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j172/shared/SharedFlow.java Tue Nov 15 21:26:20 2005
@@ -1,7 +1,8 @@
 package bugs.j172.shared;
 
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.SharedFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     messageBundles={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j176/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j176/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j176/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j176/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,15 +1,12 @@
 package bugs.j176;
 
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 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 java.io.Serializable;
+
+import javax.servlet.http.HttpSession;
 
-/**
- * This is the default controller for a blank web application.
- */
 @Jpf.Controller
 public class Controller extends PageFlowController
 {
@@ -54,7 +51,7 @@
     {
     }
 
-    public static class Bean extends FormData
+    public static class Bean implements Serializable
     {
         private String text1;
 

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j189/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j189/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j189/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j189/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,12 +1,12 @@
 package bugs.j189;
 
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 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 java.io.Serializable;
+
 /**
  * This is the default controller for a blank web application.
  */
@@ -62,7 +62,7 @@
         return success;
     }
 
-    public static class Bean extends FormData
+    public static class Bean implements Serializable
     {
         private String text1;
         private String text2;
@@ -88,7 +88,7 @@
         }
     }
 
-        public static class Bean2 extends FormData
+        public static class Bean2 implements Serializable
     {
         private String text1;
 

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j249/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j249/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j249/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j249/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,6 +1,5 @@
 package bugs.j249;
 
-import org.apache.beehive.netui.pageflow.FormData;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j250/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j250/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j250/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j250/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,6 +1,5 @@
 package bugs.j250;
 
-import org.apache.beehive.netui.pageflow.FormData;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j278/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j278/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j278/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j278/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,11 +1,8 @@
 package bugs.j278;
 
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 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;
 
 /**
  * This is the default controller for a blank web application.

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,123 +1,120 @@
-package bugs.j290;
-
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.Enumeration;
-
-
-import javax.servlet.http.HttpSession;
-import javax.servlet.ServletRequest;
-
-/**
- * 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 extends FormData
-    {
-        private String _text;
-
-        public String getText()
-        {
-            return _text;
-        }
-
-        public void setText(String value)
-        {
-            _text = value;
-        }
-    }
-
-    public static class BeanTwo extends FormData
-    {
-        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;
+        }
+    }
+}

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,15 +1,12 @@
 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.tags.tree.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
 import org.apache.beehive.netui.pageflow.requeststate.NameService;
+import org.apache.beehive.netui.tags.tree.TreeElement;
 
-import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.Forward;
 
 @Jpf.Controller (
 )

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,15 +1,9 @@
 package bugs.j324;
 
-import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.FlowController;
 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.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.InheritableState;
 import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
-import org.apache.beehive.netui.tags.tree.TreeRootElement;
 
 @Jpf.Controller (
    simpleActions={

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,15 +1,9 @@
 package bugs.j326;
 
-import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.FlowController;
 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.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.InheritableState;
 import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
-import org.apache.beehive.netui.tags.tree.TreeRootElement;
 
 @Jpf.Controller (
    simpleActions={

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,7 +1,6 @@
 package bugs.j346;
 
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 import org.apache.beehive.netui.tags.tree.TreeElement;
 

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,9 +1,7 @@
 package bugs.j430;
 
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.tags.tree.TreeElement;
 
 @Jpf.Controller (
    simpleActions={

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,10 +1,8 @@
 package bugs.j475;
 
-import org.apache.beehive.netui.pageflow.*;
+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.scoping.ScopedServletUtils;
-
-import javax.servlet.http.HttpServletRequest;
 
 @Jpf.Controller
 public class Controller extends PageFlowController

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,14 +1,9 @@
 package bugs.j478;
 
-import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.FlowController;
 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.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.InheritableState;
 import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
 import org.apache.beehive.netui.tags.tree.TreeRootElement;
 
 @Jpf.Controller (

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=344895&r1=344894&r2=344895&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 Tue Nov 15 21:26:20 2005
@@ -1,10 +1,8 @@
 package bugs.j480;
 
-import org.apache.beehive.netui.pageflow.*;
+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.scoping.ScopedServletUtils;
-
-import javax.servlet.http.HttpServletRequest;
 
 @Jpf.Controller
 public class Controller extends PageFlowController

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j480b/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j480b/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j480b/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j480b/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,10 +1,8 @@
 package bugs.j480b;
 
-import org.apache.beehive.netui.pageflow.*;
+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.scoping.ScopedServletUtils;
-
-import javax.servlet.http.HttpServletRequest;
 
 @Jpf.Controller
 public class Controller extends PageFlowController

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j505/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j505/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j505/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j505/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,17 +1,11 @@
 package bugs.j505;
 
-import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.FlowController;
 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.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.InheritableState;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
 import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
 import org.apache.beehive.netui.tags.tree.TreeRootElement;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
 
 @Jpf.Controller (
    simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j517/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j517/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j517/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j517/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,9 +17,10 @@
  */
 package bugs.j517;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
 import java.util.HashMap;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j519/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j519/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j519/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j519/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,17 +1,11 @@
 package bugs.j519;
 
-import javax.servlet.http.HttpSession;
-import java.io.Serializable;
-import org.apache.beehive.netui.pageflow.FlowController;
 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.ITreeRootElement;
-import org.apache.beehive.netui.tags.tree.InheritableState;
+import org.apache.beehive.netui.pageflow.requeststate.NameService;
 import org.apache.beehive.netui.tags.tree.TreeElement;
-import org.apache.beehive.netui.tags.tree.TreeRenderState;
 import org.apache.beehive.netui.tags.tree.TreeRootElement;
-import org.apache.beehive.netui.pageflow.requeststate.NameService;
 
 @Jpf.Controller (
    simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j522/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j522/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j522/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j522/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,111 +1,112 @@
-package bugs.j522;
-
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-/**
- * This is the default controller for a blank web application.
- */
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    private String _action;
-    private String _text;
-    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", path="index.jsp")
-        }
-    )
-    protected Forward red()
-    {
-	_action = "red";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="index", path="index.jsp")
-        }
-    )
-    protected Forward blue()
-    {
-	_action = "blue";
-        return new Forward("index");
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="index", path="index.jsp")
-        }
-    )
-    protected Forward post(Bean form)
-    {
-	_action = "post";
-	_text = form.getText1();
-        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)
-    {
-    }
-
-    public static class Bean extends FormData
-    {
-        private String text1;
-
-        private String text2;
-
-        public String getText1()
-        {
-            return text1;
-        }
-
-        public void setText1(String value)
-        {
-            text1 = value;
-        }
-
-        public String getText2()
-        {
-            return text2;
-        }
-
-        public void setText2(String value)
-        {
-            text2 = value;
-        }
-    }
-}
+package bugs.j522;
+
+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 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", path="index.jsp")
+        }
+    )
+    protected Forward red()
+    {
+	_action = "red";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="index.jsp")
+        }
+    )
+    protected Forward blue()
+    {
+	_action = "blue";
+        return new Forward("index");
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="index.jsp")
+        }
+    )
+    protected Forward post(Bean form)
+    {
+	_action = "post";
+	_text = form.getText1();
+        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)
+    {
+    }
+
+    public static class Bean implements Serializable
+    {
+        private String text1;
+
+        private String text2;
+
+        public String getText1()
+        {
+            return text1;
+        }
+
+        public void setText1(String value)
+        {
+            text1 = value;
+        }
+
+        public String getText2()
+        {
+            return text2;
+        }
+
+        public void setText2(String value)
+        {
+            text2 = value;
+        }
+    }
+}

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j533/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j533/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j533/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j533/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,15 +17,12 @@
  */
 package bugs.j533;
 
-import org.apache.beehive.netui.pageflow.FlowController;
 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.TreeHtmlAttributeInfo;
 import org.apache.beehive.netui.tags.tree.TreeRootElement;
-
-import java.io.Serializable;
 
 @Jpf.Controller (
    simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j631/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j631/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j631/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j631/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,7 +1,8 @@
 package bugs.j631;
 
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j757/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j757/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j757/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j757/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,7 +1,8 @@
 package bugs.j757;
 
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j797/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j797/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j797/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j797/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,7 +1,7 @@
 package bugs.j797;
 
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.*;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j797/nested/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j797/nested/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j797/nested/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j797/nested/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,11 +17,8 @@
  */
 package bugs.j797.nested;
 
-import java.io.Serializable;
-
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j841/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j841/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j841/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j841/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,11 +17,12 @@
  */
 package bugs.j841;
 
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
+import java.io.Serializable;
+
 @Jpf.Controller
 public class Controller extends PageFlowController
 {
@@ -57,7 +58,7 @@
         return new Forward("success");
     }
 
-    public static class NextActionForm extends FormData
+    public static class NextActionForm implements Serializable
     {
         private String taform;
         public void setTaform(String taform)

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j898/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j898/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j898/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j898/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package bugs.j898;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j898/SharedFlow.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j898/SharedFlow.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j898/SharedFlow.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j898/SharedFlow.java Tue Nov 15 21:26:20 2005
@@ -17,9 +17,9 @@
  */
 package bugs.j898;
 
-import org.apache.beehive.netui.pageflow.SharedFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.PageFlowException;
+import org.apache.beehive.netui.pageflow.SharedFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j909/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j909/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j909/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j909/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,9 +17,8 @@
  */
 package bugs.j909;
 
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(
     simpleActions={

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j962/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j962/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j962/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j962/Controller.java Tue Nov 15 21:26:20 2005
@@ -18,7 +18,6 @@
 package bugs.j962;
 
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j962/noPageFlow/createPageFlow.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j962/noPageFlow/createPageFlow.jsp?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j962/noPageFlow/createPageFlow.jsp (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j962/noPageFlow/createPageFlow.jsp Tue Nov 15 21:26:20 2005
@@ -1,6 +1,6 @@
 <%@ page language="java" contentType="text/html;charset=UTF-8"%>
-<%@ page import="org.apache.beehive.netui.pageflow.PageFlowController"%>
 <%@ page import="org.apache.beehive.netui.pageflow.FlowControllerFactory"%>
+<%@ page import="org.apache.beehive.netui.pageflow.PageFlowController"%>
 <%@ page import="org.apache.beehive.netui.pageflow.RequestContext"%>
 
 

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j976/base/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j976/base/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j976/base/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j976/base/Controller.java Tue Nov 15 21:26:20 2005
@@ -18,7 +18,6 @@
 package bugs.j976.base;
 
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j976/derived/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j976/derived/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j976/derived/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j976/derived/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,6 @@
  */
 package bugs.j976.derived;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j977/base/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j977/base/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j977/base/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j977/base/Controller.java Tue Nov 15 21:26:20 2005
@@ -18,7 +18,6 @@
 package bugs.j977.base;
 
 import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/bugs/j977/derived/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/bugs/j977/derived/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/bugs/j977/derived/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/bugs/j977/derived/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,6 @@
  */
 package bugs.j977.derived;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/checkboxDemo/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/checkboxDemo/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/checkboxDemo/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/checkboxDemo/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,15 +17,13 @@
  */
 package checkboxDemo;
 
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.ArrayList;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.FormData;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.struts.action.ActionMapping;
 
 import javax.servlet.ServletRequest;
-import org.apache.struts.action.ActionMapping;
+import java.io.Serializable;
 
 @Jpf.Controller(
     forwards = {
@@ -52,7 +50,7 @@
         public void setSelected(boolean selected) {_selected = selected;}
     }
 
-    public static class Form extends FormData
+    public static class Form implements Serializable
     {
         private FileInfo[] files;
 

Modified: beehive/trunk/netui/test/webapps/drt/web/controlTests/getData/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/controlTests/getData/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/controlTests/getData/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/controlTests/getData/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package controlTests.getData;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 @Jpf.Controller

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.anchor.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbindingerror/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbindingerror/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbindingerror/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/nullbindingerror/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.anchor.nullbindingerror;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/value/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/value/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/value/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/anchor/value/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package coretags.anchor.value;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/area/base/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/area/base/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/area/base/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/area/base/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,10 +1,10 @@
 package coretags.area.base;
 
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 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;
 
 /**
  * This is the default controller for a blank web application.

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/attribute/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/attribute/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/attribute/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/attribute/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package coretags.attribute.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/base/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/base/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/base/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/base/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.base.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/behavior/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/behavior/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/behavior/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/behavior/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package coretags.behavior.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/binding/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/binding/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/binding/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/binding/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.binding.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/binding/report/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/binding/report/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/binding/report/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/binding/report/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,27 +1,28 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.binding.report;
 
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
+import java.io.Serializable;
+
 /**
  * This is the default controller for a blank web application.
  */
@@ -44,7 +45,7 @@
         return new Forward("index");
     }
 
-    public static class Bean extends FormData
+    public static class Bean implements Serializable
     {
     private String type;
 

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/button/id/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/button/id/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/button/id/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/button/id/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,103 +1,104 @@
-package coretags.button.id;
-
-import javax.servlet.http.HttpSession;
-import org.apache.beehive.netui.pageflow.FormData;
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-/**
- * This is the default controller for a blank web application.
- */
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    private String _text;
-    public String getText() {
-        return _text;
-    }
-
-    private String _method;
-    public String getMethod() {
-        return _method;
-    }
-
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="index", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        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)
-    {
-    }
-
-        
-    @Jpf.Action(forwards = { 
-        @Jpf.Forward(name = "success",
-                     path = "index.jsp")
-    })
-    protected Forward post(coretags.imagebutton.id.Controller.Bean form)
-    {
-        Forward forward = new Forward("success");
-        _text = form.getText();
-        _method = "post";
-        return forward;
-    }
-
-    @Jpf.Action(forwards = { 
-        @Jpf.Forward(name = "success",
-                     path = "index.jsp")
-    })
-    protected Forward override(coretags.imagebutton.id.Controller.Bean form)
-    {
-        Forward forward = new Forward("success");
-        _text = form.getText();
-        _method = "override";
-        return forward;
-    }
-                    
-    public static class Bean extends FormData
-    {
-        private String text;
-        
-        public String getText()
-        {
-            return text;
-        }
-        
-        public void setText(String value)
-        {
-            text = value;
-        }
-    }
-}
-
-@Jpf.ViewProperties(value= {"<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
-"<view-properties>",
-"<pageflow-object id='pageflow:/coretags/imagebutton/id/Controller.jpf'/>",
-"<pageflow-object id='page:index.jsp'><property value='220' name='x'/><property value='100' name='y'/></pageflow-object>",
-"<pageflow-object id='formbean:Bean'/>",
-"<pageflow-object id='action:begin.do'><property value='80' name='x'/><property value='100' name='y'/></pageflow-object>",
-"<pageflow-object id='action:post.do#coretags.imagebutton.id.Controller.Bean'><property name='x' value='340'/><property name='y' value='100'/></pageflow-object>",
-"<pageflow-object id='forward:path#index#index.jsp#@action:begin.do@'><property value='116,140,140,164' name='elbowsX'/><property value='92,92,92,92' name='elbowsY'/><property value='East_1' name='fromPort'/><property value='West_1' name='toPort'/><property value='index' name='label'/></pageflow-object>",
-"<pageflow-object id='action-call:@page:index.jsp@#@action:post.do#coretags.imagebutton.id.Controller.Bean@'><property name='elbowsX' value='256,280,280,304'/><property name='elbowsY' value='92,92,92,92'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/></pageflow-object>",
-"<pageflow-object id='forward:path#success#index.jsp#@action:post.do#coretags.imagebutton.id.Controller.Bean@'><property name='elbowsX' value='304,280,280,256'/><property name='elbowsY' value='103,103,103,103'/><property name='fromPort' value='West_2'/><property name='toPort' value='East_2'/><property name='label' value='success'/></pageflow-object>",
-"</view-properties>"
-})
-interface VIEW_PROPERTIES { }
+package coretags.button.id;
+
+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 _text;
+    public String getText() {
+        return _text;
+    }
+
+    private String _method;
+    public String getMethod() {
+        return _method;
+    }
+
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="index.jsp")
+        }
+    )
+    protected Forward begin()
+    {
+        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)
+    {
+    }
+
+        
+    @Jpf.Action(forwards = { 
+        @Jpf.Forward(name = "success",
+                     path = "index.jsp")
+    })
+    protected Forward post(coretags.imagebutton.id.Controller.Bean form)
+    {
+        Forward forward = new Forward("success");
+        _text = form.getText();
+        _method = "post";
+        return forward;
+    }
+
+    @Jpf.Action(forwards = { 
+        @Jpf.Forward(name = "success",
+                     path = "index.jsp")
+    })
+    protected Forward override(coretags.imagebutton.id.Controller.Bean form)
+    {
+        Forward forward = new Forward("success");
+        _text = form.getText();
+        _method = "override";
+        return forward;
+    }
+                    
+    public static class Bean implements Serializable
+    {
+        private String text;
+        
+        public String getText()
+        {
+            return text;
+        }
+        
+        public void setText(String value)
+        {
+            text = value;
+        }
+    }
+}
+
+@Jpf.ViewProperties(value= {"<!-- This data is auto-generated. Hand-editing this section is not recommended. -->",
+"<view-properties>",
+"<pageflow-object id='pageflow:/coretags/imagebutton/id/Controller.jpf'/>",
+"<pageflow-object id='page:index.jsp'><property value='220' name='x'/><property value='100' name='y'/></pageflow-object>",
+"<pageflow-object id='formbean:Bean'/>",
+"<pageflow-object id='action:begin.do'><property value='80' name='x'/><property value='100' name='y'/></pageflow-object>",
+"<pageflow-object id='action:post.do#coretags.imagebutton.id.Controller.Bean'><property name='x' value='340'/><property name='y' value='100'/></pageflow-object>",
+"<pageflow-object id='forward:path#index#index.jsp#@action:begin.do@'><property value='116,140,140,164' name='elbowsX'/><property value='92,92,92,92' name='elbowsY'/><property value='East_1' name='fromPort'/><property value='West_1' name='toPort'/><property value='index' name='label'/></pageflow-object>",
+"<pageflow-object id='action-call:@page:index.jsp@#@action:post.do#coretags.imagebutton.id.Controller.Bean@'><property name='elbowsX' value='256,280,280,304'/><property name='elbowsY' value='92,92,92,92'/><property name='fromPort' value='East_1'/><property name='toPort' value='West_1'/></pageflow-object>",
+"<pageflow-object id='forward:path#success#index.jsp#@action:post.do#coretags.imagebutton.id.Controller.Bean@'><property name='elbowsX' value='304,280,280,256'/><property name='elbowsY' value='103,103,103,103'/><property name='fromPort' value='West_2'/><property name='toPort' value='East_2'/><property name='label' value='success'/></pageflow-object>",
+"</view-properties>"
+})
+interface VIEW_PROPERTIES { }

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/button/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/button/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/button/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/button/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.button.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/button/param/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/button/param/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/button/param/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/button/param/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,60 +1,60 @@
-/*
- * Copyright 2004 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 coretags.button.param;
-
-import org.apache.beehive.netui.pageflow.FormData;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-/**
- * This is the default controller for a blank web application.
- */
-@Jpf.Controller
-public class Controller extends PageFlowController
-{
-    @Jpf.Action(
-        forwards={
-           @Jpf.Forward(name="index", path="index.jsp")
-        }
-    )
-    protected Forward begin()
-    {
-        return new Forward("index");
-    }
-        
-    @Jpf.Action(forwards = { 
-	@Jpf.Forward(name = "success", path = "index.jsp")
-    })
-    protected Forward post(FormBean bean)        {
-       Forward forward = new Forward("success");
-       return forward;
-    }
-
-    public static class FormBean extends FormData
-    {
-        private String _text;
-
-        public String getText()
-        { return _text; }
-
-        public void setText(String value)
-        { _text = value; }
-    }
-}
+/*
+ * Copyright 2004 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 coretags.button.param;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+import java.io.Serializable;
+
+/**
+ * This is the default controller for a blank web application.
+ */
+@Jpf.Controller
+public class Controller extends PageFlowController
+{
+    @Jpf.Action(
+        forwards={
+           @Jpf.Forward(name="index", path="index.jsp")
+        }
+    )
+    protected Forward begin()
+    {
+        return new Forward("index");
+    }
+        
+    @Jpf.Action(forwards = { 
+	@Jpf.Forward(name = "success", path = "index.jsp")
+    })
+    protected Forward post(FormBean bean)        {
+       Forward forward = new Forward("success");
+       return forward;
+    }
+
+    public static class FormBean implements Serializable
+    {
+        private String _text;
+
+        public String getText()
+        { return _text; }
+
+        public void setText(String value)
+        { _text = value; }
+    }
+}

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/hash/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/hash/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/hash/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/hash/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,9 +17,10 @@
  */
 package coretags.cbg.hash;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
 import java.util.TreeMap;
 
 @Jpf.Controller(

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/id/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/id/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/id/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/id/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,8 +17,8 @@
  */
 package coretags.cbg.id;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,10 +17,9 @@
  */
 package coretags.cbg.singleton;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.TreeMap;
 
 @Jpf.Controller(
     )

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton2/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton2/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton2/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/cbg/singleton2/Controller.java Tue Nov 15 21:26:20 2005
@@ -17,10 +17,9 @@
  */
 package coretags.cbg.singleton2;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import java.util.TreeMap;
 
 @Jpf.Controller(
     )

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/checkbox/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/checkbox/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/checkbox/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/checkbox/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.checkbox.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/content/nullbinding/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/content/nullbinding/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/content/nullbinding/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/content/nullbinding/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.content.nullbinding;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/content/values/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/content/values/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/content/values/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/content/values/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.content.values;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**

Modified: beehive/trunk/netui/test/webapps/drt/web/coretags/core/attrset/Controller.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/web/coretags/core/attrset/Controller.java?rev=344895&r1=344894&r2=344895&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/web/coretags/core/attrset/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/web/coretags/core/attrset/Controller.java Tue Nov 15 21:26:20 2005
@@ -1,24 +1,24 @@
-/*
- * Copyright 2004 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:$
- */
+/*
+ * Copyright 2004 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 coretags.core.attrset;
 
-import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
 import org.apache.beehive.netui.pageflow.annotations.Jpf;
 
 /**