You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ri...@apache.org on 2005/09/16 22:30:17 UTC
svn commit: r289648 [5/6] - in /beehive/trunk/netui: src/compiler-core/
src/compiler-core/org/apache/beehive/netui/compiler/
src/compiler-core/org/apache/beehive/netui/compiler/genmodel/
src/compiler-core/org/apache/beehive/netui/compiler/grammar/ src/...
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/expectedOutput/struts-config-PF_AnyNumberActionForward.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/expectedOutput/struts-config-PF_AnyNumberActionForward.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/expectedOutput/struts-config-PF_AnyNumberActionForward.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_AnyNumberActionForward/expectedOutput/struts-config-PF_AnyNumberActionForward.expected Fri Sep 16 13:27:57 2005
@@ -1,17 +1,17 @@
<?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_AnyNumberActionForward/Controller.java on Tue Aug 09 16:46:00 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_AnyNumberActionForward/Controller.java on Tue Aug 09 16:46:00 MDT 2005 -->
<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_AnyNumberActionForward.Controller" scope="request" validate="false">
+ <action parameter="PF_AnyNumberActionForward.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="begin" path="/Begin.jsp"/>
</action>
- <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_AnyNumberActionForward.Controller" scope="request" validate="false">
+ <action parameter="PF_AnyNumberActionForward.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="page1" path="/Page1.jsp"/>
<forward name="page2" path="/Page2.jsp"/>
<forward name="page3" path="/Page3.jsp"/>
@@ -64,12 +64,12 @@
<forward name="page50" path="/Page50.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_AnyNumberActionForward.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_CatchExceptionHandler/expectedOutput/struts-config-PF_CatchExceptionHandler.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_CatchExceptionHandler/expectedOutput/struts-config-PF_CatchExceptionHandler.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_CatchExceptionHandler/expectedOutput/struts-config-PF_CatchExceptionHandler.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_CatchExceptionHandler/expectedOutput/struts-config-PF_CatchExceptionHandler.expected Fri Sep 16 13:27:57 2005
@@ -1,35 +1,35 @@
<?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_CatchExceptionHandler/Controller.java on Tue Aug 09 16:46:02 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_CatchExceptionHandler/Controller.java on Tue Aug 09 16:46:02 MDT 2005 -->
<form-beans>
<form-bean name="formOne" type="PF_CatchExceptionHandler.Controller$FormOne"/>
</form-beans>
<global-exceptions>
- <exception type="java.lang.Throwable" key="java.lang.Throwable" handler="exceptionHandler" className="org.apache.beehive.netui.pageflow.config.PageFlowExceptionConfig">
+ <exception className="org.apache.beehive.netui.pageflow.config.PageFlowExceptionConfig" handler="exceptionHandler" key="java.lang.Throwable" type="java.lang.Throwable">
<set-property property="isHandlerMethod" value="true"/>
</exception>
</global-exceptions>
<global-forwards>
<forward name="_auto" path=""/>
- <!--forward "current" from exception-handler exceptionHandler-->
- <forward name="current" path="currentPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="current" path="currentPage">
+ <!-- forward "current" from exception-handler exceptionHandler -->
<set-property property="returnToPage" value="true"/>
</forward>
</global-forwards>
<action-mappings>
- <action path="/action1" name="formOne" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_CatchExceptionHandler.Controller" scope="request" validate="false">
+ <action name="formOne" parameter="PF_CatchExceptionHandler.Controller" path="/action1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="currentPage" path="/currentPage"/>
</action>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_CatchExceptionHandler.Controller" scope="request" validate="false">
+ <action parameter="PF_CatchExceptionHandler.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_CatchExceptionHandler.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_DeprecatedExceptionHandler/expectedOutput/struts-config-PF_DeprecatedExceptionHandler.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_DeprecatedExceptionHandler/expectedOutput/struts-config-PF_DeprecatedExceptionHandler.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_DeprecatedExceptionHandler/expectedOutput/struts-config-PF_DeprecatedExceptionHandler.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_DeprecatedExceptionHandler/expectedOutput/struts-config-PF_DeprecatedExceptionHandler.expected Fri Sep 16 13:27:57 2005
@@ -1,35 +1,35 @@
<?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_DeprecatedExceptionHandler/Controller.java on Tue Aug 09 16:46:04 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_DeprecatedExceptionHandler/Controller.java on Tue Aug 09 16:46:04 MDT 2005 -->
<form-beans>
<form-bean name="formOne" type="PF_DeprecatedExceptionHandler.Controller$FormOne"/>
</form-beans>
<global-exceptions>
- <exception type="java.lang.Throwable" key="java.lang.Throwable" handler="exceptionHandler" className="org.apache.beehive.netui.pageflow.config.PageFlowExceptionConfig">
+ <exception className="org.apache.beehive.netui.pageflow.config.PageFlowExceptionConfig" handler="exceptionHandler" key="java.lang.Throwable" type="java.lang.Throwable">
<set-property property="isHandlerMethod" value="true"/>
</exception>
</global-exceptions>
<global-forwards>
<forward name="_auto" path=""/>
- <!--forward "current" from exception-handler exceptionHandler-->
- <forward name="current" path="currentPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="current" path="currentPage">
+ <!-- forward "current" from exception-handler exceptionHandler -->
<set-property property="returnToPage" value="true"/>
</forward>
</global-forwards>
<action-mappings>
- <action path="/action1" name="formOne" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_DeprecatedExceptionHandler.Controller" scope="request" validate="false">
+ <action name="formOne" parameter="PF_DeprecatedExceptionHandler.Controller" path="/action1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="currentPage" path="/currentPage"/>
</action>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_DeprecatedExceptionHandler.Controller" scope="request" validate="false">
+ <action parameter="PF_DeprecatedExceptionHandler.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_DeprecatedExceptionHandler.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardNotInActionOrController/expectedOutput/struts-config-PF_ForwardNotInActionOrController.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardNotInActionOrController/expectedOutput/struts-config-PF_ForwardNotInActionOrController.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardNotInActionOrController/expectedOutput/struts-config-PF_ForwardNotInActionOrController.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardNotInActionOrController/expectedOutput/struts-config-PF_ForwardNotInActionOrController.expected Fri Sep 16 13:27:57 2005
@@ -1,23 +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_ForwardNotInActionOrController/Controller.java on Tue Aug 09 16:46:12 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_ForwardNotInActionOrController/Controller.java on Tue Aug 09 16:46:12 MDT 2005 -->
<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_ForwardNotInActionOrController.Controller" scope="request" validate="false">
+ <action parameter="PF_ForwardNotInActionOrController.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_ForwardNotInActionOrController.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardRedirect/expectedOutput/struts-config-PF_ForwardRedirect.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardRedirect/expectedOutput/struts-config-PF_ForwardRedirect.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardRedirect/expectedOutput/struts-config-PF_ForwardRedirect.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardRedirect/expectedOutput/struts-config-PF_ForwardRedirect.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +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_ForwardRedirect/Controller.java on Tue Aug 09 21:31:51 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_ForwardRedirect/Controller.java on Tue Aug 09 21:31:51 MDT 2005 -->
<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_ForwardRedirect.Controller" scope="request" validate="false">
+ <action parameter="PF_ForwardRedirect.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="pg1" path="/Pg1.jsp"/>
</action>
- <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ForwardRedirect.Controller" scope="request" validate="false">
+ <action parameter="PF_ForwardRedirect.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_ForwardRedirect.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardSyntax/expectedOutput/struts-config-PF_ForwardSyntax.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardSyntax/expectedOutput/struts-config-PF_ForwardSyntax.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardSyntax/expectedOutput/struts-config-PF_ForwardSyntax.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ForwardSyntax/expectedOutput/struts-config-PF_ForwardSyntax.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +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_ForwardSyntax/Controller.java on Tue Aug 09 16:46:16 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_ForwardSyntax/Controller.java on Tue Aug 09 16:46:16 MDT 2005 -->
<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_ForwardSyntax.Controller" scope="request" validate="false">
+ <action parameter="PF_ForwardSyntax.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="pg1" path="/Pg1.jsp"/>
</action>
- <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ForwardSyntax.Controller" scope="request" validate="false">
+ <action parameter="PF_ForwardSyntax.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_ForwardSyntax.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_InvalidAnnotations/expectedOutput/struts-config-PF_InvalidAnnotations.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_InvalidAnnotations/expectedOutput/struts-config-PF_InvalidAnnotations.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_InvalidAnnotations/expectedOutput/struts-config-PF_InvalidAnnotations.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_InvalidAnnotations/expectedOutput/struts-config-PF_InvalidAnnotations.expected Fri Sep 16 13:27:57 2005
@@ -1,52 +1,53 @@
<?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_InvalidAnnotations/Controller.java on Tue Aug 09 21:31:56 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_InvalidAnnotations/Controller.java on Tue Aug 09 21:31:56 MDT 2005 -->
<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_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action3" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action3" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action4" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action4" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action5" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action5" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action6" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action6" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action7" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action7" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action8" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="validationFailure" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="true">
+ <action input="validationFailure" parameter="PF_InvalidAnnotations.Controller" path="/action8" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="true">
<forward name="gotoPg1" path="/Pg1.jsp"/>
- <!--forward "validationFailure" (validationErrorForward)-->
- <forward name="validationFailure" path="/Pg1.jsp"/>
+ <forward name="validationFailure" path="/Pg1.jsp">
+ <!-- forward "validationFailure" (validationErrorForward) -->
+ </forward>
</action>
- <action path="/action9" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/action9" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_InvalidAnnotations.Controller" scope="request" validate="false">
+ <action parameter="PF_InvalidAnnotations.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_InvalidAnnotations.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_JustBeginAction/expectedOutput/struts-config-PF_JustBeginAction.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_JustBeginAction/expectedOutput/struts-config-PF_JustBeginAction.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_JustBeginAction/expectedOutput/struts-config-PF_JustBeginAction.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_JustBeginAction/expectedOutput/struts-config-PF_JustBeginAction.expected Fri Sep 16 13:27:57 2005
@@ -1,23 +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_JustBeginAction/Controller.java on Tue Aug 09 16:46:20 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_JustBeginAction/Controller.java on Tue Aug 09 16:46:20 MDT 2005 -->
<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_JustBeginAction.Controller" scope="request" validate="false">
+ <action parameter="PF_JustBeginAction.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_JustBeginAction.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_LongLivedTrue/expectedOutput/struts-config-PF_LongLivedTrue.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_LongLivedTrue/expectedOutput/struts-config-PF_LongLivedTrue.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_LongLivedTrue/expectedOutput/struts-config-PF_LongLivedTrue.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_LongLivedTrue/expectedOutput/struts-config-PF_LongLivedTrue.expected Fri Sep 16 13:27:57 2005
@@ -1,21 +1,21 @@
<?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_LongLivedTrue/Controller.java on Tue Aug 09 16:46:22 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_LongLivedTrue/Controller.java on Tue Aug 09 16:46:22 MDT 2005 -->
<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_LongLivedTrue.Controller" scope="request" validate="false">
+ <action parameter="PF_LongLivedTrue.Controller" path="/Action1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="success" path="/Pg1.jsp"/>
</action>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_LongLivedTrue.Controller" scope="request" validate="false">
+ <action parameter="PF_LongLivedTrue.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="success" path="/Pg1.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isLongLivedPageFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -23,5 +23,5 @@
<set-property property="controllerClass" value="PF_LongLivedTrue.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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_MissingForwardJPF/expectedOutput/struts-config-MissingForwardJPF.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_MissingForwardJPF/expectedOutput/struts-config-MissingForwardJPF.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_MissingForwardJPF/expectedOutput/struts-config-MissingForwardJPF.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_MissingForwardJPF/expectedOutput/struts-config-MissingForwardJPF.expected Fri Sep 16 13:27:57 2005
@@ -1,23 +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 /MissingForwardJPF/Controller.jpf on Fri Feb 11 10:46:50 MST 2005-->
<struts-config>
+ <!-- Generated from /MissingForwardJPF/Controller.jpf on Fri Feb 11 10:46:50 MST 2005 -->
<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="MissingForwardJPF.Controller" scope="request" validate="false">
- <forward name="foo" path="/DoesNotExist.jpf" contextRelative="true"/>
+ <action parameter="MissingForwardJPF.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <forward contextRelative="true" name="foo" path="/DoesNotExist.jpf"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="CR182404.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultValidationMessages" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultValidationMessages" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RedirectWithNavigateTo/expectedOutput/struts-config-PF_RedirectWithNavigateTo.expected Fri Sep 16 13:27:57 2005
@@ -1,28 +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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_RedirectWithNavigateTo/Controller.java on Tue Aug 09 16:46:34 MDT 2005 -->
<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">
+ <action parameter="PF_RedirectWithNavigateTo.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_RedirectWithNavigateTo.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="pg1" path="currentPage" redirect="true">
<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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_RolesAllowed/expectedOutput/struts-config-PF_RolesAllowed.expected Fri Sep 16 13:27:57 2005
@@ -1,33 +1,35 @@
<?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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_RolesAllowed/Controller.java on Tue Aug 09 16:46:36 MDT 2005 -->
<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">
+ <action parameter="PF_RolesAllowed.Controller" path="/begin" roles="heyRole" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action input="validationFailure" parameter="PF_RolesAllowed.Controller" path="/newAction1" roles="foo,heyRole,bar" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="true">
<forward name="success" path="/Pg1.jsp"/>
- <!--forward "validationFailure" (validationErrorForward)-->
- <forward name="validationFailure" path="/Pg1.jsp"/>
+ <forward name="validationFailure" path="/Pg1.jsp">
+ <!-- forward "validationFailure" (validationErrorForward) -->
+ </forward>
</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">
+ <action input="validationFailure" parameter="PF_RolesAllowed.Controller" path="/newAction2" roles="foo,heyRole,bar" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="true">
<forward name="success" path="/Pg1.jsp"/>
- <!--forward "validationFailure" (validationErrorForward)-->
- <forward name="validationFailure" path="/Pg1.jsp"/>
+ <forward name="validationFailure" path="/Pg1.jsp">
+ <!-- forward "validationFailure" (validationErrorForward) -->
+ </forward>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameGlobalActionForwardName/expectedOutput/struts-config-PF_SameGlobalActionForwardName.expected Fri Sep 16 13:27:57 2005
@@ -1,7 +1,7 @@
<?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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_SameGlobalActionForwardName/Controller.java on Tue Aug 09 16:46:37 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
@@ -9,22 +9,22 @@
<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">
+ <action parameter="PF_SameGlobalActionForwardName.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_SameGlobalActionForwardName.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_SameGlobalActionForwardName.Controller" path="/page2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_SameMethodNameSig/expectedOutput/struts-config-PF_SameMethodNameSig.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_SameMethodNameSig/Controller.java on Tue Aug 09 16:46:39 MDT 2005 -->
<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">
+ <action parameter="PF_SameMethodNameSig.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_SameMethodNameSig.Controller" path="/page2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionValidationErrForward/expectedOutput/struts-config-PF_TwoActionValidationErrForward.expected Fri Sep 16 13:27:57 2005
@@ -1,29 +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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_TwoActionValidationErrForward/Controller.java on Tue Aug 09 16:46:43 MDT 2005 -->
<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">
+ <action parameter="PF_TwoActionValidationErrForward.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action input="failure2" parameter="PF_TwoActionValidationErrForward.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="true">
<forward name="pg1" path="/Pg1.jsp"/>
- <!--forward "failure2" (validationErrorForward)-->
- <forward name="failure2" path="previousPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="failure2" path="previousPage">
+ <!-- forward "failure2" (validationErrorForward) -->
<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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoActionsSameForward/expectedOutput/struts-config-PF_TwoActionsSameForward.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_TwoActionsSameForward/Controller.java on Tue Aug 09 21:32:20 MDT 2005 -->
<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">
+ <action parameter="PF_TwoActionsSameForward.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_TwoActionsSameForward.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: 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=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_TwoBeginAction/expectedOutput/struts-config-PF_TwoBeginAction.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +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>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_TwoBeginAction/Controller.java on Tue Aug 09 16:46:45 MDT 2005 -->
<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">
+ <action parameter="PF_TwoBeginAction.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <action parameter="PF_TwoBeginAction.Controller" path="/page2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<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
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_ValidateErrorForward/expectedOutput/struts-config-PF_ValidateErrorForward.expected Fri Sep 16 13:27:57 2005
@@ -1,37 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PF_ValidateErrorForward/Controller.java on Tue Aug 09 16:46:48 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_ValidateErrorForward/Controller.java on Tue Aug 09 16:46:48 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/action1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" input="failure" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="true">
+ <action input="failure" parameter="PF_ValidateErrorForward.Controller" path="/action1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="true">
<forward name="gotoPg1" path="/Pg1.jsp"/>
- <!--forward "failure" (validationErrorForward)-->
- <forward name="failure" path="/action2.do"/>
+ <forward name="failure" path="/action2.do">
+ <!-- forward "failure" (validationErrorForward) -->
+ </forward>
</action>
- <action path="/action2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <action parameter="PF_ValidateErrorForward.Controller" path="/action2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action3" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <action parameter="PF_ValidateErrorForward.Controller" path="/action3" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/action4" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <action parameter="PF_ValidateErrorForward.Controller" path="/action4" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="gotoPg1" path="/Pg1.jsp"/>
</action>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_ValidateErrorForward.Controller" scope="request" validate="false">
+ <action parameter="PF_ValidateErrorForward.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_ValidateErrorForward.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongActionMember/expectedOutput/struts-config-PF_WrongActionMember.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PF_WrongActionMember/Controller.java on Tue Aug 09 16:46:50 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_WrongActionMember/Controller.java on Tue Aug 09 16:46:50 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongActionMember.Controller" scope="request" validate="false">
+ <action parameter="PF_WrongActionMember.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="pg1" path="/Pg1.jsp"/>
</action>
- <action path="/page1" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongActionMember.Controller" scope="request" validate="false">
+ <action parameter="PF_WrongActionMember.Controller" path="/page1" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_WrongActionMember.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PF_WrongControlLocation/expectedOutput/struts-config-PF_WrongControlLocation.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PF_WrongControlLocation/Controller.java on Tue Aug 09 16:46:51 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PF_WrongControlLocation/Controller.java on Tue Aug 09 16:46:51 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongControlLocation.Controller" scope="request" validate="false">
+ <action parameter="PF_WrongControlLocation.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="pg1" path="/Pg1.jsp"/>
</action>
- <action path="/page2" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PF_WrongControlLocation.Controller" scope="request" validate="false">
+ <action parameter="PF_WrongControlLocation.Controller" path="/page2" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" 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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PF_WrongControlLocation.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Abstract/expectedOutput/struts-config-PI_Abstract.expected Fri Sep 16 13:27:57 2005
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PI_Abstract/AbstractFlowController.java on Tue Aug 09 16:46:54 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_Abstract/AbstractFlowController.java on Tue Aug 09 16:46:54 MDT 2005 -->
<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">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PI_Abstract.AbstractFlowController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin-parent.expected Fri Sep 16 13:27:57 2005
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PI_Begin/parent/ParentFlowController.java on Tue Aug 09 16:46:56 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_Begin/parent/ParentFlowController.java on Tue Aug 09 16:46:56 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_Begin.parent.ParentFlowController" scope="request" validate="false">
+ <action parameter="PI_Begin.parent.ParentFlowController" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PI_Begin.parent.ParentFlowController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_Begin/expectedOutput/struts-config-PI_Begin.expected Fri Sep 16 13:27:57 2005
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PI_Begin/Controller.java on Tue Aug 09 16:46:56 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_Begin/Controller.java on Tue Aug 09 16:46:56 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_Begin.Controller" scope="request" validate="false">
+ <action parameter="PI_Begin.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PI_Begin.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride-parent.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/parent/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/parent/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.parent.ControlsController" scope="request" validate="false">
+ <action parameter="PI_ControlsOverride.parent.ControlsController" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
- <action path="/getMessage" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.parent.ControlsController" scope="request" validate="false">
+ <action parameter="PI_ControlsOverride.parent.ControlsController" path="/getMessage" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="success" path="/result.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PI_ControlsOverride.parent.ControlsController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ControlsOverride/expectedOutput/struts-config-PI_ControlsOverride.expected Fri Sep 16 13:27:57 2005
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ControlsOverride/ControlsController.java on Tue Aug 09 16:47:00 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.ControlsController" scope="request" validate="false">
+ <action parameter="PI_ControlsOverride.ControlsController" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
- <action path="/getMessage" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ControlsOverride.ControlsController" scope="request" validate="false">
+ <action parameter="PI_ControlsOverride.ControlsController" path="/getMessage" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="success" path="/result.jsp"/>
</action>
</action-mappings>
- <controller processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor" inputForward="true" className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig">
+ <controller className="org.apache.beehive.netui.pageflow.config.PageFlowControllerConfig" inputForward="true" processorClass="org.apache.beehive.netui.pageflow.PageFlowRequestProcessor">
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="PI_ControlsOverride.ControlsController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>