cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/flow woody.xml
Date Wed, 28 Jan 2004 19:14:24 GMT
vgritsenko    2004/01/28 11:14:24

  Modified:    .        status.xml
               src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript
                        woody2.js
               src/documentation/xdocs/userdocs/flow woody.xml
  Removed:     src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript
                        woody.js
  Log:
  Remove woody.js
  
  Revision  Changes    Path
  1.230     +4 -1      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- status.xml	27 Jan 2004 16:11:36 -0000	1.229
  +++ status.xml	28 Jan 2004 19:14:23 -0000	1.230
  @@ -196,6 +196,9 @@
     <changes>
   
    <release version="@version@" date="@date@">
  +   <action dev="VG" type="remove">
  +     woody.js has been removed. Please use woody2.js instead.
  +   </action>
      <action dev="UH" type="update" fixes-bug="25356">
        Resurrected the Slide block and made it to work with current developement version
        of Slide (2.0-b1). Complete revamping of the Slide sample admin app.
  
  
  
  1.7       +2 -3      cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript/woody2.js
  
  Index: woody2.js
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/flow/javascript/woody2.js,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- woody2.js	22 Jan 2004 13:19:17 -0000	1.6
  +++ woody2.js	28 Jan 2004 19:14:23 -0000	1.7
  @@ -49,8 +49,7 @@
   */
   
   /**
  - * New implementation of the Woody/FlowScript integration. Should replace
  - * woody.js in the future.
  + * Implementation of the Woody/FlowScript integration.
    *
    * @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
    * @version CVS $Id$
  
  
  
  1.8       +16 -11    cocoon-2.1/src/documentation/xdocs/userdocs/flow/woody.xml
  
  Index: woody.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/flow/woody.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- woody.xml	12 Oct 2003 13:04:48 -0000	1.7
  +++ woody.xml	28 Jan 2004 19:14:23 -0000	1.8
  @@ -1,5 +1,6 @@
   <?xml version='1.0' encoding='ISO-8859-1'?>
   <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN" "../../dtd/document-v10.dtd">
  +
   <document>
    <header>
     <title>Advanced Control Flow</title> 
  @@ -10,15 +11,15 @@
    </header>
    <body>
     <s1 title="Woody">
  -   <p><link href="http://wiki.cocoondev.org/Wiki.jsp?page=Woody">Woody</link>
is another form framework 
  -     that can be used in your Flowscripts.</p>
  +   <p><link href="http://wiki.cocoondev.org/Wiki.jsp?page=Woody">Woody</link>
is
  +     another form framework that can be used in your Flowscripts.</p>
      <note>
  -     Woody is marked as "unstable" block because it is under development!
  +     Woody is marked as "unstable" block because it is under active development!
      </note>
  -<p>Here is an example:</p>
  -<source><![CDATA[
   
  -cocoon.load("resource://org/apache/cocoon/woody/flow/javascript/woody.js");
  +   <p>Here is an example:</p>
  +   <source><![CDATA[
  +cocoon.load("resource://org/apache/cocoon/woody/flow/javascript/woody2.js");
   
   function form1(form) {
       var model = form.getModel();
  @@ -57,9 +58,9 @@
       });
       sendPage("form1-success-pipeline");
       form.finish();
  -
   }
  -]]></source>
  +   ]]></source>
  +
       <p>
       </p>
       <s2 title ="The woody function"><anchor id="woody"/>
  @@ -67,8 +68,8 @@
         <p>
         <em>Function</em> <code>woody(form_function, form_definition)</code>
         </p>
  -      <p>  You call the 
  -<code>woody</code> function from your sitemap to create a new form, for example:</p>
  +      <p>You call the <code>woody</code> function from your sitemap to
create a
  +        new form, for example:</p>
   <source><![CDATA[
   
      <map:match pattern="form1.flow">
  @@ -78,6 +79,7 @@
              </map:call>
        </map:match>
   ]]></source>
  +
   <p>
   The <code>function</code> parameter specifies the name of a JavaScript function
that will 
   provide the form's flow. The <code>form-definition</code> parameter specifies
the 
  @@ -85,7 +87,10 @@
   be called with one parameter, the newly created form.
         </p>
     <p>
  -  To use Woody in a Flowscript you must load <code>woody.js</code> into your
script and define a function that takes one argument (<code>form1</code> in the
example at the top of this page). The argument passed to your function will be a JavaScript
representation of your Woody form.
  +  To use Woody in a Flowscript you must load <code>woody2.js</code> into your
script
  +  and define a function that takes one argument (<code>form1</code> in the
example at
  +  the top of this page). The argument passed to your function will be a JavaScript
  +  representation of your Woody form.
     </p>
    </s2>
    <s2 title="Form Object">
  
  
  

Mime
View raw message