You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by tc...@apache.org on 2004/03/23 20:29:02 UTC

cvs commit: cocoon-2.1/src/documentation/xdocs/userdocs/xsp logicsheet-forms.xml

tcurdt      2004/03/23 11:29:02

  Modified:    .        blocks.properties gump.xml status.xml
               lib      jars.xml
               src/documentation/xdocs/developing/webapps book.xml
               src/documentation/xdocs/faq index.xml
               src/documentation/xdocs/howto README.txt book.xml index.xml
               src/documentation/xdocs index.xml
               src/documentation/xdocs/plan changes-doc.xml
               src/documentation/xdocs/userdocs/concepts book.xml
                        validation.xml
               src/documentation/xdocs/userdocs/xsp logicsheet-forms.xml
  Log:
  removed xmlform and jxforms documentation and references
  
  Revision  Changes    Path
  1.67      +0 -2      cocoon-2.1/blocks.properties
  
  Index: blocks.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- blocks.properties	11 Mar 2004 14:12:08 -0000	1.66
  +++ blocks.properties	23 Mar 2004 19:29:01 -0000	1.67
  @@ -60,7 +60,6 @@
   #exclude.block.itext=true
   #exclude.block.jfor=true
   #exclude.block.jsp=true
  -#exclude.block.jxforms=true
   #exclude.block.linkrewriter=true
   #exclude.block.lucene=true
   #exclude.block.naming=true
  @@ -140,4 +139,3 @@
   # in favour of other blocks and therefore are excluded by default from the build
   
   exclude.block.woody=true
  -exclude.block.xmlform=true
  
  
  
  1.129     +1 -21     cocoon-2.1/gump.xml
  
  Index: gump.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/gump.xml,v
  retrieving revision 1.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- gump.xml	23 Mar 2004 13:22:16 -0000	1.128
  +++ gump.xml	23 Mar 2004 19:29:01 -0000	1.129
  @@ -850,26 +850,6 @@
       <nag from="Gump" to="dev@cocoon.apache.org"/>
     </project>
   
  -  <project name="cocoon-block-jxforms" status="stable">
  -    <package>org.apache.cocoon</package>
  -
  -    <ant target="gump-block">
  -      <property name="block-name" value="jxforms"/>
  -      <property name="version" value="@@DATE@@"/>
  -    </ant>
  -
  -    <depend project="cocoon" inherit="all"/>
  -
  -    <work nested="build/cocoon-@@DATE@@/blocks/jxforms/dest"/>
  -    <work nested="build/cocoon-@@DATE@@/blocks/jxforms/test"/>
  -    <work nested="tools/anttasks"/>
  -    <home nested="build/cocoon-@@DATE@@"/>
  -
  -    <jar name="blocks/jxforms-block.jar"/>
  -
  -    <nag from="Gump" to="dev@cocoon.apache.org"/>
  -  </project>
  -
     <project name="cocoon-block-petstore" status="unstable">
       <package>org.apache.cocoon</package>
   
  
  
  
  1.288     +8 -3      cocoon-2.1/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/status.xml,v
  retrieving revision 1.287
  retrieving revision 1.288
  diff -u -r1.287 -r1.288
  --- status.xml	23 Mar 2004 07:33:15 -0000	1.287
  +++ status.xml	23 Mar 2004 19:29:01 -0000	1.288
  @@ -1,4 +1,4 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0"?>
   <!--
     Copyright 1999-2004 The Apache Software Foundation
   
  @@ -212,7 +212,12 @@
     <changes>
   
    <release version="@version@" date="@date@">
  -    <action dev="AG" type="update">
  +   <action dev="TC" type="remove">
  +     Removed xmlform and jxforms blocks as confirmed by a users poll.
  +   </action>
  +   <action dev="TC" type="remove">
  +     Removed precept block. Was dead code.
  +   <action dev="AG" type="update">
        Updated jdtcore to 2.1.3, update castor-xml to 0.9.5.3
      </action>
      <action dev="CZ" type="fix" fixes-bug="27764" due-to="Corin Moss" due-to-email="cmoss@tvnz.co.nz">
  
  
  
  1.193     +2 -2      cocoon-2.1/lib/jars.xml
  
  Index: jars.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/lib/jars.xml,v
  retrieving revision 1.192
  retrieving revision 1.193
  diff -u -r1.192 -r1.193
  --- jars.xml	23 Mar 2004 07:33:15 -0000	1.192
  +++ jars.xml	23 Mar 2004 19:29:02 -0000	1.193
  @@ -651,7 +651,7 @@
     <file>
       <title>Jakarta Commons JXPath</title>
       <description>XPath interpreter. Work with JavaBeans and DOM nodes</description>
  -    <used-by>Flow, JXPath logicsheet, and XMLForm</used-by>
  +    <used-by>Flow, JXPath logicsheet</used-by>
       <lib>core/commons-jxpath-20030909.jar</lib>
       <homepage>http://jakarta.apache.org/commons/jxpath/</homepage>
     </file>
  
  
  
  1.7       +0 -1      cocoon-2.1/src/documentation/xdocs/developing/webapps/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/developing/webapps/book.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- book.xml	6 Mar 2004 02:26:11 -0000	1.6
  +++ book.xml	23 Mar 2004 19:29:02 -0000	1.7
  @@ -30,7 +30,6 @@
       <menu-item label="Session Contexts" href="contexts.html"/>
       <menu-item label="Authentication" href="authentication.html"/>
       <menu-item label="Simple Forms" href="forms.html"/>
  -    <menu-item label="Form Handling" href="../../userdocs/concepts/xmlform.html"/>
       <menu-item label="Portal FW" href="portal.html"/>
       <menu-item label="Portal Engine" href="../portal/index.html"/>
     </menu>
  
  
  
  1.3       +0 -1      cocoon-2.1/src/documentation/xdocs/faq/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/faq/index.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- index.xml	6 Mar 2004 02:25:57 -0000	1.2
  +++ index.xml	23 Mar 2004 19:29:02 -0000	1.3
  @@ -52,7 +52,6 @@
   <li><link href="faq-configure-c2.html">Configuring Cocoon</link></li>
   <li><link href="faq-databases.html">Databases</link></li>
   <li><link href="faq-xsp.html">XSP</link></li>
  -<!-- <li><link href="faq-xmlform.html">XMLForm</link></li> -->
   <li><link href="faq-xslt.html">XSLT</link></li>
   <li><link href="faq-debugging.html">Debugging</link></li>
   	</ul>
  
  
  
  1.2       +1 -2      cocoon-2.1/src/documentation/xdocs/howto/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/howto/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.txt	9 Mar 2003 00:07:57 -0000	1.1
  +++ README.txt	23 Mar 2004 19:29:02 -0000	1.2
  @@ -6,5 +6,4 @@
   Use hyphens between any words which follow "howto-". Please make sure your name will be sufficiently unique to distinguish it from future contributions. For example, if you are committing a how-to about Actions, don't name it howto-actions.xml. 
   
   Multi-page How-Tos
  -If you are adding in a multi-page How-To to this directory please create a subdirectory with the same name as the main page of your How-To, minus the beginning phrase "howto-" and the ending phrase ".xml". Add "-<step number>" within filenames for pages which represent additional How-To steps. See the xmlform-wizard How-To directory structure for more information.
  -
  +If you are adding in a multi-page How-To to this directory please create a subdirectory with the same name as the main page of your How-To, minus the beginning phrase "howto-" and the ending phrase ".xml". Add "-<step number>" within filenames for pages which represent additional How-To steps.
  
  
  
  1.6       +0 -3      cocoon-2.1/src/documentation/xdocs/howto/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/howto/book.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- book.xml	6 Mar 2004 02:25:33 -0000	1.5
  +++ book.xml	23 Mar 2004 19:29:02 -0000	1.6
  @@ -24,13 +24,10 @@
     </menu>
     <menu label="Using Cocoon">
       <menu-item label="Samples" href="howto-explore-samples.html"/>
  -    <menu-item label="XMLForm" href="xmlform-wizard/howto-xmlform-wizard.html"/>
       <menu-item label="Paginator" href="howto-paginator-transformer.html"/>
       <menu-item label="HTML-PDF" href="howto-html-pdf-publishing.html"/>
       <menu-item label="Web Syndication" href="../userdocs/generators/wsproxy-generator.html"/>    
  -    <menu-item label="i18n XMLForm" href="howto-i18n-xmlform.html"/>
       <menu-item label="Flow Debugger" href="howto-flow-debugger.html"/>
  -    <menu-item label="Xindice XMLForm" href="howto-xindice-xmlform.html"/>
     </menu>
     <menu label="Documentation">
       <menu-item label="Author How-To" href="howto-author-howto.html"/>
  
  
  
  1.5       +0 -3      cocoon-2.1/src/documentation/xdocs/howto/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/howto/index.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index.xml	6 Mar 2004 02:25:33 -0000	1.4
  +++ index.xml	23 Mar 2004 19:29:02 -0000	1.5
  @@ -42,12 +42,9 @@
             "forms" frameworks.</p>
   	<ul>
   <li><link href="howto-explore-samples.html">Exploring the samples</link></li>
  -<li><link href="xmlform-wizard/howto-xmlform-wizard.html">XMLForm Wizard</link></li>
   <li><link href="howto-paginator-transformer.html">Paginator Transformer</link></li>
   <li><link href="howto-html-pdf-publishing.html">HTML-PDF Publishing</link></li>
  -<li><link href="howto-i18n-xmlform.html">i18n XMLForm</link></li>
   <li><link href="howto-flow-debugger.html">Flow Debugger</link></li>
  -<li><link href="howto-xindice-xmlform.html">Xindice XMLForm</link></li>
   	</ul>
    </s2>
   
  
  
  
  1.14      +4 -15     cocoon-2.1/src/documentation/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/index.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- index.xml	6 Mar 2004 02:25:59 -0000	1.13
  +++ index.xml	23 Mar 2004 19:29:02 -0000	1.14
  @@ -28,21 +28,10 @@
   
       <figure src="images/cocoon.gif" alt="Cocoon"/>
      <s1 title="News">
  -    <note>
  -      <strong>Security warning</strong>: A major security hole has been found in XMLForm and JXForm that
  -      can allow forged requests to execute arbitrary Java code on the server. This affects Cocoon 2.1 only
  -      (not the 2.0.x versions).
  -      This hole has been fixed in the 2.1.1 release. If you use XMLForm or JXForms but don't want to move
  -      to this new release, we urge you to update the following source files and rebuild your Cocoon distribution:
  -    </note>
  -      <ul>
  -       <li>XMLForm - in <code>src/blocks/xmlform/java/org/apache/cocoon/components/xmlform</code>:
  -            update <link href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/blocks/xmlform/java/org/apache/cocoon/components/xmlform/Form.java?rev=1.6">Form.java</link>
  -       </li>
  -        <li>JXForms - in <code>src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/xmlform</code>:
  -            update <link href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/components/jxforms/xmlform/Form.java?rev=1.4">Form.java</link>
  -       </li>
  -      </ul>
  +     <p>
  +       XMLForm and JXForms have been removed from the 2.1.x distribution.
  +       Please use the well established Cocoon Forms (former Woody) framework.
  +     </p>
      </s1>
       <s1 title="What is Cocoon?">
         <p>
  
  
  
  1.7       +6 -2      cocoon-2.1/src/documentation/xdocs/plan/changes-doc.xml
  
  Index: changes-doc.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/plan/changes-doc.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- changes-doc.xml	6 Mar 2004 02:25:44 -0000	1.6
  +++ changes-doc.xml	23 Mar 2004 19:29:02 -0000	1.7
  @@ -24,11 +24,15 @@
       <!-- in strict alphabetical order -->
       <person name="Nicola Ken Barozzi" email="nicolaken@apache.org" id="NKB"/>
       <person name="David Crossley" email="crossley@apache.org" id="DC"/>
  +    <person name="Torsten Curdt" email="tcurdt@apache.org" id="TC"/>
       <person name="Bernhard Huber" email="huber@apache.org" id="BH"/>
       <person name="Ivelin Atanasoff Ivanov" email="ivelin@apache.org" id="IAI"/>
       <person name="Diana Shannon" email="shannon@apache.org" id="DS"/>
     </devs>
  -  <release version="2.1" date="August 12 2003">
  +  <release version="2.1" date="March 17 2004">
  +    <action dev="TC" type="remove">
  +      removed XMLForm and JXForms
  +    </action>
       <action dev="DS" type="add" due-to="Mohamed El-Refaey" due-to-email="m.refaey@imkenberg.de">
         New How-To:
         <link href="../howto/howto-i18n-xmlform.html">i18n within the XMLForm Framework</link>
  
  
  
  1.13      +0 -1      cocoon-2.1/src/documentation/xdocs/userdocs/concepts/book.xml
  
  Index: book.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/book.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- book.xml	6 Mar 2004 02:25:50 -0000	1.12
  +++ book.xml	23 Mar 2004 19:29:02 -0000	1.13
  @@ -37,7 +37,6 @@
       <menu-item label="Persistence" href="persistence.html"/>
       <menu-item label="StoreJanitor" href="storejanitor.html"/>
       <menu-item label="XMLSearching" href="xmlsearching.html"/>
  -    <menu-item label="XMLForm" href="xmlform.html"/>
       <menu-item label="XML Validation" href="validation.html"/>
       <menu-item label="Databases" href="databases.html"/>
       <menu-item label="Modules" href="modules.html"/>
  
  
  
  1.5       +0 -13     cocoon-2.1/src/documentation/xdocs/userdocs/concepts/validation.xml
  
  Index: validation.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/concepts/validation.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- validation.xml	6 Mar 2004 02:25:50 -0000	1.4
  +++ validation.xml	23 Mar 2004 19:29:02 -0000	1.5
  @@ -65,11 +65,6 @@
       then you can switch it off in
       <code>./properties.xml</code>
      </p>
  -   <p>
  -    There are also validation facilities in Cocoon XMLForm.
  -(FIXME: Find link to Ivelin's XMLForm documentation and other explanations
  -of its validation component.)
  -   </p>
   
     <s2 title="Build target validate-config">
      <p>
  @@ -122,14 +117,6 @@
      </p>
     </s2>
   
  -  <s2 title="XMLForm Validation">
  -   <p>
  -FIXME: Find links and javadocs.
  -   </p>
  -   <p>
  -Basic overview: <link href="xmlform.html">XMLForm Handling</link>
  -   </p>
  -  </s2>
    </s1>
   
    <s1 title="To Do">
  
  
  
  1.6       +2 -6      cocoon-2.1/src/documentation/xdocs/userdocs/xsp/logicsheet-forms.xml
  
  Index: logicsheet-forms.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/xdocs/userdocs/xsp/logicsheet-forms.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- logicsheet-forms.xml	6 Mar 2004 02:25:49 -0000	1.5
  +++ logicsheet-forms.xml	23 Mar 2004 19:29:02 -0000	1.6
  @@ -29,17 +29,13 @@
     <s1 title="Introduction">
   
      <p>
  -    For most web applications input is essential. Apache Cocoon provides a
  +    For most web applications input is essential. Apache Cocoon provides
       variety of modules to support basic interaction like simple syntax checking
       of input data or writing input data to databases.
      </p>
   
      <p>
  -    Two different packages deal with validating user input:<link
  -     href="../../howto/xmlform-wizard/howto-xmlform-wizard.html">XMLForm</link>
  -    which tries to stay as close as possible with the <link
  -     href="http://www.w3.org">W3C</link> <link
  -     href="http://www.w3.org/MarkUp/Forms/">XForms</link> working draft.
  +    A new but already very mature modules is the Cocoon Forms (former Woody) framework.
       Another, simpler and older implementation is the validation using the
       <code>FormValidatorAction</code>, which is described here.
      </p>