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 [6/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/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-parent.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath-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_ForwardPath/parent/ParentFlowController.java on Tue Aug 09 16:47:02 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ForwardPath/parent/ParentFlowController.java on Tue Aug 09 16:47:02 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_ForwardPath.parent.ParentFlowController" scope="request" validate="false">
+ <action parameter="PI_ForwardPath.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_ForwardPath.parent.ParentFlowController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <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_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ForwardPath/expectedOutput/struts-config-PI_ForwardPath.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_ForwardPath/Controller.java on Tue Aug 09 16:47:02 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ForwardPath/Controller.java on Tue Aug 09 16:47:02 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_ForwardPath.Controller" scope="request" validate="false">
+ <action parameter="PI_ForwardPath.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_ForwardPath.Controller"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <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_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction-parent.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/PI_ReturnAction/parent/NestedController.java on Tue Aug 09 16:47:04 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ReturnAction/parent/NestedController.java on Tue Aug 09 16:47:04 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
- <forward name="done" path="returnAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="done" path="returnAction">
<set-property property="nestedReturn" value="true"/>
</forward>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ReturnAction.parent.NestedController" scope="request" validate="false">
+ <action parameter="PI_ReturnAction.parent.NestedController" 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="isNestedPageFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -23,5 +23,5 @@
<set-property property="controllerClass" value="PI_ReturnAction.parent.NestedController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <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_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/PI_ReturnAction/expectedOutput/struts-config-PI_ReturnAction.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/PI_ReturnAction/NestedController.java on Tue Aug 09 16:47:04 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/PI_ReturnAction/NestedController.java on Tue Aug 09 16:47:04 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
- <forward name="done" path="returnAction" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="done" path="returnAction">
<set-property property="nestedReturn" value="true"/>
</forward>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="PI_ReturnAction.NestedController" scope="request" validate="false">
+ <action parameter="PI_ReturnAction.NestedController" 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="isNestedPageFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -23,5 +23,5 @@
<set-property property="controllerClass" value="PI_ReturnAction.NestedController"/>
<set-property property="isMissingDefaultMessages" value="true"/>
</controller>
- <message-resources key="_defaultMsgs" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages" null="true"/>
-</struts-config>
\ No newline at end of file
+ <message-resources key="_defaultMsgs" null="true" parameter="org.apache.beehive.netui.pageflow.validation.defaultMessages"/>
+</struts-config>
Modified: beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config--SF_ImplicitReferences.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config--SF_ImplicitReferences.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config--SF_ImplicitReferences.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config--SF_ImplicitReferences.expected Fri Sep 16 13:27:57 2005
@@ -1,14 +1,14 @@
<?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/SF_ImplicitReferences/SharedFlow.java on Tue Aug 09 16:47:10 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_ImplicitReferences/SharedFlow.java on Tue Aug 09 16:47:10 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="isSharedFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -16,5 +16,5 @@
<set-property property="controllerClass" value="SF_ImplicitReferences.SharedFlow"/>
<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/SF_ImplicitReferences/expectedOutput/struts-config-SF_ImplicitReferences.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config-SF_ImplicitReferences.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config-SF_ImplicitReferences.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferences/expectedOutput/struts-config-SF_ImplicitReferences.expected Fri Sep 16 13:27:57 2005
@@ -1,30 +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/SF_ImplicitReferences/Controller.java on Tue Aug 09 16:47:09 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_ImplicitReferences/Controller.java on Tue Aug 09 16:47:09 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="SF_ImplicitReferences.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="SF_ImplicitReferences.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
- <action path="/getShared" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="SF_ImplicitReferences.Controller" scope="request" validate="false">
- <forward name="success" path="currentPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <action parameter="SF_ImplicitReferences.Controller" path="/getShared" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="success" path="currentPage">
<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="SF_ImplicitReferences.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/SF_ImplicitReferencesNested/expectedOutput/struts-config--SF_ImplicitReferencesNested.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config--SF_ImplicitReferencesNested.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config--SF_ImplicitReferencesNested.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config--SF_ImplicitReferencesNested.expected Fri Sep 16 13:27:57 2005
@@ -1,14 +1,14 @@
<?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/SF_ImplicitReferencesNested/SharedFlow.java on Tue Aug 09 16:47:11 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_ImplicitReferencesNested/SharedFlow.java on Tue Aug 09 16:47:11 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="isSharedFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -16,5 +16,5 @@
<set-property property="controllerClass" value="SF_ImplicitReferencesNested.SharedFlow"/>
<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/SF_ImplicitReferencesNested/expectedOutput/struts-config-SF_ImplicitReferencesNested.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config-SF_ImplicitReferencesNested.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config-SF_ImplicitReferencesNested.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_ImplicitReferencesNested/expectedOutput/struts-config-SF_ImplicitReferencesNested.expected Fri Sep 16 13:27:57 2005
@@ -1,39 +1,39 @@
<?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/SF_ImplicitReferencesNested/Controller.java on Tue Aug 09 16:47:11 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_ImplicitReferencesNested/Controller.java on Tue Aug 09 16:47:11 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="SF_ImplicitReferencesNested.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="SF_ImplicitReferencesNested.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
- <action path="/cancel" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="SF_ImplicitReferencesNested.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="SF_ImplicitReferencesNested.Controller" path="/cancel" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
- <forward name="_defaultForward" path="cancel" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="_defaultForward" path="cancel">
<set-property property="nestedReturn" value="true"/>
</forward>
</action>
- <action path="/getShared" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="SF_ImplicitReferencesNested.Controller" scope="request" validate="false">
- <forward name="success" path="currentPage" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <action parameter="SF_ImplicitReferencesNested.Controller" path="/getShared" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="success" path="currentPage">
<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="isNestedPageFlow" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
<set-property property="sharedFlows" value=""/>
<set-property property="controllerClass" value="SF_ImplicitReferencesNested.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/SF_InvalidRelativePath/expectedOutput/struts-config--SF_InvalidRelativePath.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config--SF_InvalidRelativePath.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config--SF_InvalidRelativePath.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config--SF_InvalidRelativePath.expected Fri Sep 16 13:27:57 2005
@@ -1,18 +1,18 @@
<?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/SF_InvalidRelativePath/SharedFlow.java on Tue Aug 09 16:47:13 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_InvalidRelativePath/SharedFlow.java on Tue Aug 09 16:47:13 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/invalidAction" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="SF_InvalidRelativePath.SharedFlow" scope="request" validate="false">
+ <action parameter="SF_InvalidRelativePath.SharedFlow" path="/invalidAction" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="success" path="/invalid.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="isSharedFlow" value="true"/>
<set-property property="isReturnToPageDisabled" value="true"/>
<set-property property="isReturnToActionDisabled" value="true"/>
@@ -20,5 +20,5 @@
<set-property property="controllerClass" value="SF_InvalidRelativePath.SharedFlow"/>
<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/SF_InvalidRelativePath/expectedOutput/struts-config-SF_InvalidRelativePath.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config-SF_InvalidRelativePath.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config-SF_InvalidRelativePath.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/SF_InvalidRelativePath/expectedOutput/struts-config-SF_InvalidRelativePath.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/SF_InvalidRelativePath/Controller.java on Tue Aug 09 16:47:13 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/SF_InvalidRelativePath/Controller.java on Tue Aug 09 16:47:13 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="SF_InvalidRelativePath.Controller" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="SF_InvalidRelativePath.Controller" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="shared=SF_InvalidRelativePath.SharedFlow"/>
<set-property property="controllerClass" value="SF_InvalidRelativePath.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/retrievePopupOutput/expectedOutput/struts-config-retrievePopupOutput.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/retrievePopupOutput/expectedOutput/struts-config-retrievePopupOutput.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/retrievePopupOutput/expectedOutput/struts-config-retrievePopupOutput.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/retrievePopupOutput/expectedOutput/struts-config-retrievePopupOutput.expected Fri Sep 16 13:27:57 2005
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE struts-config PUBLIC "-//Apache Software Foundation//DTD Struts Configuration 1.1//EN" "http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd">
-<!--Generated from /WEB-INF/.tmpbeansrc/retrievePopupOutput/ParentFlow.java on Tue Aug 09 16:47:08 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/retrievePopupOutput/ParentFlow.java on Tue Aug 09 16:47:08 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="retrievePopupOutput.ParentFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="retrievePopupOutput.ParentFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/noTagIdRef.jsp"/>
</action>
- <action path="/simplePopup" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="retrievePopupOutput.ParentFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="retrievePopupOutput.ParentFlow" path="/simplePopup" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/noDatasource.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="retrievePopupOutput.ParentFlow"/>
<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/simpleActionReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleActionReadOnlyUseFormBeanWarning.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleActionReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleActionReadOnlyUseFormBeanWarning.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleActionReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleActionReadOnlyUseFormBeanWarning.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleActionReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleActionReadOnlyUseFormBeanWarning.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/simpleActionReadOnlyUseFormBeanWarning/Warning.java on Tue Aug 09 16:47:19 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleActionReadOnlyUseFormBeanWarning/Warning.java on Tue Aug 09 16:47:19 MDT 2005 -->
<form-beans>
<form-bean name="newFormBean" type="simpleActionReadOnlyUseFormBeanWarning.Warning$NewFormBean"/>
</form-beans>
@@ -10,26 +10,26 @@
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="simpleActionReadOnlyUseFormBeanWarning.Warning" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleActionReadOnlyUseFormBeanWarning.Warning" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<forward name="index" path="/index.jsp"/>
</action>
- <action path="/foo" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="simpleActionReadOnlyUseFormBeanWarning.Warning" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleActionReadOnlyUseFormBeanWarning.Warning" path="/foo" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
- <forward name="_defaultForward" path="/index.jsp" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="_defaultForward" path="/index.jsp">
<set-property property="returnFormType" value="simpleActionReadOnlyUseFormBeanWarning.Warning$NewFormBean"/>
<set-property property="returnFormMember" value="_beanInstance"/>
</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="simpleActionReadOnlyUseFormBeanWarning.Warning"/>
<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/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent-childFlow.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent-childFlow.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent-childFlow.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent-childFlow.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/simpleBeginAbstractParent/childFlow/ChildFlow.java on Tue Aug 09 16:47:21 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleBeginAbstractParent/childFlow/ChildFlow.java on Tue Aug 09 16:47:21 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="simpleBeginAbstractParent.childFlow.ChildFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleBeginAbstractParent.childFlow.ChildFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="simpleBeginAbstractParent.childFlow.ChildFlow"/>
<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/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginAbstractParent/expectedOutput/struts-config-simpleBeginAbstractParent.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/simpleBeginAbstractParent/ParentFlow.java on Tue Aug 09 16:47:21 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleBeginAbstractParent/ParentFlow.java on Tue Aug 09 16:47:21 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="simpleBeginAbstractParent.ParentFlow"/>
<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/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride-childFlow.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride-childFlow.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride-childFlow.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride-childFlow.expected Fri Sep 16 13:27:57 2005
@@ -1,25 +1,25 @@
<?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/simpleBeginActionMethodOverride/childFlow/ChildFlow.java on Tue Aug 09 16:47:23 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleBeginActionMethodOverride/childFlow/ChildFlow.java on Tue Aug 09 16:47:23 MDT 2005 -->
<form-beans/>
<global-exceptions/>
<global-forwards>
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <!--Note that there is more than one action with path "/begin". Use a form-qualified action path if this is not the one you want.-->
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="simpleBeginActionMethodOverride.childFlow.ChildFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleBeginActionMethodOverride.childFlow.ChildFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
+ <!-- Note that there is more than one action with path "/begin". Use a form-qualified action path if this is not the one you want. -->
<set-property property="overloaded" value="true"/>
<forward name="success" 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="simpleBeginActionMethodOverride.childFlow.ChildFlow"/>
<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/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleBeginActionMethodOverride/expectedOutput/struts-config-simpleBeginActionMethodOverride.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/simpleBeginActionMethodOverride/ParentFlow.java on Tue Aug 09 16:47:23 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleBeginActionMethodOverride/ParentFlow.java on Tue Aug 09 16:47:23 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="simpleBeginActionMethodOverride.ParentFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleBeginActionMethodOverride.ParentFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="simpleBeginActionMethodOverride.ParentFlow"/>
<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/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin-childFlow.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin-childFlow.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin-childFlow.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin-childFlow.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/simpleInheritedBegin/childFlow/ChildFlow.java on Tue Aug 09 16:47:26 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleInheritedBegin/childFlow/ChildFlow.java on Tue Aug 09 16:47:26 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="simpleInheritedBegin.childFlow.ChildFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleInheritedBegin.childFlow.ChildFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="simpleInheritedBegin.childFlow.ChildFlow"/>
<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/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInheritedBegin/expectedOutput/struts-config-simpleInheritedBegin.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/simpleInheritedBegin/ParentFlow.java on Tue Aug 09 16:47:26 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleInheritedBegin/ParentFlow.java on Tue Aug 09 16:47:26 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="simpleInheritedBegin.ParentFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleInheritedBegin.ParentFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="simpleInheritedBegin.ParentFlow"/>
<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/simpleInvalidPathWarning/expectedOutput/struts-config-simpleInvalidPathWarning.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInvalidPathWarning/expectedOutput/struts-config-simpleInvalidPathWarning.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInvalidPathWarning/expectedOutput/struts-config-simpleInvalidPathWarning.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleInvalidPathWarning/expectedOutput/struts-config-simpleInvalidPathWarning.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/simpleInvalidPathWarning/ParentFlow.java on Tue Aug 09 16:47:28 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleInvalidPathWarning/ParentFlow.java on Tue Aug 09 16:47:28 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="simpleInvalidPathWarning.ParentFlow" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" parameter="simpleInvalidPathWarning.ParentFlow" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
<forward name="_defaultForward" path="/index.jsp"/>
</action>
</action-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="simpleInvalidPathWarning.ParentFlow"/>
<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/simpleReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleReadOnlyUseFormBeanWarning.expected
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/src/compilerTests/testsuite/simpleReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleReadOnlyUseFormBeanWarning.expected?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/src/compilerTests/testsuite/simpleReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleReadOnlyUseFormBeanWarning.expected (original)
+++ beehive/trunk/netui/test/src/compilerTests/testsuite/simpleReadOnlyUseFormBeanWarning/expectedOutput/struts-config-simpleReadOnlyUseFormBeanWarning.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/simpleReadOnlyUseFormBeanWarning/readOnlyController.java on Tue Aug 09 16:47:30 MDT 2005-->
<struts-config>
+ <!-- Generated from /WEB-INF/.tmpbeansrc/simpleReadOnlyUseFormBeanWarning/readOnlyController.java on Tue Aug 09 16:47:30 MDT 2005 -->
<form-beans>
<form-bean name="simpleBean_nonFlowScoped" type="simpleReadOnlyUseFormBeanWarning.readOnlyController$SimpleBean"/>
<form-bean name="simpleBean" type="simpleReadOnlyUseFormBeanWarning.readOnlyController$SimpleBean"/>
@@ -11,25 +11,25 @@
<forward name="_auto" path=""/>
</global-forwards>
<action-mappings>
- <action path="/begin" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="simpleReadOnlyUseFormBeanWarning.readOnlyController" scope="request" validate="false">
+ <action parameter="simpleReadOnlyUseFormBeanWarning.readOnlyController" path="/begin" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<forward name="index" path="/index.jsp"/>
</action>
- <action path="/submit" name="simpleBean" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" parameter="simpleReadOnlyUseFormBeanWarning.readOnlyController" scope="request" validate="false" className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping">
+ <action className="org.apache.beehive.netui.pageflow.config.PageFlowActionMapping" name="simpleBean" parameter="simpleReadOnlyUseFormBeanWarning.readOnlyController" path="/submit" scope="request" type="org.apache.beehive.netui.pageflow.internal.FlowControllerAction" validate="false">
<set-property property="formMember" value="scopedBean"/>
<set-property property="readonly" value="true"/>
<set-property property="simpleAction" value="true"/>
<set-property property="defaultForward" value="_defaultForward"/>
- <forward name="_defaultForward" path="/index.jsp" className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward">
+ <forward className="org.apache.beehive.netui.pageflow.config.PageFlowActionForward" name="_defaultForward" path="/index.jsp">
<set-property property="returnFormType" value="simpleReadOnlyUseFormBeanWarning.readOnlyController$SimpleBean"/>
</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="simpleReadOnlyUseFormBeanWarning.readOnlyController"/>
<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/webapps/drt/coreWeb/strutsMerge/test6/merge-jpf-struts-config.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/test/webapps/drt/coreWeb/strutsMerge/test6/merge-jpf-struts-config.xml?rev=289648&r1=289647&r2=289648&view=diff
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/coreWeb/strutsMerge/test6/merge-jpf-struts-config.xml (original)
+++ beehive/trunk/netui/test/webapps/drt/coreWeb/strutsMerge/test6/merge-jpf-struts-config.xml Fri Sep 16 13:27:57 2005
@@ -19,7 +19,7 @@
path="/jpfAction1">
<exception
type="strutsMerge.test6.Jpf1$Test1Exception"
- key=""
+ key="xxx"
handler="xHandler2">
<set-property value="true" property="isHandlerMethod"/>
</exception>