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 [6/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...
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NoBeginAction/PF_NoBeginAction/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NoBeginAction/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NoBeginAction/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NoBeginAction/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NoBeginAction/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_NoBeginAction\Controller.java:17: There is no begin action defined for this PageFlowController.public class Controller extends PageFlowController ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/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_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,42 @@
+package PF_NonNestedWithReturnAction;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file does NOT specifiy the PageFlowController
+ * jpf:controller nested="true" annotation (making it a nestable PageFlowController), yet it
+ * declares a jpf:forward annotations in Forward method "page1" with the
+ * "returnAction" attribute. The Spec. states that you can not "returnAction"
+ * if the PageFlowController is not "nestable".
+ *
+ * @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",
+ returnAction = "createTest")
+ })
+ protected Forward page1()
+ {
+ return new Forward("page1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/PF_NonNestedWithReturnAction/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonNestedWithReturnAction/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_NonNestedWithReturnAction\Controller.java:38: Attribute "returnAction" is only valid in a nested PageFlowController. protected Forward page1() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,28 @@
+package PF_NonPublicForm;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ * @desc: Define an action which takes a form as a parameter. however, the form is a private inner class.
+ *
+ * @result:
+ */
+@Jpf.Controller()
+public class Controller extends PageFlowController
+{
+ private static class MyForm {}
+
+ @Jpf.Action(
+ forwards={
+ @Jpf.Forward(name="index", path="index.jsp")
+ }
+ )
+ protected Forward begin(MyForm form)
+ {
+ return new Forward("index");
+ }
+
+
+}
\ No newline at end of file
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/index.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/index.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/PF_NonPublicForm/index.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_NonPublicForm/PF_NonPublicForm/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NonPublicForm/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_NonPublicForm\Controller.java:22: Argument type PF_NonPublicForm.Controller.MyForm is not public. protected Forward begin(MyForm form) ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Begin.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Begin.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Begin.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/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_NotExtendingPageFlow/PF_NotExtendingPageFlow/Begin.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,40 @@
+package PF_NotExtendingPageFlow;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares perfectly valid PageFlowController
+ * annotations however the class does NOT extend the "PageFlow" class.
+ *
+ * @result: The compiler should catch this and issue an error.
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller
+ implements java.io.Serializable
+ {
+ @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");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Page1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Page1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/Page1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/PF_NotExtendingPageFlow/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_NotExtendingPageFlow/PF_NotExtendingPageFlow/Page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_NotExtendingPageFlow/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_NotExtendingPageFlow\Controller.java:16: The Controller annotation is not valid on this class. The class should extend org.apache.beehive.netui.pageflow.PageFlowController or org.apache.beehive.netui.pageflow.SharedFlowController.public class Controller ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,40 @@
+package newName;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains a PageFlowController that specifies a
+ * package name that is not the same name as the directory where the
+ * PageFlowController source file resides. This is invalid.
+ *
+ * @result: The compiler should catch this error and issue an 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")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/PF_PkgNotMatchDir/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_PkgNotMatchDir/PF_PkgNotMatchDir/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_PkgNotMatchDir/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_PkgNotMatchDir\Controller.java:25: warning: File "Pg1.jsp" could not be found in the web application. protected Forward begin() ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_PkgNotMatchDir\Controller.java:36: warning: File "Pg1.jsp" could not be found in the web application. protected Forward page1() ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_PkgNotMatchDir\Controller.java:17: The package does not match the directory [LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_PkgNotMatchDir.public class Controller extends PageFlowController ^1 error2 warnings
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,76 @@
+package PF_ReadOnlyActionWithForm;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlow source file contains actions that contain both the "form"
+ * attribute and the "read-only" attribute. These two attrubutes are mutually
+ * exclusive.
+ *
+ * @result: Compiler should issue an error on "action1" but not "action2" as "action2"
+ * has "read-only" set to "false".
+ *
+ ******************************************************************************/
+@Jpf.Controller()
+public class Controller extends PageFlowController
+ {
+
+ Form1 _form1 = new Form1();
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ readOnly = true,
+ useFormBean = "_form1",
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "Pg1.jsp")
+ })
+ protected Forward action1(Form1 inForm1)
+ {
+ return new Forward("success");
+ }
+
+ @Jpf.Action(
+ readOnly = false,
+ useFormBean = "_form1",
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "Pg1.jsp")
+ })
+ protected Forward action2(Form1 inForm1)
+ {
+ return new Forward("success");
+ }
+
+ /****************************************************************************
+ * Form bean
+ ***************************************************************************/
+ public static class Form1 extends FormData
+ {
+ private String _fld1;
+
+ public String getFld1()
+ {
+ return _fld1;
+ }
+
+ public void setFld1(String inValue)
+ {
+ _fld1 = inValue;
+ }
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/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_ReadOnlyActionWithForm/PF_ReadOnlyActionWithForm/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ReadOnlyActionWithForm/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ReadOnlyActionWithForm\Controller.java:41: The "useFormBean" attribute may not be used on read-only actions. protected Forward action1(Form1 inForm1) ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_ReadOnlyActionWithForm\Controller.java:41: warning: This action has the readOnly attribute set to true, but the useFormBean attribute may cause the value of member field _form1 to be modified. protected Forward action1(Form1 inForm1) ^1 error1 warning
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,43 @@
+package PF_RedirectNotWithPath;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains a jpf:forward annotation that contains
+ * both the "redirect" attribute along with the "returnAction" attribute. The
+ * spec says that "redirect" can only appear with the "path" attribute.
+ *
+ * @desc: The compiler should catch this error and issue an error message.
+ *
+ *
+ ******************************************************************************/
+ @Jpf.Controller(
+ nested = true)
+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",
+ returnAction = "invalidSyntax",
+ redirect = true)
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/PF_RedirectNotWithPath/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_RedirectNotWithPath/PF_RedirectNotWithPath/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectNotWithPath/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_RedirectNotWithPath\Controller.java:39: Attribute "redirect" may only be present when attribute "path" or "navigateTo" is present. protected Forward page1() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,43 @@
+package PF_RedirectWithNavigateTo;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains a jpf:forward annotation that contains
+ * both the "redirect" attribute along with the "navigateTo" attribute. This is
+ * valid syntax.
+ *
+ * @result: This PageFlowController should compile cleanly.
+ *
+ *
+ ******************************************************************************/
+ @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",
+ navigateTo = Jpf.NavigateTo.currentPage,
+ redirect = true)
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/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_RedirectWithNavigateTo/PF_RedirectWithNavigateTo/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.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_RedirectWithNavigateTo/Controller.java on Tue Aug 09 16:46:34 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_RedirectWithNavigateTo.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_RedirectWithNavigateTo.Controller" scope="request" validate="false">
+ <forward name="pg1" path="currentPage" redirect="true" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToPage" value="true"/>
+ <set-property property="hasExplicitRedirectValue" value="true"/>
+ </forward>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PF_RedirectWithNavigateTo.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_RolesAllowed/PF_RolesAllowed/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,70 @@
+package PF_RolesAllowed;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains two actions that reverse the order of
+ * a "validationErrorForward" and a "rolesAllowed" attributes. This test
+ * verifies that the order does not matter and that "validationErrorForward" and
+ * "rolesAllowed" over-ride each other. See Radar bug 37710.
+ *
+ * @result Test should compile cleanly and the resulting config.xml file should be
+ * correct.
+ *
+ ******************************************************************************/
+@Jpf.Controller(
+ rolesAllowed = {
+ "heyRole"
+ })
+ public class Controller extends PageFlowController
+ {
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward begin()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ validationErrorForward = @Jpf.Forward(
+ name="validationFailure",
+ path="Pg1.jsp"),
+ rolesAllowed = {
+ "foo",
+ "bar"
+ },
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "Pg1.jsp")
+ })
+ protected Forward newAction1()
+ {
+ return new Forward("success");
+ }
+
+ @Jpf.Action(
+ rolesAllowed = {
+ "foo",
+ "bar"
+ },
+ validationErrorForward = @Jpf.Forward(
+ name="validationFailure",
+ path="Pg1.jsp"),
+ forwards = {
+ @Jpf.Forward(
+ name = "success",
+ path = "Pg1.jsp")
+ })
+ protected Forward newAction2()
+ {
+ return new Forward("success");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/PF_RolesAllowed/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_RolesAllowed/PF_RolesAllowed/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,33 @@
+<?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_RolesAllowed/Controller.java on Tue Aug 09 16:46:36 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_RolesAllowed.Controller" scope="request" roles="heyRole" validate="false">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/newAction1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="validationFailure" parameter="PF_RolesAllowed.Controller" scope="request" roles="foo,heyRole,bar" validate="true">
+ <forward name="success" path="/Pg1.jsp"/>
+ <!--forward "validationFailure" (validationErrorForward)-->
+ <forward name="validationFailure" path="/Pg1.jsp"/>
+ </action>
+ <action path="/newAction2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="validationFailure" parameter="PF_RolesAllowed.Controller" scope="request" roles="foo,heyRole,bar" validate="true">
+ <forward name="success" path="/Pg1.jsp"/>
+ <!--forward "validationFailure" (validationErrorForward)-->
+ <forward name="validationFailure" 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_RolesAllowed.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_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,57 @@
+package PF_SameGlobalActionForwardName;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares a global forward named "gb1" that
+ * forwards to path "Gb1.jsp". Then one of the ActionForward methods declares a
+ * local forward also named "gb1" that will forward to path "Gb2.jsp".
+ *
+ * @result: This PageFlowController should compile cleanly and the resulting config xml
+ * file should be generated correctly.
+ *
+ ******************************************************************************/
+ @Jpf.Controller(
+ forwards = {
+ @Jpf.Forward(
+ name = "gb1",
+ path = "Gb1.jsp")
+ })
+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")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "gb1",
+ path = "Gb2.jsp")
+ })
+ protected Forward page2()
+ {
+ return new Forward("gb1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb1.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_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb2.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb2.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb2.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_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Gb2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/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_SameGlobalActionForwardName/PF_SameGlobalActionForwardName/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.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_SameGlobalActionForwardName/Controller.java on Tue Aug 09 16:46:37 MDT 2005-->
+<struts-config>
+ <form-beans/>
+ <global-exceptions/>
+ <global-forwards>
+ <forward name="gb1" path="/Gb1.jsp"/>
+ <forward name="_auto" path=""/>
+ </global-forwards>
+ <action-mappings>
+ <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_SameGlobalActionForwardName.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_SameGlobalActionForwardName.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_SameGlobalActionForwardName.Controller" scope="request" validate="false">
+ <forward name="gb1" path="/Gb2.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_SameGlobalActionForwardName.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_SameMethodNameSig/PF_SameMethodNameSig/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,51 @@
+package PF_SameMethodNameSig;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains two Forward methods with the same
+ * method name and signature, "page2". This is invalid Java syntax.
+ *
+ * @result: The compiler should catch this and issue an error that a method name and
+ * signature was duplicated.
+ *
+ ******************************************************************************/
+@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")
+ })
+ protected Forward page2()
+ {
+ return new Forward("pg2");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg3",
+ path = "Pg3.jsp")
+ })
+ protected Forward page2()
+ {
+ return new Forward("pg3");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,9 @@
+<%@ 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_SameMethodNameSig/PF_SameMethodNameSig/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg2.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg2.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg2.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,9 @@
+<%@ 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_SameMethodNameSig/PF_SameMethodNameSig/Pg2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg3.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg3.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg3.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/PF_SameMethodNameSig/Pg3.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1,9 @@
+<%@ 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_SameMethodNameSig/PF_SameMethodNameSig/Pg3.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.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_SameMethodNameSig/Controller.java on Tue Aug 09 16:46:39 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_SameMethodNameSig.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_SameMethodNameSig.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_SameMethodNameSig.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_SameMethodNameSig/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_SameMethodNameSig\Controller.java:47: page2() is already defined in PF_SameMethodNameSig.Controller protected Forward page2() ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_SameMethodNameSig\Controller.java:47: page2() is already defined in PF_SameMethodNameSig.Controller protected Forward page2() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,41 @@
+package PF_TwoActionValidationErrForward;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file contains two jpf:validation-error-forward
+ * annotations. This is invalid syntax.
+ *
+ * @result: The compiler should catch this error and issue an 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(
+ validationErrorForward=@Jpf.Forward(name="failure1", navigateTo=Jpf.NavigateTo.currentPage),
+ validationErrorForward=@Jpf.Forward(name="failure2", navigateTo=Jpf.NavigateTo.previousPage),
+ forwards = {
+ @Jpf.Forward(
+ name = "pg1",
+ path = "Pg1.jsp")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/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_TwoActionValidationErrForward/PF_TwoActionValidationErrForward/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1,29 @@
+<?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_TwoActionValidationErrForward/Controller.java on Tue Aug 09 16:46:43 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_TwoActionValidationErrForward.Controller" scope="request" validate="false">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ </action>
+ <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="failure2" parameter="PF_TwoActionValidationErrForward.Controller" scope="request" validate="true">
+ <forward name="pg1" path="/Pg1.jsp"/>
+ <!--forward "failure2" (validationErrorForward)-->
+ <forward name="failure2" path="previousPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <set-property property="returnToPage" value="true"/>
+ </forward>
+ </action>
+ </action-mappings>
+ <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <set-property property="isReturnToActionDisabled" value="true"/>
+ <set-property property="sharedFlows" value=""/>
+ <set-property property="controllerClass" value="PF_TwoActionValidationErrForward.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_TwoActionValidationErrForward/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_TwoActionValidationErrForward\Controller.java:31: duplicate annotation member value validationErrorForward in org.apache.beehive.netui.pageflow.annotations.Jpf.Action validationErrorForward=@Jpf.Forward(name="failure2", navigateTo=Jpf.NavigateTo.previousPage), ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,40 @@
+package PF_TwoActionsSameForward;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file is designed to compile cleanly. This test is
+ * used for testing compiler behavior that does not have anything to do with the
+ * contents of a .jpf file. Like write access to the WEB-INF directory.
+ *
+ * @result: This test must compile cleanly.
+ *
+ ******************************************************************************/
+@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")
+ })
+ protected Forward page1()
+ {
+ return new Forward("pg1");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/PF_TwoActionsSameForward/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_TwoActionsSameForward/PF_TwoActionsSameForward/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.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_TwoActionsSameForward/Controller.java on Tue Aug 09 21:32:20 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_TwoActionsSameForward.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_TwoActionsSameForward.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_TwoActionsSameForward.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_TwoBeginAction/PF_TwoBeginAction/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,50 @@
+package PF_TwoBeginAction;
+
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ *******************************************************************************
+ *
+ * @desc: This PageFlowController file declares two ActionForward "begin" methods.
+ *
+ * @result The compiler should catch this and issue an error message that a PageFlow
+ * can contain only one "begin" method.
+ *
+ ******************************************************************************/
+@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")
+ })
+ protected Forward begin()
+ {
+ return new Forward("pg1");
+ }
+
+ @Jpf.Action(
+ forwards = {
+ @Jpf.Forward(
+ name = "pg2",
+ path = "Pg2.jsp")
+ })
+ protected Forward page2()
+ {
+ return new Forward("pg2");
+ }
+ }
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/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_TwoBeginAction/PF_TwoBeginAction/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg2.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg2.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/Pg2.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/PF_TwoBeginAction/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_TwoBeginAction/PF_TwoBeginAction/Pg2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.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_TwoBeginAction/Controller.java on Tue Aug 09 16:46:45 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_TwoBeginAction.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_TwoBeginAction.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_TwoBeginAction.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_TwoBeginAction/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_TwoBeginAction\Controller.java:35: begin() is already defined in PF_TwoBeginAction.Controller protected Forward begin() ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_TwoBeginAction\Controller.java:35: begin() is already defined in PF_TwoBeginAction.Controller protected Forward begin() ^1 error
\ No newline at end of file
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Controller.jpf?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Controller.jpf (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Controller.jpf Thu Sep 15 10:43:52 2005
@@ -0,0 +1,89 @@
+package PF_UseFormBeanNotMatchArgType;
+
+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 a formbean class to the "form=" action attribute
+ * that is not the same class as the action method signature.
+ *
+ * @result: The compiler should catch this 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 = "form2",
+ 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(FormTwo 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; }
+ }
+
+ /***************************************************************************
+ *
+ **************************************************************************/
+ 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_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Pg1.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Pg1.jsp?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Pg1.jsp (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Pg1.jsp Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+
Propchange: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/PF_UseFormBeanNotMatchArgType/Pg1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/expectedOutput/warningsorerrors.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/expectedOutput/warningsorerrors.expected?rev=289284&view=auto
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/expectedOutput/warningsorerrors.expected (added)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_UseFormBeanNotMatchArgType/expectedOutput/warningsorerrors.expected Thu Sep 15 10:43:52 2005
@@ -0,0 +1 @@
+[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_UseFormBeanNotMatchArgType\Controller.java:45: The useFormBean attribute points to a member of type PF_UseFormBeanNotMatchArgType.Controller.FormTwo, which requires that this action method accept an argument of type PF_UseFormBeanNotMatchArgType.Controller.FormTwo. public Forward action1(FormOne inForm) ^[LOCAL_PATH]/WEB-INF\.tmpbeansrc\PF_UseFormBeanNotMatchArgType\Controller.java:58: The useFormBean attribute points to a member of type PF_UseFormBeanNotMatchArgType.Controller.FormOne, which requires that this action method accept an argument of type PF_UseFormBeanNotMatchArgType.Controller.FormOne. public Forward action2(FormTwo inForm) ^2 errors
\ No newline at end of file