reinhard 2003/08/01 02:41:23
Modified: src/documentation/xdocs/userdocs book.xml index.xml
src/documentation/xdocs/userdocs/flow book.xml tutor.xml
src/webapp/samples samples.xml
src/webapp/samples/flow samples.xml
Log:
- first steps for consistent naming:
* use "Control Flow" for conceptual stuff
* use "Flowscript" for javascript flows
Revision Changes Path
1.4 +2 -2 cocoon-2.1/src/documentation/xdocs/userdocs/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/book.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- book.xml 25 Mar 2003 15:39:08 -0000 1.3
+++ book.xml 1 Aug 2003 09:41:23 -0000 1.4
@@ -23,8 +23,8 @@
<menu-item label="Readers" href="readers/readers.html"/>
</menu>
- <menu label="Flowscript">
- <menu-item label="Flowscript" href="flow/index.html"/>
+ <menu label="Control Flow">
+ <menu-item label="Control Flow" href="flow/index.html"/>
</menu>
<menu label="XSP">
1.5 +4 -2 cocoon-2.1/src/documentation/xdocs/userdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 28 Jul 2003 17:41:58 -0000 1.4
+++ index.xml 1 Aug 2003 09:41:23 -0000 1.5
@@ -24,8 +24,10 @@
look at the <link href="../developing/webapps/index.html">web
application documentation</link>.</p>
<p>
If you've been writing web applications with any other system you should
- also take a look at Cocoon <link href="flow/index.html">Flowscript</link>,
- which makes writing complex Web applications easy with Cocoon. Complex
multi-page interactions can be <link
href="flow/continuations.html">described</link> easily as blocking function
calls.
+ also take a look at Cocoon <link href="flow/index.html">Control
Flow</link>,
+ which makes writing complex Web applications easy with Cocoon. Complex
multi-page
+ interactions can be <link href="flow/continuations.html">described</link>
easily as
+ blocking function calls.
</p>
<p>
Come back often...this guide is being updated regularly.
1.11 +1 -1 cocoon-2.1/src/documentation/xdocs/userdocs/flow/book.xml
Index: book.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/book.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- book.xml 26 Jul 2003 19:29:08 -0000 1.10
+++ book.xml 1 Aug 2003 09:41:23 -0000 1.11
@@ -10,7 +10,7 @@
<menu-item label="User Documentation" href="../index.html"/>
</menu>
- <menu label="Flowscript">
+ <menu label="Control Flow">
<menu-item label="Introduction" href="index.html"/>
<menu-item label="Continuations" href="continuations.html"/>
<menu-item label="How does it work?" href="how-does-it-work.html"/>
1.4 +2 -2
cocoon-2.1/src/documentation/xdocs/userdocs/flow/tutor.xml
Index: tutor.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/tutor.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tutor.xml 30 Jul 2003 15:20:10 -0000 1.3
+++ tutor.xml 1 Aug 2003 09:41:23 -0000 1.4
@@ -10,9 +10,9 @@
</header>
<body>
- <s1 title="Tutorial: A Gentle Introduction to Flowscript">
+ <s1 title="Tutorial: A Gentle Introduction to Cocoon Control Flow">
<p>In this tutorial, we will create a simple number guessing game using
- Cocoon's Flowscript engine.</p>
+ Cocoon's Control Flow engine.</p>
<p>After you have Cocoon 2.1 deployed and running, go to where you have
Cocoon deployed and create a new subdirectory named
<code>game</code>.
Cocoon's default main sitemap will automatically mount the sitemap in
1.21 +16 -8 cocoon-2.1/src/webapp/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/samples.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- samples.xml 5 Jul 2003 14:46:14 -0000 1.20
+++ samples.xml 1 Aug 2003 09:41:23 -0000 1.21
@@ -40,6 +40,16 @@
them, into one document.
</sample>
</group>
+
+ <group name="Cocoon Control Flow">
+ <sample name="Examples" href="flow/">
+ Examples of Cocoon's control flow of Web pages.
+ </sample>
+ <note>
+ Since the Cocoon Control Flow is a core technology you find more examples
+ that make use of it e.g. the Petstore, JXForms and Woody block
+ </note>
+ </group>
<group name="Web Services and B2B">
<sample name="SOAP" href="soap/">
@@ -61,18 +71,13 @@
</sample>
</group>
- <group name="Flowscript">
- <sample name="Examples" href="flow/">
- Examples of Cocoon's control flow of Web pages.
- </sample>
- </group>
-
<group name="Extensible Server Pages">
<sample name="XSP" href="xsp/">
Extensible Server Pages.
</sample>
</group>
+ <!-- FIXME: (RP) Do we rellay want this examples on our top samples page?
<group name="Web Applications">
<sample name="Protected Area" href="protected/login">
An example web-application built around db-authenticator,
@@ -80,7 +85,9 @@
actions.
</sample>
</group>
+ -->
+ <!-- FIXME: (RP) Shouldn't be the paginator a block? -->
<group name="Paginator">
<sample name="List Pagination" href="paginator/list(1)">
Show the usage of the Paginator Transformer to paginate document based
on items count limit.
@@ -89,7 +96,8 @@
Show the usage of the Paginator Transformer to paginate document based
on characters count limit.
</sample>
</group>
-
+
+ <!-- FIXME: (RP) Shouldn't be the image reader a block? -->
<group name="ImageReader">
<sample name="Image" href="imagereader/image-0">
Image of original size
1.4 +2 -2 cocoon-2.1/src/webapp/samples/flow/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/webapp/samples/flow/samples.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- samples.xml 7 May 2003 04:57:13 -0000 1.3
+++ samples.xml 1 Aug 2003 09:41:23 -0000 1.4
@@ -10,7 +10,7 @@
</sample>
</group>
- <group name="Flowscript">
+ <group name="Cocoon Control Flow">
<sample name="Calculator" href="calc/">
A simple web-based calculator that uses javascript on the server side
to describe the web application flow between screens in a coherent
