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 2005/09/15 19:47:21 UTC
svn commit: r289284 [7/9] - in /beehive/trunk/netui: ./ test/ant/
test/dist-test/ test/dist-test/ant/ test/src/compilerTests/
test/src/compilerTests/org/ test/src/compilerTests/org/apache/
test/src/compilerTests/org/apache/beehive/ test/src/compilerTes...
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,77 @@
+package PF_ValidateErrorForward;
+
+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.ActionNotFoundException;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This test specifies a validateErrorForward.
+ *
+ * @result: This should compile cleanly.
+ *
+ ******************************************************************************/
+
+ @Jpf.Controller
+public class Controller extends PageFlowController
+ {
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward begin()
+ {
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ validationErrorForward = @Jpf.Forward(name="failure", path="action2.do"),
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action1()
+ {
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action2()
+ {
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action3()
+ {
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action4()
+ {
+ return new Forward("gotoPg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/PF_ValidateErrorForward/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PF_ValidateErrorForward/Controller.java on Tue Aug 09 16:46:48 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/action1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="failure" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="true">
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ <!--forward "failure" (validationErrorForward)-->
+ <forward name="failure" path="/action2.do"/>
+ </action>
+ <action path="/action2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/action3" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/action4" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PF_ValidateErrorForward.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,43 @@
+package PF_WrongActionMember;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains the following syntax error:
+ * - There is a jpf:controller nested="true" annotation on the "page1" Forward
+ * method and this is invalid.
+ *
+ * @result: The compiler should catch these error and issue error message.
+ *
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ @Jpf.Controller(
+ nested = true)
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,8 @@
+<%@ 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>
+ <body>
+ </body>
+</netui:html>
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/PF_WrongActionMember/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PF_WrongActionMember/Controller.java on Tue Aug 09 16:46:50 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongActionMember.Controller" scope="request" validate="false">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongActionMember.Controller" scope="request" validate="false">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PF_WrongActionMember.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_WrongActionMember\Controller.java:38: annotation type not applicable to this kind of declaration nested = true) ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,42 @@
+package PF_WrongControlLocation;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains the following syntax error:
+ * - There is a common:control annotation on the "page2" Forward method
+ * and this is invalid.
+ *
+ * @result: The compiler should catch these error and issue error message.
+ *
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+{
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg2",
+ path = "Pg2.jsp")
+ })
+ @org.apache.beehive.controls.api.bean.Control()
+ protected Forward page2()
+ {
+ return new Forward("pg2");
+ }
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,8 @@
+<%@ 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>
+ <body>
+ </body>
+</netui:html>
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg2.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg2.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg2.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,8 @@
+<%@ 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>
+ <body>
+ </body>
+</netui:html>
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/PF_WrongControlLocation/Pg2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PF_WrongControlLocation/Controller.java on Tue Aug 09 16:46:51 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongControlLocation.Controller" scope="request" validate="false">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/page2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongControlLocation.Controller" scope="request" validate="false">
+ <forward name="pg2" path="/Pg2.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PF_WrongControlLocation.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_WrongControlLocation\Controller.java:37: annotation type not applicable to this kind of declaration @org.apache.beehive.controls.api.bean.Control() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,90 @@
+package PF_WrongUseFormBeanValue;
+
+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.ActionNotFoundException;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlow test specifies an invalid value to the "form=" attribute. It
+ * also specifies a "form=" value to an action method that does not take any
+ * parameter.
+ *
+ * @result: The compiler should catch these mistakes and report errors.
+ *
+ ******************************************************************************/
+
+ @Jpf.Controller(
+ )
+public class Controller extends PageFlowController
+ {
+ FormOne form1 = new FormOne();
+ FormTwo form2 = new FormTwo();
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward begin()
+ {
+ System.out.println(">>> Jpf1.begin");
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ useFormBean = "BlahBlah",
+ forwards = {
+ @Jpf.Forward(
+ name = "currentPage",
+ path = "currentPage")
+ })
+ public Forward action1(FormOne inForm)
+ {
+ System.out.println(">>> Jpf1.action1");
+ return new Forward("currentPage");
+ }
+
+ @Jpf.Action(
+ useFormBean = "form1",
+ forwards = {
+ @Jpf.Forward(
+ name = "currentPage",
+ path = "currentPage")
+ })
+ public Forward action2()
+ {
+ System.out.println(">>> Jpf1.action2");
+ return new Forward("currentPage");
+ }
+
+ /***************************************************************************
+ *
+ **************************************************************************/
+ public static class FormOne extends FormData
+ {
+ private String field1 = "Default value";
+
+ public void setField1(String inField1)
+ { this.field1 = inField1; }
+ public String getField1()
+ { return this.field1; }
+ }
+
+ /***************************************************************************
+ *
+ **************************************************************************/
+ public static class FormTwo extends FormData
+ {
+ private String field1 = "Default value";
+
+ public void setField1(String inField1)
+ { this.field1 = inField1; }
+ public String getField1()
+ { return this.field1; }
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/PF_WrongUseFormBeanValue/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongUseFormBeanValue/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_WrongUseFormBeanValue\Controller.java:46: Field BlahBlah does not exist. public Forward action1(FormOne inForm) ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_WrongUseFormBeanValue\Controller.java:59: The useFormBean attribute points to a member of type PF_WrongUseFormBeanValue.Controller.FormOne, which requires that this action method accept an argument of type PF_WrongUseFormBeanValue.Controller.FormOne. public Forward action2() ^2 errors
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/AbstractFlowController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/AbstractFlowController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/AbstractFlowController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/AbstractFlowController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,42 @@
+package PI_Abstract;
+
+import javax.servlet.http.HttpSession;
+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 abstract class AbstractFlowController extends PageFlowController
+{
+ protected String message;
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="success", path="index.jsp")
+ }
+ )
+ protected abstract Forward implAction();
+
+ public String getMessage(){
+ return message;
+ }
+
+
+ /**
+ * 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/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/AbstractFlowController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/PI_Abstract/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_Abstract/AbstractFlowController.java on Tue Aug 09 16:46:54 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings/>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_Abstract.AbstractFlowController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+package PI_Begin;
+
+import javax.servlet.http.HttpSession;
+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 PI_Begin.parent.ParentFlowController
+{
+
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/ParentFlowController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/ParentFlowController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/ParentFlowController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/ParentFlowController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,41 @@
+package PI_Begin.parent;
+
+import javax.servlet.http.HttpSession;
+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 ParentFlowController extends PageFlowController
+{
+ protected String message;
+
+ @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)
+ {
+ }
+}
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/ParentFlowController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/PI_Begin/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_Begin/parent/ParentFlowController.java on Tue Aug 09 16:46:56 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_Begin.parent.ParentFlowController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_Begin.parent.ParentFlowController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_Begin/Controller.java on Tue Aug 09 16:46:56 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_Begin.Controller" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_Begin.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/ControlsController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/ControlsController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/ControlsController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/ControlsController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,18 @@
+package PI_ControlsOverride;
+
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import PI_ControlsOverride.*;
+
+/**
+ * This is the default controller for a blank web application.
+ */
+@Jpf.Controller
+public class ControlsController extends PI_ControlsOverride.parent.ControlsController
+{
+ @Control()
+ protected GreetingsControlBean myControl;
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/ControlsController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+ <netui:anchor action="getMessage">Get the Control's Message</netui:anchor><br/>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/ControlsController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/ControlsController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/ControlsController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/ControlsController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,62 @@
+package PI_ControlsOverride.parent;
+
+import javax.servlet.http.HttpSession;
+import org.apache.beehive.controls.api.bean.Control;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import PI_ControlsOverride.*;
+
+
+/**
+ * This is the default controller for a blank web application.
+ */
+@Jpf.Controller
+public class ControlsController extends PageFlowController
+{
+
+ @Control()
+ protected HelloControlBean myControl; // See JIRA 608 - NOT ALLOWED to be myControl!
+ protected String helloMessage;
+
+ @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="result.jsp")
+ }
+ )
+ protected Forward getMessage()
+ {
+ helloMessage = myControl.hello();
+ return new Forward("success");
+ }
+
+ public String getHelloMessage(){
+ return helloMessage;
+ }
+
+
+ /**
+ * 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/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/ControlsController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+ <netui:anchor action="getMessage">Get the Control's Message</netui:anchor><br/>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/result.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/result.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/result.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/result.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+ <netui:span value="${pageFlow.helloMessage}"></netui:span><br/>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/parent/result.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/result.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/result.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/result.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/result.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+ <netui:span value="${pageFlow.helloMessage}"></netui:span>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/PI_ControlsOverride/result.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControl.java?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControl.java (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControl.java Thu Sep 15 10:43:52 2005
@@ -0,0 +1,9 @@
+package PI_ControlsOverride;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+
+@ControlInterface
+public interface GreetingsControl
+{
+ public String hello();
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControlImpl.jcs
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControlImpl.jcs?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControlImpl.jcs (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControlImpl.jcs Thu Sep 15 10:43:52 2005
@@ -0,0 +1,12 @@
+package PI_ControlsOverride;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+
+@ControlImplementation( isTransient=true )
+public class GreetingsControlImpl implements GreetingsControl
+{
+ public String hello()
+ {
+ return "Greetings!";
+ }
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/GreetingsControlImpl.jcs
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControl.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControl.java?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControl.java (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControl.java Thu Sep 15 10:43:52 2005
@@ -0,0 +1,9 @@
+package PI_ControlsOverride;
+
+import org.apache.beehive.controls.api.bean.ControlInterface;
+
+@ControlInterface
+public interface HelloControl
+{
+ public String hello();
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControlImpl.jcs
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControlImpl.jcs?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControlImpl.jcs (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControlImpl.jcs Thu Sep 15 10:43:52 2005
@@ -0,0 +1,12 @@
+package PI_ControlsOverride;
+
+import org.apache.beehive.controls.api.bean.ControlImplementation;
+
+@ControlImplementation( isTransient=true )
+public class HelloControlImpl implements HelloControl
+{
+ public String hello()
+ {
+ return "Hello!";
+ }
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/WEB-INF/src/PI_ControlsOverride/HelloControlImpl.jcs
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-ControlsController.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-ControlsController.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-ControlsController.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-ControlsController.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<processed-annotations>
+ <type-name>PI_ControlsOverride.ControlsController</type-name>
+ <annotated-element>
+ <element-name>myControl</element-name>
+ <annotation>
+ <annotation-name>org.apache.beehive.controls.api.bean.Control</annotation-name>
+ </annotation>
+ </annotated-element>
+ <annotated-element>
+ <element-name>myControl</element-name>
+ <annotation>
+ <annotation-name>org.apache.beehive.controls.api.bean.Control</annotation-name>
+ </annotation>
+ </annotated-element>
+</processed-annotations>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-parent-ControlsController.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-parent-ControlsController.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-parent-ControlsController.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/annotations-PI_ControlsOverride-parent-ControlsController.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<processed-annotations>
+ <type-name>PI_ControlsOverride.parent.ControlsController</type-name>
+ <annotated-element>
+ <element-name>myControl</element-name>
+ <annotation>
+ <annotation-name>org.apache.beehive.controls.api.bean.Control</annotation-name>
+ </annotation>
+ </annotated-element>
+</processed-annotations>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/parent/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.parent.ControlsController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ <action path="/getMessage" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.parent.ControlsController" scope="request" validate="false">
+ <forward name="success" path="/result.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ControlsOverride.parent.ControlsController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.ControlsController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ <action path="/getMessage" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.ControlsController" scope="request" validate="false">
+ <forward name="success" path="/result.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ControlsOverride.ControlsController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]\WEB-INF\.tmpbeansrc\PI_ControlsOverride\ControlsController.java:17: This control field conflicts with another of the same name in superclass PI_ControlsOverride.parent.ControlsController. protected GreetingsControlBean myControl; ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+package PI_ForwardPath;
+
+import javax.servlet.http.HttpSession;
+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 PI_ForwardPath.parent.ParentFlowController
+{
+
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/ParentFlowController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/ParentFlowController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/ParentFlowController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/ParentFlowController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,39 @@
+package PI_ForwardPath.parent;
+
+import javax.servlet.http.HttpSession;
+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 ParentFlowController extends PageFlowController
+{
+ @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)
+ {
+ }
+}
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/ParentFlowController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/PI_ForwardPath/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ForwardPath/parent/ParentFlowController.java on Tue Aug 09 16:47:02 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ForwardPath.parent.ParentFlowController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ForwardPath.parent.ParentFlowController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ForwardPath/Controller.java on Tue Aug 09 16:47:02 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ForwardPath.Controller" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ForwardPath.Controller"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PI_ForwardPath\Controller.java:12: warning: File "index.jsp" (reference inherited from a Jpf.Forward annotation on method begin in PI_ForwardPath.parent.ParentFlowController) could not be found. To inherit local paths automatically, set inheritLocalPaths to true on @Jpf.Controller.public class Controller extends PI_ForwardPath.parent.ParentFlowController ^1 warning
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/NestedController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/NestedController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/NestedController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/NestedController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+package PI_ReturnAction;
+
+import javax.servlet.http.HttpSession;
+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 NestedController extends PI_ReturnAction.parent.NestedController
+{
+
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/NestedController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,16 @@
+<%@ 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>
+
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/NestedController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/NestedController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/NestedController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/NestedController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,44 @@
+package PI_ReturnAction.parent;
+
+import javax.servlet.http.HttpSession;
+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( nested=true,
+ forwards={
+ @Jpf.Forward(name="done",
+ returnAction="returnAction")
+ })
+public class NestedController extends PageFlowController
+{
+ @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)
+ {
+ }
+
+ }
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/NestedController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+<%@ 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>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/PI_ReturnAction/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ReturnAction/parent/NestedController.java on Tue Aug 09 16:47:04 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="done" path="returnAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="nestedReturn" value="true"/>
+ </forward>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ReturnAction.parent.NestedController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isNestedPageFlow" value="true"/>
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ReturnAction.parent.NestedController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
+<!--Generated from /WEB-INF/.tmpbeansrc/PI_ReturnAction/NestedController.java on Tue Aug 09 16:47:04 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="done" path="returnAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="nestedReturn" value="true"/>
+ </forward>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ReturnAction.NestedController" scope="request" validate="false">
+ <forward name="index" path="/index.jsp"/>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isNestedPageFlow" value="true"/>
+ <set-property property="isReturnToPageDisabled" value="true"/>
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PI_ReturnAction.NestedController"/>
+ <set-property property="isMissingDefaultMessages" value="true"/>
+ </controller>
+ <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
+</struts-config>
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/MergeController.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/MergeController.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/MergeController.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/MergeController.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,14 @@
+package PI_StrutsMerge;
+
+import javax.servlet.http.HttpSession;
+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 MergeController extends PI_StrutsMerge.parent.Controller
+{
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/MergeController.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+<%@ 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>
+ </netui:body>
+</netui:html>
+
+
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/parent/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/parent/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/parent/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/parent/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,38 @@
+package PI_StrutsMerge.parent;
+
+import javax.servlet.http.HttpSession;
+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(strutsMerge = "struts4merge.xml")
+public class Controller extends PageFlowController
+{
+ @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)
+ {
+ }
+
+}
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_StrutsMerge/PI_StrutsMerge/parent/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native