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/05/26 23:12:06 UTC
svn commit: r178690 - in /incubator/beehive/trunk:
netui/test/webapps/drt/testRecorder/tests/ netui/test/webapps/tomcat/
samples/netui-samples/ samples/netui-samples/WEB-INF/
samples/netui-samples/templateactions/shared/ samples/netui-samples/tiles/
samples/netui-samples/tiles/flow1/ samples/netui-samples/tiles/flow2/
samples/netui-samples/tiles/layout/ samples/netui-samples/tiles/shared/
Author: rich
Date: Thu May 26 14:12:03 2005
New Revision: 178690
URL: http://svn.apache.org/viewcvs?rev=178690&view=rev
Log:
Integ of revision 178679 from branches/v1/m1:
This is a contribution from Carlin Rogers: a Tiles/Page Flow sample (http://issues.apache.org/jira/browse/BEEHIVE-766)
tests: build.dist (WinXP)
BB, run.tests (linux)
Also, two fixes to test descriptions, and a fix to the Tomcat DRT app.
tests: drt in netui/test/webapps/tomcat (WinXP)
Added:
incubator/beehive/trunk/samples/netui-samples/WEB-INF/tiles-defs.xml (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/WEB-INF/tiles-defs.xml
incubator/beehive/trunk/samples/netui-samples/tiles/
- copied from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/
incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/MainFlow.java
incubator/beehive/trunk/samples/netui-samples/tiles/flow1/
- copied from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/
incubator/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/Flow1.java
incubator/beehive/trunk/samples/netui-samples/tiles/flow1/index.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/index.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/flow2/
- copied from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/
incubator/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/Flow2.java
incubator/beehive/trunk/samples/netui-samples/tiles/flow2/index.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/index.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/layout/
- copied from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/
incubator/beehive/trunk/samples/netui-samples/tiles/layout/body.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/body.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/layout/footer.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/footer.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/layout/header.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/header.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/layout/page.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/page.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/menu.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/menu.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/page1.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page1.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/page2.jsp (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page2.jsp
incubator/beehive/trunk/samples/netui-samples/tiles/shared/
- copied from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/shared/
incubator/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java (props changed)
- copied unchanged from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/shared/SharedFlow.java
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNested.xml
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNonNested.xml
incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
incubator/beehive/trunk/samples/netui-samples/index.jsp
incubator/beehive/trunk/samples/netui-samples/templateactions/shared/template.jsp
Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNested.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNested.xml?rev=178690&r1=178689&r2=178690&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNested.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNested.xml Thu May 26 14:12:03 2005
@@ -3,7 +3,7 @@
<ses:sessionName>BackButtonToNested</ses:sessionName>
<ses:tester>rich</ses:tester>
<ses:startDate>11 Feb 2005, 06:19:55.157 PM MST</ses:startDate>
- <ses:description>rich</ses:description>
+ <ses:description>Test of using the back button to go back from a nested page flow (B) to another nested page flow (A). Unless pageflow-renesting is enabled in netui-config.xml, the previous instance of A should be used; a new instance of A should not be created, and the page flow stack should not grow in size.</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -614,4 +614,4 @@
<ses:testCount>7</ses:testCount>
<ses:passedCount>6</ses:passedCount>
<ses:failedCount>1</ses:failedCount>
-</ses:recorderSession>
\ No newline at end of file
+</ses:recorderSession>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNonNested.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNonNested.xml?rev=178690&r1=178689&r2=178690&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNonNested.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/tests/BackButtonToNonNested.xml Thu May 26 14:12:03 2005
@@ -3,7 +3,7 @@
<ses:sessionName>BackButtonToNonNested</ses:sessionName>
<ses:tester>rich</ses:tester>
<ses:startDate>11 Feb 2005, 06:20:00.825 PM MST</ses:startDate>
- <ses:description>rich</ses:description>
+ <ses:description>Test of using the back button to go from a nested page flow to a non-nested page flow. The original non-nested page flow instance should be retrieved, not a new one.</ses:description>
<ses:tests>
<ses:test>
<ses:testNumber>1</ses:testNumber>
@@ -534,4 +534,4 @@
<ses:testCount>6</ses:testCount>
<ses:passedCount>2</ses:passedCount>
<ses:failedCount>4</ses:failedCount>
-</ses:recorderSession>
\ No newline at end of file
+</ses:recorderSession>
Modified: incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml?rev=178690&r1=178689&r2=178690&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/tomcat/build.xml Thu May 26 14:12:03 2005
@@ -80,17 +80,6 @@
</ant>
</target>
- <target name="drt" description="Run the drt suite with full server start / stop support." depends="clean,build">
- <ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false" target="server.test">
- <property name="app.build.file" location="${app.dir}/tomcat/build.xml"/>
- <property name="suite.name" value="drt"/>
- <property name="drt.mode" value="true"/>
- <property name="playback.webapps" value="${webapp.name}"/>
- <!-- Wait for the server's root url to see if the server has started -->
- <property name="waitfor.url" value="${server.root.url}"/>
- </ant>
- </target>
-
<target name="ensure.deployed" description="Deploy webapp">
<echo>ensure.deployed is NYI</echo>
</target>
Copied: incubator/beehive/trunk/samples/netui-samples/WEB-INF/tiles-defs.xml (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/WEB-INF/tiles-defs.xml)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/WEB-INF/tiles-defs.xml?p2=incubator/beehive/trunk/samples/netui-samples/WEB-INF/tiles-defs.xml&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/WEB-INF/tiles-defs.xml&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/WEB-INF/tiles-defs.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/samples/netui-samples/index.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/index.jsp?rev=178690&r1=178689&r2=178690&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/index.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/index.jsp Thu May 26 14:12:03 2005
@@ -64,6 +64,10 @@
template that contains a menu bar).</dd>
</dl>
<dl>
+ <dt><netui:anchor href="tiles/MainFlow.jpf" value="Tiles"/></dt>
+ <dd>Demonstrates the use of tiles with page flows.</dd>
+ </dl>
+ <dl>
<dt><netui:anchor href="validation/Controller.jpf" value="Validation"/></dt>
<dd>This sample demonstrates Page Flow declarative field validation.</dd>
</dl>
Modified: incubator/beehive/trunk/samples/netui-samples/templateactions/shared/template.jsp
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/templateactions/shared/template.jsp?rev=178690&r1=178689&r2=178690&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/netui-samples/templateactions/shared/template.jsp (original)
+++ incubator/beehive/trunk/samples/netui-samples/templateactions/shared/template.jsp Thu May 26 14:12:03 2005
@@ -97,6 +97,7 @@
So, the pages refer to /templateactions/shared/template.jsp for the UI, and the page flows
refer to ${sharedFlow.templateSharedFlow.class.name} for the actions.
</td>
+ </tr>
</table>
</td>
</tr>
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/MainFlow.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java?p2=incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/MainFlow.java&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/MainFlow.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/Flow1.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java?p2=incubator/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/Flow1.java&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/flow1/Flow1.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/flow1/index.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/index.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/flow1/index.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/flow1/index.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow1/index.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/flow1/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/Flow2.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java?p2=incubator/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/Flow2.java&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/flow2/Flow2.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/flow2/index.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/index.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/flow2/index.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/flow2/index.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/flow2/index.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/flow2/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/layout/body.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/body.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/layout/body.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/layout/body.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/body.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/layout/body.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/layout/footer.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/footer.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/layout/footer.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/layout/footer.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/footer.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/layout/footer.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/layout/header.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/header.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/layout/header.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/layout/header.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/header.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/layout/header.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/layout/page.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/page.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/layout/page.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/layout/page.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/layout/page.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/layout/page.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/menu.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/menu.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/menu.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/menu.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/menu.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/menu.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/page1.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page1.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/page1.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/page1.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page1.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/page1.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/page2.jsp (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page2.jsp)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/page2.jsp?p2=incubator/beehive/trunk/samples/netui-samples/tiles/page2.jsp&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/page2.jsp&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/page2.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java (from r178679, incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/shared/SharedFlow.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java?p2=incubator/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java&p1=incubator/beehive/branches/v1/m1/samples/netui-samples/tiles/shared/SharedFlow.java&r1=178679&r2=178690&rev=178690&view=diff
==============================================================================
(empty)
Propchange: incubator/beehive/trunk/samples/netui-samples/tiles/shared/SharedFlow.java
------------------------------------------------------------------------------
svn:eol-style = native