pier 2003/03/08 14:45:34
Modified: . build.sh
legal LICENSE.commons-discovery
LICENSE.jakarta-commons-logging
src/blocks/linkrewriter/samples/bookdemo/docs book.xml
src/documentation/xdocs book.xml bylaws-addendum.xml
contrib.xml
src/documentation/xdocs/drafts cocoon2-docbook.xml
src/documentation/xdocs/faq faq-sitemap.xml
src/documentation/xdocs/howto howto-author-core-docs.xml
howto-author-faq.xml howto-author-howto.xml
howto-author-snippet.xml howto-flow-debugger.xml
howto-patch.xml
src/documentation/xdocs/installing index.xml
src/documentation/xdocs/plan catalog.xml
src/documentation/xdocs/userdocs/concepts index.xml
sitemap.xml validation.xml
src/documentation/xdocs/userdocs/serializers
xls-serializer.xml
src/java/org/apache/cocoon/acting AbstractXMLFormAction.java
src/samples/org/apache/cocoon/samples/xmlform
UsageFeedbackAction.java WizardAction.java
src/webapp/samples/webserviceproxy/cocoonhive/stylesheets
page2html.xsl
Log:
Documentation update step one. Whatever is in HEAD of "xml-cocoon2" should
refer to "cocoon-2.1" as its CVS repository.
Revision Changes Path
1.17 +1 -1 xml-cocoon2/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.sh,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.sh 25 Oct 2002 00:43:27 -0000 1.16
+++ build.sh 8 Mar 2003 22:45:32 -0000 1.17
@@ -17,7 +17,7 @@
export CP
unset CLASSPATH
-$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger -emacs $@
+$PWD/tools/bin/ant -logger org.apache.tools.ant.NoBannerLogger $@
CLASSPATH=$CP
export CLASSPATH
1.2 +1 -7 xml-cocoon2/legal/LICENSE.commons-discovery
Index: LICENSE.commons-discovery
===================================================================
RCS file: /home/cvs/xml-cocoon2/legal/LICENSE.commons-discovery,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.commons-discovery 26 Feb 2003 15:40:05 -0000 1.1
+++ LICENSE.commons-discovery 8 Mar 2003 22:45:32 -0000 1.2
@@ -1,10 +1,4 @@
/*
- * $Header$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
@@ -57,4 +51,4 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
- */
\ No newline at end of file
+ */
1.2 +0 -6 xml-cocoon2/legal/LICENSE.jakarta-commons-logging
Index: LICENSE.jakarta-commons-logging
===================================================================
RCS file: /home/cvs/xml-cocoon2/legal/LICENSE.jakarta-commons-logging,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.jakarta-commons-logging 15 Mar 2002 11:55:23 -0000 1.1
+++ LICENSE.jakarta-commons-logging 8 Mar 2003 22:45:32 -0000 1.2
@@ -1,10 +1,4 @@
/*
- * $Header$
- * $Revision$
- * $Date$
- *
- * ====================================================================
- *
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2001 The Apache Software Foundation. All rights
1.4 +2 -2
xml-cocoon2/src/blocks/linkrewriter/samples/bookdemo/docs/book.xml
Index: book.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/blocks/linkrewriter/samples/bookdemo/docs/book.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- book.xml 27 Feb 2003 16:00:34 -0000 1.3
+++ book.xml 8 Mar 2003 22:45:32 -0000 1.4
@@ -44,8 +44,8 @@
<menu label="Project">
<external label="Bug Database"
href="http://nagoya.apache.org/bugzilla/index.html"/>
- <external label="Code Repository"
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/"/>
- <external label="Dev Snapshots"
href="http://xml.apache.org/from-cvs/xml-cocoon2/"/>
+ <external label="Code Repository"
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/"/>
+ <external label="Dev Snapshots"
href="http://xml.apache.org/from-cvs/cocoon-2.1/"/>
</menu>
<menu label="Links">
1.20 +2 -2 xml-cocoon2/src/documentation/xdocs/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/book.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- book.xml 27 Feb 2003 16:00:33 -0000 1.19
+++ book.xml 8 Mar 2003 22:45:32 -0000 1.20
@@ -44,8 +44,8 @@
<menu label="Project">
<external label="Bug Database"
href="http://nagoya.apache.org/bugzilla/index.html"/>
- <external label="Code Repository"
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/"/>
- <external label="Dev Snapshots"
href="http://xml.apache.org/from-cvs/xml-cocoon2/"/>
+ <external label="Code Repository"
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/"/>
+ <external label="Dev Snapshots"
href="http://xml.apache.org/from-cvs/cocoon-2.1/"/>
</menu>
<menu label="Links">
1.2 +10 -26 xml-cocoon2/src/documentation/xdocs/bylaws-addendum.xml
Index: bylaws-addendum.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/bylaws-addendum.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bylaws-addendum.xml 27 Aug 2002 20:59:41 -0000 1.1
+++ bylaws-addendum.xml 8 Mar 2003 22:45:32 -0000 1.2
@@ -28,7 +28,7 @@
<ul>
<li>[EMAIL PROTECTED] mailing list</li>
<li>bugzilla</li>
- <li>xml-cocoon CVS access</li>
+ <li>cocoon-.* modules CVS access</li>
</ul>
</s3>
<s3 title="Reference mailing list">
@@ -36,35 +36,19 @@
</s3>
</s2>
- <s2 title="Community: cocoon-apps">
- <s3 title="Goal">
- <p>Create, organize and maintain applications based on
Cocoon.</p>
- </s3>
- <s3 title="Specific Resources">
- <ul>
- <li>xml-cocoon-apps CVS access</li>
- <li>bugzilla</li>
- </ul>
- </s3>
- <s3 title="Reference mailing list">
- <p>[EMAIL PROTECTED]</p>
- </s3>
- </s2>
-
</s1>
<s1 title="Repositories">
<p>The Xml.Apache Cocoon Sub-project has the following CVS
repositories.</p>
- <s2 title="xml-cocoon2">
- <p>The repository containing the Cocoon program source
code.</p>
+ <s2 title="cocoon-2.0">
+ <p>The repository containing the Cocoon 2.0.x program
source code.</p>
</s2>
- <s2 title="xml-cocoon-apps">
- <p>The repository containing the applications managed
by the
- cocoon-apps child comminuty.</p>
- </s2>
-
- <note>xml-cocoon is the 1.x branch repository, kept only for
history</note>
- </s1>
+ <s2 title="cocoon-2.1">
+ <p>The repository containing the Cocoon 2.1.x program
source code.</p>
+ </s2>
+
+ <note>cocoon-1 the 1.x branch repository, kept only for
history</note>
+ </s1>
</body>
-</document>
\ No newline at end of file
+</document>
1.10 +10 -10 xml-cocoon2/src/documentation/xdocs/contrib.xml
Index: contrib.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/contrib.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- contrib.xml 7 Jul 2002 06:49:32 -0000 1.9
+++ contrib.xml 8 Mar 2003 22:45:32 -0000 1.10
@@ -34,10 +34,10 @@
</p>
<p>You can get your local working copy of the
- <link href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/";>latest and
- greatest code</link> (which you find in the xml-cocoon2 module in
+ <link href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>latest and
+ greatest code</link> (which you find in the cocoon-2.1 module in
the cvs.apache.org CVS code repository, or from the
- <link href="http://xml.apache.org/from-cvs/xml-cocoon2/";>CVS snapshots</link>).
+ <link href="http://xml.apache.org/from-cvs/cocoon-2.1/";>CVS snapshots</link>).
Review the <link href="todo.html">todo</link> list, choose a task
(or perhaps you have noticed something that needs patching). Make the
changes, do the testing, generate a patch, if you need then discuss it on
@@ -213,16 +213,16 @@
<p>
This will checkout the current copy of the master cvs repository and
download it to your local disk. It will create a sub-directory called
- <code>xml-cocoon2</code>
+ <code>cocoon-2.1</code>
</p>
<ol>
<li><code>cd /usr/local/cvs</code></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li>
<li>... use this password: <code>anoncvs</code></li>
- <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout
xml-cocoon2</code></li>
+ <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout
cocoon-2.1</code></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li>
- <li><code>cd xml-cocoon2</code></li>
+ <li><code>cd cocoon-2.1</code></li>
</ol>
<p>
@@ -248,7 +248,7 @@
<ol>
<li><code>cd /usr/local/cvs</code></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li>
- <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic update -d -P
xml-cocoon2</code></li>
+ <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic update -d -P
cocoon-2.1</code></li>
<li><strong>... pay attention to the update messages</strong></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li>
</ol>
@@ -274,7 +274,7 @@
<ol>
<li>Make the desired changes in your local repository, build, test it
thoroughly</li>
- <li><code>cd /usr/local/cvs/xml-cocoon2/xdocs</code></li>
+ <li><code>cd /usr/local/cvs/cocoon-2.1/xdocs</code></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login</code></li>
<li><code>cvs diff -u contrib.xml > $WORK/cocoon/contrib.xml.diff</code></li>
<li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic logout</code></li>
@@ -285,13 +285,13 @@
<p>OK that got the HEAD branch of CVS into your local working copy.
If you want some other branch, then find the relevant branch name
from ViewCVS
- <link
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/";>http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/</link>
(see the Tags list at the bottom).
+ <link
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/</link>
(see the Tags list at the bottom).
Then follow the same checkout procedure described above, using this ...
</p>
<ul>
<li><code>cd /usr/local/cvs/cocoon_some_branch</code></li>
- <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout -r
cocoon_2_0_3_branch xml-cocoon2</code></li>
+ <li><code>cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic checkout
cocoon-2.0</code></li>
</ul>
</s2>
</s1>
1.2 +0 -20 xml-cocoon2/src/documentation/xdocs/drafts/cocoon2-docbook.xml
Index: cocoon2-docbook.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/drafts/cocoon2-docbook.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cocoon2-docbook.xml 3 Jan 2002 12:31:03 -0000 1.1
+++ cocoon2-docbook.xml 8 Mar 2003 22:45:32 -0000 1.2
@@ -501,25 +501,5 @@
</para>
</sect1>
-<sect1>
-<title>Development Status</title>
- <para>
- Cocoon2 development already started, but should be considered of pre-alpha
- quality. If you dare, you might take a look at it on the
- <emphasis>xml-cocoon2</emphasis> CVS branch in the Cocoon CVS module, or,
- if you are not a CVS expert, this means typing:
- </para>
-
- <para>
- <command>
- cvs checkout -r xml-cocoon2 xml-cocoon
- </command>
- </para>
-
- <para>
- For more information on CVS access, refer to the CVS-howtos on this web
- site.
- </para>
-</sect1>
</chapter>
</book>
1.10 +1 -1 xml-cocoon2/src/documentation/xdocs/faq/faq-sitemap.xml
Index: faq-sitemap.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/faq/faq-sitemap.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- faq-sitemap.xml 12 Dec 2002 08:08:45 -0000 1.9
+++ faq-sitemap.xml 8 Mar 2003 22:45:33 -0000 1.10
@@ -274,7 +274,7 @@
Learn more about advanced Sitemap features by downloading the free chapter, <link
href="http://www.newriders.com/books/product.asp?product_id={C3C05052-BE3B-4E06-A60A-13FB40AF58F6}";
>A User's Look at the Cocoon architecture,</link> from Langham and Ziegeler's
<em>Cocoon: Building XML Applications</em> available at the New Riders web site.
</p>
<p>
-Check out a draft XML Schema <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain";>grammar
for the Cocoon sitemap</link>, and some <link
href="http://outerthought.net/sitemap/";>external documentation</link> generated from
this Schema. A poster diagram of the sitemap structure is also available.
+Check out a draft XML Schema <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain";>grammar
for the Cocoon sitemap</link>, and some <link
href="http://outerthought.net/sitemap/";>external documentation</link> generated from
this Schema. A poster diagram of the sitemap structure is also available.
</p>
</answer>
</faq>
1.2 +2 -2
xml-cocoon2/src/documentation/xdocs/howto/howto-author-core-docs.xml
Index: howto-author-core-docs.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-author-core-docs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- howto-author-core-docs.xml 3 Jul 2002 20:25:10 -0000 1.1
+++ howto-author-core-docs.xml 8 Mar 2003 22:45:33 -0000 1.2
@@ -62,7 +62,7 @@
<s2 title="4. Do the work" >
<p>
-Perhaps the easiest way to start a new document is to use an existing document as a
template. If you are revising an existing document, make sure you are using the most
recent copy of the document from CVS HEAD. If you aren't working with a local CVS
repository, you can access all CVS files through <link
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/";>ViewCVS</link>.
+Perhaps the easiest way to start a new document is to use an existing document as a
template. If you are revising an existing document, make sure you are using the most
recent copy of the document from CVS HEAD. If you aren't working with a local CVS
repository, you can access all CVS files through <link
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>ViewCVS</link>.
</p>
</s2>
@@ -92,7 +92,7 @@
<s2 title="9. Update any related pages" >
<p>
-If your work impacts the content of other files, for example the menu file (known
as book.xml), consider updating these documents as well. You can validate and check
link targets within all your documents by performing a docs build. If you have a
working copy of the cvs HEAD, run the appropriate build script inside the xml-cocoon2
directory, specifying docs as the build target. Here's an example:
+If your work impacts the content of other files, for example the menu file (known
as book.xml), consider updating these documents as well. You can validate and check
link targets within all your documents by performing a docs build. If you have a
working copy of the cvs HEAD, run the appropriate build script inside the cocoon-2.1
directory, specifying docs as the build target. Here's an example:
</p>
<source>
./build.[sh|bat] docs
1.5 +2 -2 xml-cocoon2/src/documentation/xdocs/howto/howto-author-faq.xml
Index: howto-author-faq.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-author-faq.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- howto-author-faq.xml 6 Jun 2002 16:59:35 -0000 1.4
+++ howto-author-faq.xml 8 Mar 2003 22:45:33 -0000 1.5
@@ -54,7 +54,7 @@
FAQs source files are organized in sets of XML files based on separate Cocoon
topics. You will find all FAQ files in src/documentation/xdocs/faq/. Select the faq
topic file most related to your question. If you can't find a related topic for your
question, then create a new FAQ file by copying an existing file, editing it, and
saving it with new filename based on the new topic.
</p>
<p>
-If you plan to edit an existing file, make sure you are working with the most
recent version. The Cocoon project's cvs stores documentation files in multiple
branches. The HEAD and release branches should be in sync for documentation. However,
should there be some unintentional discrepancy, the HEAD branch is more likely to
contain the most recently updated files. If you have a checked-out version of the cvs
HEAD branch, make sure to run a cvs update before beginning your work on any specific
file. If you don't have the cvs HEAD branch, you can obtain a list of <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/faq/";>all
current FAQ files</link> through browser-based ViewCVS.
+If you plan to edit an existing file, make sure you are working with the most
recent version. The Cocoon project's cvs stores documentation files in multiple
branches. The HEAD and release branches should be in sync for documentation. However,
should there be some unintentional discrepancy, the HEAD branch is more likely to
contain the most recently updated files. If you have a checked-out version of the cvs
HEAD branch, make sure to run a cvs update before beginning your work on any specific
file. If you don't have the cvs HEAD branch, you can obtain a list of <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/documentation/xdocs/faq/";>all
current FAQ files</link> through browser-based ViewCVS.
</p>
</s2>
@@ -98,7 +98,7 @@
<s2 title="8. Update any related pages" >
<p>
-If you are contributing a new FAQ file, it will help committers if you also edit
the FAQ main (index.xml) and menu (book.xml) files found at
src/documentation/xdocs/faq/ to include links to your new FAQ file. You can validate
these files with their corresponding dtds as specified in their DOCTYPE statements. If
you have a working copy of the cvs HEAD, make sure you check this additional work by
performing a docs build. To do this, run the appropriate build script inside the
xml-cocoon2 directory, specifying docs as the build target. A docs build not only
validates your files but also checks for broken links.</p>
+If you are contributing a new FAQ file, it will help committers if you also edit
the FAQ main (index.xml) and menu (book.xml) files found at
src/documentation/xdocs/faq/ to include links to your new FAQ file. You can validate
these files with their corresponding dtds as specified in their DOCTYPE statements. If
you have a working copy of the cvs HEAD, make sure you check this additional work by
performing a docs build. To do this, run the appropriate build script inside the
cocoon-2.1 directory, specifying docs as the build target. A docs build not only
validates your files but also checks for broken links.</p>
</s2>
1.6 +1 -1 xml-cocoon2/src/documentation/xdocs/howto/howto-author-howto.xml
Index: howto-author-howto.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-author-howto.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- howto-author-howto.xml 3 Jul 2002 20:29:10 -0000 1.5
+++ howto-author-howto.xml 8 Mar 2003 22:45:33 -0000 1.6
@@ -130,7 +130,7 @@
<s2 title="14. Update any related pages" >
<p>
-It would help committers if you also edited the How-To main (index.xml) and menu
(book.xml) files found at src/documentation/xdocs/howto/ to include links to your new
How-To. You can validate these files with their corresponding dtds as specified in
their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you
check this additional work by performing a docs build. To do this, run the appropriate
build script inside the xml-cocoon2 directory, specifying docs as the build target. A
docs build not only validates your files but also checks for broken links.</p>
+It would help committers if you also edited the How-To main (index.xml) and menu
(book.xml) files found at src/documentation/xdocs/howto/ to include links to your new
How-To. You can validate these files with their corresponding dtds as specified in
their DOCTYPE statements. If you have a working copy of the cvs HEAD, make sure you
check this additional work by performing a docs build. To do this, run the appropriate
build script inside the cocoon-2.1 directory, specifying docs as the build target. A
docs build not only validates your files but also checks for broken links.</p>
</s2>
<s2 title="15. Prepare any related patches" >
1.2 +1 -1
xml-cocoon2/src/documentation/xdocs/howto/howto-author-snippet.xml
Index: howto-author-snippet.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-author-snippet.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- howto-author-snippet.xml 6 Jun 2002 16:57:55 -0000 1.1
+++ howto-author-snippet.xml 8 Mar 2003 22:45:33 -0000 1.2
@@ -99,7 +99,7 @@
<s2 title="9. Update any related pages" >
<p>
-If you are contributing a new Code Snippet file, it will help committers if you
also edit the Code Snippet main (index.xml) and menu (book.xml) files found at
src/documentation/xdocs/snippet/ to include links to your new Snippet file. You can
validate these files with their corresponding dtds as specified in their DOCTYPE
statements. If you have a working copy of the cvs, make sure you check this additional
work by performing a docs build. To do this, run the appropriate build script inside
the xml-cocoon2 directory, specifying docs as the build target. A docs build not only
validates your files but also checks for broken links.
+If you are contributing a new Code Snippet file, it will help committers if you
also edit the Code Snippet main (index.xml) and menu (book.xml) files found at
src/documentation/xdocs/snippet/ to include links to your new Snippet file. You can
validate these files with their corresponding dtds as specified in their DOCTYPE
statements. If you have a working copy of the cvs, make sure you check this additional
work by performing a docs build. To do this, run the appropriate build script inside
the cocoon-2.1 directory, specifying docs as the build target. A docs build not only
validates your files but also checks for broken links.
</p>
</s2>
1.4 +2 -2
xml-cocoon2/src/documentation/xdocs/howto/howto-flow-debugger.xml
Index: howto-flow-debugger.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-flow-debugger.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- howto-flow-debugger.xml 14 Jan 2003 15:42:54 -0000 1.3
+++ howto-flow-debugger.xml 8 Mar 2003 22:45:33 -0000 1.4
@@ -34,7 +34,7 @@
</s1>
<s1 title="Prerequisites">
<p>
- Until Cocoon 2.1 is released, to use the flow debugger you will need a
CVS <link href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/";>version</link> or
development <link href="http://xml.apache.org/from-cvs/xml-cocoon2/";>snapshot</link>
of Cocoon, at least as recent as 7th December 2002.
+ Until Cocoon 2.1 is released, to use the flow debugger you will need a
CVS <link href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/";>version</link> or
development <link href="http://xml.apache.org/from-cvs/cocoon-2.1/";>snapshot</link> of
Cocoon, at least as recent as 7th December 2002.
</p>
<p>
You will also need a JavaScript flow based web application, for
example the flow webapp samples that are currently shipped with Cocoon, and you will
need to be running Cocoon on a server that has a display attached (either local or
remote).
@@ -88,7 +88,7 @@
<p>
Once your application is running and awaiting requests, attempt to
access a page that calls a flow function. The invocation will take longer than normal,
but on your server's display you should see the visual debugger being created and
populated with your flow script.
</p>
- <note>Portions of Cocoon's flow script management <link
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/system.js?rev=HEAD&content-type=text/vnd.viewcvs-markup";>code</link>
will also be viewable in the debugger.</note>
+ <note>Portions of Cocoon's flow script management <link
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/system.js?rev=HEAD&content-type=text/vnd.viewcvs-markup";>code</link>
will also be viewable in the debugger.</note>
<p>
A debugger instance is created per JavaScript interpreter. This
means if you make another request to a different sitemap for example, a new debugger
instance will be created alongside the previous one. This allows you to debug flow
scripts locally to the sitemap they are defined in.
</p>
1.3 +3 -3 xml-cocoon2/src/documentation/xdocs/howto/howto-patch.xml
Index: howto-patch.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/howto/howto-patch.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- howto-patch.xml 7 Jul 2002 05:20:09 -0000 1.2
+++ howto-patch.xml 8 Mar 2003 22:45:33 -0000 1.3
@@ -48,7 +48,7 @@
<ul>
<li>The source code of the documents as a local working copy of the CVS
repository. If you are working with the current CVS HEAD then you will
-have already done a <code>'cvs checkout xml-cocoon2'</code>
+have already done a <code>'cvs checkout cocoon-2.1'</code>
(see <link href="../contrib.html#cvshowto">CVS Usage Precis</link>).
However, see below for other ways of obtaining source for diff comparison.
</li>
@@ -80,7 +80,7 @@
<source><![CDATA[
Index: contrib.xml
===================================================================
-RCS file: /home/cvspublic/xml-cocoon2/src/documentation/xdocs/contrib.xml,v
+RCS file: /home/cvspublic/cocoon-2.1/src/documentation/xdocs/contrib.xml,v
retrieving revision 1.7
diff -u -r1.7 contrib.xml
--- contrib.xml 30 Apr 2002 07:44:52 -0000 1.7
@@ -225,7 +225,7 @@
the steps ...
</p>
<ul>
-<li>get the <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/contrib.xml?rev=HEAD&content-type=text/xml";>relevant
XML file via ViewCVS</link></li>
+<li>get the <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/documentation/xdocs/contrib.xml?rev=HEAD&content-type=text/xml";>relevant
XML file via ViewCVS</link></li>
<li>save the file to your local disk: <code>./contrib.xml.orig</code></li>
<li>create a copy of the file: <code>./contrib.xml</code></li>
<li>make your modifications and validate the XML</li>
1.36 +11 -11 xml-cocoon2/src/documentation/xdocs/installing/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/index.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- index.xml 27 Feb 2003 16:00:30 -0000 1.35
+++ index.xml 8 Mar 2003 22:45:33 -0000 1.36
@@ -59,7 +59,7 @@
<s2 title="Download a development snapshot">
<p>
You also can download one of the development snapshots from the
- <link href="http://xml.apache.org/from-cvs/xml-cocoon2/";>CVS
snapshots</link>
+ <link href="http://xml.apache.org/from-cvs/cocoon-2.1/";>CVS snapshots</link>
directory.
</p>
</s2>
@@ -83,7 +83,7 @@
<li>Click admin->login;</li>
<li> When asked for the password: answer "anoncvs" (without quotes);</li>
<li> Click "create->checkout module";</li>
- <li>Module name and path on the server is "xml-cocoon2" (no quotes);</li>
+ <li>Module name and path on the server is "cocoon-2.1" (no quotes);</li>
<li>Choose a dir to put the source code in;</li>
<li>Go to the "Checkout-options" tab and select "By revision/tag/branch"
and enter "HEAD";</li>
@@ -101,13 +101,13 @@
<li>Enter "cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic login".</li>
<li>When asked for the password: answer "anoncvs".</li>
<li>Enter "cvs -d :pserver:[EMAIL PROTECTED]:/home/cvspublic -z3 checkout
- -r HEAD xml-cocoon2". This will create a directory called "xml-cocoon2"
where the
+ -r HEAD cocoon-2.1". This will create a directory called "cocoon-2.1"
where the
Cocoon2 source will be stored.</li>
<li>Wait until cvs has finished.</li>
<li>The Cocoon source is now on your harddrive.</li>
</ol>
<p>In case you want to update your Cocoon source tree to the
- current version, change to the "xml-cocoon2" directory and
+ current version, change to the "cocoon-2.1" directory and
call "cvs -z3 update -d -P".</p>
</s2>
</s1>
@@ -814,7 +814,7 @@
</li>
<li>
- Copy <code>xml-cocoon2/build/cocoon/cocoon.war</code> into
+ Copy <code>cocoon-2.1/build/cocoon/cocoon.war</code> into
<code>tomcat/webapps</code> directory.
</li>
@@ -934,7 +934,7 @@
Use <code>Configure a new Web Application...</code>,
and enter in field "Path URI" full path name of Cocoon
webapplication directory,
- like <code>d:\xml-cocoon2\build\cocoon\webapp</code>,
+ like <code>d:\cocoon-2.1\build\cocoon\webapp</code>,
enter in field "Name" the servlet name
eg. <code>cocoon</code>.
Check the "Deployed" checkbox, and click "Apply".
@@ -1174,7 +1174,7 @@
</ul>
</li>
<li>Copy <code>xerces-XXX.jar</code> and <code>xml-apis.jar</code>
- JAR file from <code>xml-cocoon2/lib/core/</code> to
+ JAR file from <code>cocoon-2.1/lib/core/</code> to
the <code>resin-2.0.x/lib/</code> directory.</li>
</ul>
</li>
@@ -1185,7 +1185,7 @@
<code>servlet-classloader-hack</code> element to <code>true</code>
</li>
- <li>Copy the <code>xml-cocoon2/build/cocoon/cocoon.war</code> WAR file to
<code>resin-2.x/webapps</code> directory
+ <li>Copy the <code>cocoon-2.1/build/cocoon/cocoon.war</code> WAR file to
<code>resin-2.x/webapps</code> directory
</li>
<li>Start Resin as usual</li>
<li>Open the Cocoon welcome page
(<code>http://localhost:8080/cocoon/</code>)</li>
@@ -1268,12 +1268,12 @@
</li>
<li>Install Xerces as default XML parser for JRun by copying
<code>xerces-XXX.jar</code> and <code>xml-apis.jar</code> JAR
- files from the <code>xml-cocoon2/lib/core/</code> to
<code>jrun/lib/ext/</code>
+ files from the <code>cocoon-2.1/lib/core/</code> to
<code>jrun/lib/ext/</code>
directory.
</li>
<li>Update Rhino shipped with JRun with newer version from the Cocoon by
overwriting <code>jrun/lib/rhino.jar</code> JAR file
- with the <code>xml-cocoon2/lib/optional/rhino-1.5r3.jar</code> file.
+ with the <code>cocoon-2.1/lib/optional/rhino-1.5r3.jar</code> file.
</li>
<li>Start JRun admin server.</li>
<li>Start JRun default server.</li>
@@ -1289,7 +1289,7 @@
<li>Congratulations! (hopefully) you should see the Cocoon welcome
page.</li>
</ul>
<note>Instead of deploying WAR file using console, same could be done by
copying
- <code>xml-cocoon2/build/cocoon/webapp</code> under
<code>jrun/servers/default/</code>
+ <code>cocoon-2.1/build/cocoon/webapp</code> under
<code>jrun/servers/default/</code>
directory and adding following lines to the
<code>jrun/servers/default/local.properties</code>:
</note>
1.5 +1 -1 xml-cocoon2/src/documentation/xdocs/plan/catalog.xml
Index: catalog.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/plan/catalog.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- catalog.xml 31 Oct 2002 11:45:50 -0000 1.4
+++ catalog.xml 8 Mar 2003 22:45:33 -0000 1.5
@@ -125,7 +125,7 @@
<li>[excalibur] Catalog code
(avalon-dev, cocoon-dev 2001-09-23)</li>
<li>
- <link
href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=100303902726035&w=2";>cvs
commit: xml-cocoon2 LISCENSE.resolver</link>
+ <link
href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=100303902726035&w=2";>cvs
commit: cocoon-2.1 LISCENSE.resolver</link>
(cocoon-dev 2001-10-14)</li>
</ul>
</s1>
1.4 +1 -1 xml-cocoon2/src/documentation/xdocs/userdocs/concepts/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 30 Jun 2002 23:26:56 -0000 1.3
+++ index.xml 8 Mar 2003 22:45:33 -0000 1.4
@@ -537,7 +537,7 @@
export CVSROOT=:pserver:[EMAIL PROTECTED]:/home/cvspublic
cvs login
Password: anoncvs
-cvs checkout xml-cocoon2
+cvs checkout cocoon-2.1
]]></source>
<p>Build sources as per instruction in Install file.</p>
<p>Move the <code>cocoon.war</code> file to <code>$TOMCAT_HOME/webapps</code>
directory.</p>
1.14 +1 -1
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml
Index: sitemap.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/sitemap.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sitemap.xml 15 Nov 2002 23:34:29 -0000 1.13
+++ sitemap.xml 8 Mar 2003 22:45:33 -0000 1.14
@@ -1164,7 +1164,7 @@
Learn more about advanced Sitemap features by downloading the free chapter, <link
href="http://www.newriders.com/books/product.asp?product_id={C3C05052-BE3B-4E06-A60A-13FB40AF58F6}";
>A User's Look at the Cocoon architecture,</link> from Langham and Ziegeler's
<em>Cocoon: Building XML Applications</em> available at the New Riders web site.
</p>
<p>
- Check out a draft XML Schema <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/xml-cocoon2/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain";>grammar
for the Cocoon sitemap</link>, and some <link
href="http://outerthought.net/sitemap/";>external documentation</link>
+ Check out a draft XML Schema <link
href="http://cvs.apache.org/viewcvs.cgi/*checkout*/cocoon-2.1/src/documentation/xdocs/drafts/sitemap-2.1-draft.xsd?rev=HEAD&content-type=text/plain";>grammar
for the Cocoon sitemap</link>, and some <link
href="http://outerthought.net/sitemap/";>external documentation</link>
generated from this Schema. A poster diagram of
the sitemap structure is also available.
</p>
1.3 +2 -2
xml-cocoon2/src/documentation/xdocs/userdocs/concepts/validation.xml
Index: validation.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/concepts/validation.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validation.xml 21 Dec 2002 06:20:37 -0000 1.2
+++ validation.xml 8 Mar 2003 22:45:33 -0000 1.3
@@ -138,12 +138,12 @@
<p>
See
-<link
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/tools/src/schematron/README.txt?rev=HEAD&content-type=text/vnd.viewcvs-markup";>xml-cocoon2/tools/src/schematron/README.txt</link>
+<link
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/tools/src/schematron/README.txt?rev=HEAD&content-type=text/vnd.viewcvs-markup";>cocoon-2.1/tools/src/schematron/README.txt</link>
</p>
<p>
See notes in the top of
-xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng
+cocoon-2.1/src/webapp/WEB-INF/entities/sitemap-v06.rng
</p>
</s1>
1.3 +2 -2
xml-cocoon2/src/documentation/xdocs/userdocs/serializers/xls-serializer.xml
Index: xls-serializer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/documentation/xdocs/userdocs/serializers/xls-serializer.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xls-serializer.xml 26 Apr 2002 14:09:22 -0000 1.2
+++ xls-serializer.xml 8 Mar 2003 22:45:33 -0000 1.3
@@ -74,8 +74,8 @@
for the Cocoon samples. You'll find the HSSF Serializer
examples under "Legacy Formats" from the main samples
page. You can find the source under <link
-
href="http://cvs.apache.org/viewcvs/xml-cocoon2/src/webapp/samples/poi/";>
- xml-cocoon2/src/webapp/samples/poi</link> in the Cocoon
+
href="http://cvs.apache.org/viewcvs/cocoon-2.1/src/webapp/samples/poi/";>
+ cocoon-2.1/src/webapp/samples/poi</link> in the Cocoon
sources.
</p>
</s1>
1.11 +2 -3
xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractXMLFormAction.java
Index: AbstractXMLFormAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/acting/AbstractXMLFormAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractXMLFormAction.java 31 Jan 2003 02:49:56 -0000 1.10
+++ AbstractXMLFormAction.java 8 Mar 2003 22:45:33 -0000 1.11
@@ -1,5 +1,4 @@
/*
- * $Header$
* $Revision$
* $Date$
*
1.2 +1 -2
xml-cocoon2/src/samples/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java
Index: UsageFeedbackAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/samples/org/apache/cocoon/samples/xmlform/UsageFeedbackAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UsageFeedbackAction.java 20 Feb 2003 19:59:06 -0000 1.1
+++ UsageFeedbackAction.java 8 Mar 2003 22:45:34 -0000 1.2
@@ -1,5 +1,4 @@
/*
- * $Header$
* $Revision$
* $Date$
*
1.2 +2 -3
xml-cocoon2/src/samples/org/apache/cocoon/samples/xmlform/WizardAction.java
Index: WizardAction.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/samples/org/apache/cocoon/samples/xmlform/WizardAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WizardAction.java 20 Feb 2003 19:59:06 -0000 1.1
+++ WizardAction.java 8 Mar 2003 22:45:34 -0000 1.2
@@ -1,5 +1,4 @@
/*
- * $Header$
* $Revision$
* $Date$
*
1.2 +1 -1
xml-cocoon2/src/webapp/samples/webserviceproxy/cocoonhive/stylesheets/page2html.xsl
Index: page2html.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/webapp/samples/webserviceproxy/cocoonhive/stylesheets/page2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- page2html.xsl 29 Oct 2002 13:38:19 -0000 1.1
+++ page2html.xsl 8 Mar 2003 22:45:34 -0000 1.2
@@ -14,7 +14,7 @@
<body>
<a href="http://www.cocoonhive.org";>CocoonHive</a> Portal
- <a
href="http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/src/webapp/samples/webserviceproxy/";>View
source (CVS)</a>
+ <a
href="http://cvs.apache.org/viewcvs.cgi/cocoon-2.1/src/webapp/samples/webserviceproxy/";>View
source (CVS)</a>
<br/>
<xsl:apply-templates/>
</body>
