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 [3/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/Jira611/Jira611/child/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/child/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/child/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/child/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+ <head>
+ <title>Web Application Page</title>
+ <netui:base/>
+ </head>
+ <netui:body>
+ <p>
+ New Web Application Page
+ </p>
+ </netui:body>
+</netui:html>
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/child/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,24 @@
+package Jira611.parent;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller
+public abstract class Controller extends PageFlowController
+{
+ @Jpf.Action
+ public abstract Forward abstractAction();
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="ab", path="abstractAction.do")
+ }
+ )
+ public Forward forwardToAbstractAction()
+ {
+ return new Forward( "ab" );
+ }
+}
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/index.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,15 @@
+<%@ page language="java" contentType="text/html;charset=UTF-8"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-databinding-1.0" prefix="netui-data"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-html-1.0" prefix="netui"%>
+<%@ taglib uri="http://beehive.apache.org/netui/tags-template-1.0" prefix="netui-template"%>
+<netui:html>
+ <head>
+ <title>Web Application Page</title>
+ <netui:base/>
+ </head>
+ <netui:body>
+ <p>
+ New Web Application Page
+ </p>
+ </netui:body>
+</netui:html>
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/Jira611/parent/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-child.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-child.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-child.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-child.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,32 @@
+<?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/Jira611/child/Controller.java on Tue Aug 09 22:05:37 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/abstractAction" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Jira611.child.Controller" scope="request" validate="false">
+ <forward name="test" path="/index.jsp"/>
+ </action>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Jira611.child.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="readonly" value="true"/>
+ <set-property property="simpleAction" value="true"/>
+ <set-property property="defaultForward" value="_defaultForward"/>
+ <forward name="_defaultForward" path="/index.jsp"/>
+ </action>
+ <action path="/forwardToAbstractAction" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Jira611.child.Controller" scope="request" validate="false">
+ <forward name="ab" path="/abstractAction.do"/>
+ </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="Jira611.child.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/Jira611/expectedOutput/struts-config-Jira611-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-parent.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-parent.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Jira611/expectedOutput/struts-config-Jira611-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/Jira611/parent/Controller.java on Tue Aug 09 22:05:37 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/forwardToAbstractAction" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Jira611.parent.Controller" scope="request" validate="false">
+ <forward name="ab" path="/abstractAction.do"/>
+ </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="Jira611.parent.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/Nested_Abstract/Nested_Abstract/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/Nested_Abstract/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/Nested_Abstract/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/Nested_Abstract/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,12 @@
+package Nested_Abstract;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+@Jpf.Controller(nested=true)
+public abstract class Controller extends PageFlowController
+{
+}
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/Nested_Abstract/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/expectedOutput/struts-config-Nested_Abstract.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/expectedOutput/struts-config-Nested_Abstract.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/expectedOutput/struts-config-Nested_Abstract.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_Abstract/expectedOutput/struts-config-Nested_Abstract.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,20 @@
+<?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/Nested_Abstract/Controller.java on Tue Aug 09 10:29:46 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="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="Nested_Abstract.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/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,122 @@
+package Nested_NewReturnTo;
+
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import java.lang.String;
+import org.apache.beehive.netui.pageflow.*;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains several tests:
+ * - Test the new "return-to" values "previousPage", "currentPage", and
+ * "previousAction"
+ * - Test that the old "return-to" values, "page", and "action" have been
+ * depricated.
+ *
+ * @result: Throws a warning and generates a config file.
+ *
+ *
+ ******************************************************************************/
+ @Jpf.Controller(
+ nested = true)
+public class Controller extends PageFlowController
+ {
+ /**
+ * This is valid.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This is valid.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ navigateTo = Jpf.NavigateTo.previousPage)
+ })
+ protected Forward action1()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This is valid.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ navigateTo = Jpf.NavigateTo.currentPage)
+ })
+ protected Forward action2()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This is valid.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ navigateTo = Jpf.NavigateTo.previousAction)
+ })
+ protected Forward action3()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This should be depricated.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ navigateTo = Jpf.NavigateTo.previousAction)
+ })
+ protected Forward action4()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This is should be depricated.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ navigateTo = Jpf.NavigateTo.page)
+ })
+ protected Forward action5()
+ {
+ return new Forward("page1");
+ }
+ /**
+ * This is invalid.
+ *
+ */
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "callingJpf",
+ returnAction = "someAction")
+ })
+ protected Forward action8()
+ {
+ return new Forward("callingJpf");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/Nested_NewReturnTo/Page1.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/Nested_NewReturnTo/Nested_NewReturnTo/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/struts-config-Nested_NewReturnTo.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/struts-config-Nested_NewReturnTo.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/struts-config-Nested_NewReturnTo.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/struts-config-Nested_NewReturnTo.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,52 @@
+<?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/Nested_NewReturnTo/Controller.java on Tue Aug 09 16:45:46 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" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="previousPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToPage" value="true"/>
+ </forward>
+ </action>
+ <action path="/action2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="currentPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToPage" value="true"/>
+ </forward>
+ </action>
+ <action path="/action3" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="previousAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToAction" value="true"/>
+ </forward>
+ </action>
+ <action path="/action4" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="previousAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToAction" value="true"/>
+ </forward>
+ </action>
+ <action path="/action5" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="page" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToPage" value="true"/>
+ </forward>
+ </action>
+ <action path="/action8" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="callingJpf" path="someAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="nestedReturn" value="true"/>
+ </forward>
+ </action>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="Nested_NewReturnTo.Controller" scope="request" validate="false">
+ <forward name="page1" path="/Page1.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="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="Nested_NewReturnTo.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/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/Nested_NewReturnTo/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\Nested_NewReturnTo\Controller.java:104: warning: The "page" value is deprecated. protected Forward action5() ^1 warning
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Begin.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_ActionMethodOverload/PF_ActionMethodOverload/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,70 @@
+package PF_ActionMethodOverload;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file overloads the Forward method "page1". One
+ * method signature takes no parameters while the other takes an TempForm
+ * parameter. This should be valid syntax.
+ *
+ * @result: This PageFlowController should compile successfully and generate a valid
+ * config xml file.
+ *
+ * @CR181626: OPEN
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ /***************************************************************************
+ * Inner ActionForm class
+ **************************************************************************/
+ public static final class TempForm extends FormData
+ {
+ private String lastName = "John Doe";
+ public String getLastName()
+ {
+ return(this.lastName);
+ }
+ public void setLastName(String lastName)
+ {
+ this.lastName = lastName;
+ }
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1()
+ {
+ return new Forward("page1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1(TempForm inForm)
+ {
+ TempForm theForm = inForm;
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/PF_ActionMethodOverload/Page1.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_ActionMethodOverload/PF_ActionMethodOverload/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/expectedOutput/struts-config-PF_ActionMethodOverload.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/expectedOutput/struts-config-PF_ActionMethodOverload.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/expectedOutput/struts-config-PF_ActionMethodOverload.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodOverload/expectedOutput/struts-config-PF_ActionMethodOverload.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,34 @@
+<?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_ActionMethodOverload/Controller.java on Tue Aug 09 16:45:48 MDT 2005-->
+<struts-config>
+ <form-beans>
+ <form-bean name="tempForm" type="PF_ActionMethodOverload.Controller$TempForm"/>
+ </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_ActionMethodOverload.Controller" scope="request" validate="false">
+ <forward name="begin" path="/Begin.jsp"/>
+ </action>
+ <!--Note that there is more than one action with path "/page1". Use a form-qualified action path if this is not the one you want.-->
+ <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionMethodOverload.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="overloaded" value="true"/>
+ <forward name="page1" path="/Page1.jsp"/>
+ </action>
+ <action path="/page1_PF_ActionMethodOverload_Controller_TempForm" name="tempForm" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionMethodOverload.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="unqualifiedActionPath" value="/page1"/>
+ <forward name="page1" path="/Page1.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_ActionMethodOverload.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_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Begin.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_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,41 @@
+package PF_ActionMethodWithNonformArg;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares a valid Forward method "page1" that
+ * takes a single parameter that should be an Object. However the object
+ * passed is a primative "int".
+ *
+ * @result: The compiler should catch this and issue an error.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1(int inForm)
+ {
+ int theForm = inForm;
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Page1.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_ActionMethodWithNonformArg/PF_ActionMethodWithNonformArg/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionMethodWithNonformArg/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionMethodWithNonformArg\Controller.java:36: Type int is not valid as the form bean for an action. protected Forward page1(int inForm) ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,46 @@
+package PF_ActionNegatives;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains several syntax errors.
+ * - There is a jpf:action annotation at the class level and this is invalid.
+ * - The jpf:action annotation on ActionForward method "page1" has a "name"
+ * attribute which is invalid.
+ *
+ * @result: The compiler should catch these errors and issue error messages.
+ *
+ *
+ ******************************************************************************/
+ @Jpf.Action(
+ )
+ @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(
+ name="InvalidHere"
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/PF_ActionNegatives/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_ActionNegatives/PF_ActionNegatives/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/struts-config-PF_ActionNegatives.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/struts-config-PF_ActionNegatives.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/struts-config-PF_ActionNegatives.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/struts-config-PF_ActionNegatives.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/PF_ActionNegatives/Controller.java on Tue Aug 09 16:45: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_ActionNegatives.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_ActionNegatives.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_ActionNegatives/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNegatives/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:37: ')' expected forwards = { ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:46: illegal start of type } ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:36: cannot find symbolsymbol : method name()location: @interface org.apache.beehive.netui.pageflow.annotations.Jpf.Action name="InvalidHere" ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:46: warning: Member data should be Serializable or transient. } ^1 warning[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:37: ')' expected forwards = { ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNegatives\Controller.java:46: illegal start of type } ^2 errors
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Begin.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_ActionNotReturnForward/PF_ActionNotReturnForward/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,51 @@
+package PF_ActionNotReturnForward;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares an action "page2" with the jpf:action
+ * annotation but the method returns a String and not the required Forward
+ * object.
+ *
+ * @result: The compiler should catch this and issue an error.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg2",
+ path = "Page2.jsp")
+ })
+ protected String page2()
+ {
+ return "pg2";
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page1.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_ActionNotReturnForward/PF_ActionNotReturnForward/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page2.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page2.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/PF_ActionNotReturnForward/Page2.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_ActionNotReturnForward/PF_ActionNotReturnForward/Page2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionNotReturnForward/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionNotReturnForward\Controller.java:47: Expected a return type of org.apache.beehive.netui.pageflow.Forward. protected String page2() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,58 @@
+package PF_ActionReadOnly;
+
+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 the "read-only" attribute with both true and
+ * false values.
+ *
+ * @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(
+ readOnly = true,
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action1()
+ {
+ return new Forward("gotoPg1");
+ }
+
+ @Jpf.Action(
+ readOnly = false,
+ forwards = {
+ @Jpf.Forward(
+ name = "gotoPg1",
+ path = "Pg1.jsp")
+ })
+ public Forward action2()
+ {
+ return new Forward("gotoPg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/PF_ActionReadOnly/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/expectedOutput/struts-config-PF_ActionReadOnly.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/expectedOutput/struts-config-PF_ActionReadOnly.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/expectedOutput/struts-config-PF_ActionReadOnly.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionReadOnly/expectedOutput/struts-config-PF_ActionReadOnly.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,30 @@
+<?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_ActionReadOnly/Controller.java on Tue Aug 09 16:45:53 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" parameter="PF_ActionReadOnly.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="readonly" value="true"/>
+ <forward name="gotoPg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/action2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionReadOnly.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_ActionReadOnly.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_ActionReadOnly.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_ActionUseFormBean/PF_ActionUseFormBean/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,77 @@
+package PF_ActionUseFormBean;
+
+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 specifies the new (sp2) page flow scoped form action attribute
+ * "form="formname". This test makes sure the compiler correctly processes the
+ * attribute.
+ *
+ * @result: This should compiler cleanly.
+ *
+ ******************************************************************************/
+
+ @Jpf.Controller(
+ )
+public class Controller extends PageFlowController
+ {
+ FormOne form1 = new FormOne();
+ FormOne form2 = new FormOne();
+
+ @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 = "form1",
+ forwards = {
+ @Jpf.Forward(
+ name = "currentPage",
+ path = "currentPage")
+ })
+ public Forward action1(FormOne inForm)
+ {
+ System.out.println(">>> Jpf1.action1");
+ return new Forward("currentPage");
+ }
+
+ @Jpf.Action(
+ useFormBean = "form2",
+ forwards = {
+ @Jpf.Forward(
+ name = "currentPage",
+ path = "currentPage")
+ })
+ public Forward action2(FormOne inForm)
+ {
+ 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; }
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/PF_ActionUseFormBean/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_ActionUseFormBean/PF_ActionUseFormBean/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/expectedOutput/struts-config-PF_ActionUseFormBean.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/expectedOutput/struts-config-PF_ActionUseFormBean.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/expectedOutput/struts-config-PF_ActionUseFormBean.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionUseFormBean/expectedOutput/struts-config-PF_ActionUseFormBean.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,34 @@
+<?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_ActionUseFormBean/Controller.java on Tue Aug 09 16:45:55 MDT 2005-->
+<struts-config>
+ <form-beans>
+ <form-bean name="formOne_nonFlowScoped" type="PF_ActionUseFormBean.Controller$FormOne"/>
+ <form-bean name="formOne" type="PF_ActionUseFormBean.Controller$FormOne"/>
+ </form-beans>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/action1" name="formOne" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionUseFormBean.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="formMember" value="form1"/>
+ <forward name="currentPage" path="/currentPage"/>
+ </action>
+ <action path="/action2" name="formOne" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionUseFormBean.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <set-property property="formMember" value="form2"/>
+ <forward name="currentPage" path="/currentPage"/>
+ </action>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionUseFormBean.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_ActionUseFormBean.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_ActionWith2Args/PF_ActionWith2Args/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Begin.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_ActionWith2Args/PF_ActionWith2Args/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,59 @@
+package PF_ActionWith2Args;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares an Forward method "page1" with the
+ * jpf:action annotation. The method takes 2 parameters, an FormData derived
+ * parameter and a string. This should be invalid syntax as Forward
+ * methods can take either zero or one FormData derived parameter.
+ *
+ * @result: The compiler should catch this and issue an error.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ /***************************************************************************
+ * Inner ActionForm class
+ **************************************************************************/
+ public static final class TempForm extends FormData
+ {
+ private String lastName = "John Doe";
+ public String getLastName()
+ {
+ return(this.lastName);
+ }
+ public void setLastName(String lastName)
+ {
+ this.lastName = lastName;
+ }
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1(TempForm inForm, String inString)
+ {
+ TempForm theForm = inForm;
+ String theString = inString;
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/PF_ActionWith2Args/Page1.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_ActionWith2Args/PF_ActionWith2Args/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWith2Args/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ActionWith2Args\Controller.java:53: Expected a single argument. protected Forward page1(TempForm inForm, String inString) ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Begin.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_ActionWithForm/PF_ActionWithForm/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,60 @@
+package PF_ActionWithForm;
+
+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.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares an ActionForward method "page1" with
+ * the jpf:action annotation. The method takes a single ActionForm derived
+ * parameter. This should be valid syntax.
+ *
+ * @result: This PageFlowController should compile successfully and generate a valid
+ * config xml file.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ /***************************************************************************
+ * Inner ActionForm class
+ **************************************************************************/
+ public static final class TempForm extends FormData
+ {
+ private String lastName = "John Doe";
+ public String getLastName()
+ {
+ return(this.lastName);
+ }
+ public void setLastName(String lastName)
+ {
+ this.lastName = lastName;
+ }
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp")
+ })
+ protected Forward page1(TempForm inForm)
+ {
+ TempForm theForm = inForm;
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/PF_ActionWithForm/Page1.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_ActionWithForm/PF_ActionWithForm/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/expectedOutput/struts-config-PF_ActionWithForm.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/expectedOutput/struts-config-PF_ActionWithForm.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/expectedOutput/struts-config-PF_ActionWithForm.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ActionWithForm/expectedOutput/struts-config-PF_ActionWithForm.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,28 @@
+<?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_ActionWithForm/Controller.java on Tue Aug 09 16:45:58 MDT 2005-->
+<struts-config>
+ <form-beans>
+ <form-bean name="tempForm" type="PF_ActionWithForm.Controller$TempForm"/>
+ </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_ActionWithForm.Controller" scope="request" validate="false">
+ <forward name="begin" path="/Begin.jsp"/>
+ </action>
+ <action path="/page1" name="tempForm" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ActionWithForm.Controller" scope="request" validate="false">
+ <forward name="page1" path="/Page1.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_ActionWithForm.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_AnyNumberActionForward/PF_AnyNumberActionForward/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Begin.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_AnyNumberActionForward/PF_AnyNumberActionForward/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,186 @@
+package PF_AnyNumberActionForward;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares 50 jpf:forward annotations on
+ * ActionForward method "page1". The spec says I can have any number.
+ *
+ * @result: PageFlowController should compile cleanly.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "begin",
+ path = "Begin.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("begin");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "page1",
+ path = "Page1.jsp"),
+ @Jpf.Forward(
+ name = "page2",
+ path = "Page2.jsp"),
+ @Jpf.Forward(
+ name = "page3",
+ path = "Page3.jsp"),
+ @Jpf.Forward(
+ name = "page4",
+ path = "Page4.jsp"),
+ @Jpf.Forward(
+ name = "page5",
+ path = "Page5.jsp"),
+ @Jpf.Forward(
+ name = "page6",
+ path = "Page6.jsp"),
+ @Jpf.Forward(
+ name = "page7",
+ path = "Page7.jsp"),
+ @Jpf.Forward(
+ name = "page8",
+ path = "Page8.jsp"),
+ @Jpf.Forward(
+ name = "page9",
+ path = "Page9.jsp"),
+ @Jpf.Forward(
+ name = "page10",
+ path = "Page10.jsp"),
+ @Jpf.Forward(
+ name = "page11",
+ path = "Page11.jsp"),
+ @Jpf.Forward(
+ name = "page12",
+ path = "Page12.jsp"),
+ @Jpf.Forward(
+ name = "page13",
+ path = "Page13.jsp"),
+ @Jpf.Forward(
+ name = "page14",
+ path = "Page14.jsp"),
+ @Jpf.Forward(
+ name = "page15",
+ path = "Page15.jsp"),
+ @Jpf.Forward(
+ name = "page16",
+ path = "Page16.jsp"),
+ @Jpf.Forward(
+ name = "page17",
+ path = "Page17.jsp"),
+ @Jpf.Forward(
+ name = "page18",
+ path = "Page18.jsp"),
+ @Jpf.Forward(
+ name = "page19",
+ path = "Page19.jsp"),
+ @Jpf.Forward(
+ name = "page20",
+ path = "Page20.jsp"),
+ @Jpf.Forward(
+ name = "page21",
+ path = "Page21.jsp"),
+ @Jpf.Forward(
+ name = "page22",
+ path = "Page22.jsp"),
+ @Jpf.Forward(
+ name = "page23",
+ path = "Page23.jsp"),
+ @Jpf.Forward(
+ name = "page24",
+ path = "Page24.jsp"),
+ @Jpf.Forward(
+ name = "page25",
+ path = "Page25.jsp"),
+ @Jpf.Forward(
+ name = "page26",
+ path = "Page26.jsp"),
+ @Jpf.Forward(
+ name = "page27",
+ path = "Page27.jsp"),
+ @Jpf.Forward(
+ name = "page28",
+ path = "Page28.jsp"),
+ @Jpf.Forward(
+ name = "page29",
+ path = "Page29.jsp"),
+ @Jpf.Forward(
+ name = "page30",
+ path = "Page30.jsp"),
+ @Jpf.Forward(
+ name = "page31",
+ path = "Page31.jsp"),
+ @Jpf.Forward(
+ name = "page32",
+ path = "Page32.jsp"),
+ @Jpf.Forward(
+ name = "page33",
+ path = "Page33.jsp"),
+ @Jpf.Forward(
+ name = "page34",
+ path = "Page34.jsp"),
+ @Jpf.Forward(
+ name = "page35",
+ path = "Page35.jsp"),
+ @Jpf.Forward(
+ name = "page36",
+ path = "Page36.jsp"),
+ @Jpf.Forward(
+ name = "page37",
+ path = "Page37.jsp"),
+ @Jpf.Forward(
+ name = "page38",
+ path = "Page38.jsp"),
+ @Jpf.Forward(
+ name = "page39",
+ path = "Page39.jsp"),
+ @Jpf.Forward(
+ name = "page40",
+ path = "Page40.jsp"),
+ @Jpf.Forward(
+ name = "page41",
+ path = "Page41.jsp"),
+ @Jpf.Forward(
+ name = "page42",
+ path = "Page42.jsp"),
+ @Jpf.Forward(
+ name = "page43",
+ path = "Page43.jsp"),
+ @Jpf.Forward(
+ name = "page44",
+ path = "Page44.jsp"),
+ @Jpf.Forward(
+ name = "page45",
+ path = "Page45.jsp"),
+ @Jpf.Forward(
+ name = "page46",
+ path = "Page46.jsp"),
+ @Jpf.Forward(
+ name = "page47",
+ path = "Page47.jsp"),
+ @Jpf.Forward(
+ name = "page48",
+ path = "Page48.jsp"),
+ @Jpf.Forward(
+ name = "page49",
+ path = "Page49.jsp"),
+ @Jpf.Forward(
+ name = "page50",
+ path = "Page50.jsp")
+ })
+ protected Forward page1()
+ {
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page1.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_AnyNumberActionForward/PF_AnyNumberActionForward/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page10.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page10.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page10.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/PF_AnyNumberActionForward/Page10.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_AnyNumberActionForward/PF_AnyNumberActionForward/Page10.jsp
------------------------------------------------------------------------------
svn:eol-style = native