cziegeler 01/11/29 08:00:54
Modified: documentation/xdocs index.xml
documentation/xdocs/ctwig ctwig-contributing.xml
ctwig-gettingstarted.xml ctwig-installing.xml
ctwig-resources.xml
documentation/xdocs/developing parent-component-manager.xml
documentation/xdocs/installing book.xml index.xml jars.xml
documentation/xdocs/userdocs/generators jsp-generator.xml
request-generator.xml
documentation/xdocs/userdocs/serializers svg-serializer.xml
documentation/xdocs/userdocs/transformers
cinclude-transformer.xml xinclude-transformer.xml
Log:
Changed links from cocoon2 to cocoon and synced docs
Revision Changes Path
1.10 +2 -2 xml-cocoon2/documentation/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/index.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- index.xml 2001/11/29 14:33:32 1.9
+++ index.xml 2001/11/29 16:00:53 1.10
@@ -32,9 +32,9 @@
</p>
<p>
Apache Cocoon @version@ is the latest release of the XML publishing
framework.
- It is a complete rewrite of Cocoon 1 and is supposed to remove all those
design
- constraint that emerged from the Cocoon 1 experience.
+ If you are looking for Cocoon 1 go <link
href="http://xml.apache.org/cocoon1";>here</link>.
</p>
+
<p>
This documentation is not complete because documentation is never
complete anyway. However the current
release is stable and tested thoroughly and you'll find lots of samples
which shows and explains
1.5 +1 -1
xml-cocoon2/documentation/xdocs/ctwig/ctwig-contributing.xml
Index: ctwig-contributing.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/ctwig/ctwig-contributing.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ctwig-contributing.xml 2001/11/09 05:17:06 1.4
+++ ctwig-contributing.xml 2001/11/29 16:00:53 1.5
@@ -12,7 +12,7 @@
<body>
<s1 title="Contributing">
<p>I am more than happy to recieve amendments,
improvements and so on to these pages. I want the information to be as up to
date and as accurate as possible so please do not hesitate to let me know if
you find anything wrong. I would also be really pleased to receive submissions
of more tutorial documentation for C2. I hope that sections will develop for
areas such as the sitemap, configuration tutorials, development techniques and
so on which will require reasonable effort to develop however I think it would
also be good to take up the suggestion of a FAQ based on some of the common
questions that come up on the list. I will start this off soon and try and add
to it as quickly as possible.</p>
- <p>I have written these pages in the xdocs format, thus
it would be really useful if any contributions are in that format (see <link
href="http://xml.apache.org/cocoon2/contrib.html";>Contributing</link> for
explanation of the diff format and CVS). If you want to see examples of the
markup required please check the files in the C2 xdocs folder that comes as
part of the distribution. The DTD is in xdocs/dtd/document-v10.dtd. I am more
than happy to take contributions in email, MS Word, PDF, TXT etc however any
conversion may delay the publishing process.</p>
+ <p>I have written these pages in the xdocs format, thus
it would be really useful if any contributions are in that format (see <link
href="http://xml.apache.org/cocoon/contrib.html";>Contributing</link> for
explanation of the diff format and CVS). If you want to see examples of the
markup required please check the files in the C2 xdocs folder that comes as
part of the distribution. The DTD is in xdocs/dtd/document-v10.dtd. I am more
than happy to take contributions in email, MS Word, PDF, TXT etc however any
conversion may delay the publishing process.</p>
<p>Please email <link href="mailto:[EMAIL
PROTECTED]">[EMAIL PROTECTED]</link> with your comments, ideas and
submissions.</p>
<p>Many thanks - Jez</p>
</s1>
1.6 +2 -2
xml-cocoon2/documentation/xdocs/ctwig/ctwig-gettingstarted.xml
Index: ctwig-gettingstarted.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/ctwig/ctwig-gettingstarted.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ctwig-gettingstarted.xml 2001/11/22 07:34:14 1.5
+++ ctwig-gettingstarted.xml 2001/11/29 16:00:53 1.6
@@ -24,8 +24,8 @@
</s2>
<s2 title="Where do I get it from?">
- <p>Go to <fork
href="http://xml.apache.org/cocoon2/";>http://www.apache.org/cocoon2/</fork> and
download it from there. The latest distribution for any operating system can
be found in the
- <fork
href="http://xml.apache.org/cocoon2/dist/";>Cocoon 2 distribution folder</fork>.
The distribution that you can download from there contains the Cocoon code,
samples, documentation and the Java libraries that enable the Cocoon to work
such as Xerces and Xalan.</p>
+ <p>Go to <fork
href="http://xml.apache.org/cocoon/";>http://www.apache.org/cocoon/</fork> and
download it from there. The latest distribution for any operating system can
be found in the
+ <fork
href="http://xml.apache.org/cocoon/dist/";>Cocoon distribution folder</fork>.
The distribution that you can download from there contains the Cocoon code,
samples, documentation and the Java libraries that enable the Cocoon to work
such as Xerces and Xalan.</p>
</s2>
<s2 title="What assumptions have you made?">
1.6 +2 -2
xml-cocoon2/documentation/xdocs/ctwig/ctwig-installing.xml
Index: ctwig-installing.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/ctwig/ctwig-installing.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ctwig-installing.xml 2001/11/22 07:34:14 1.5
+++ ctwig-installing.xml 2001/11/29 16:00:53 1.6
@@ -18,10 +18,10 @@
<p><strong>I'm really sorry, but at the moment
these examples relate to the latest distribution, Tomcat 3.2.3 and Apache
1.3.19 on Windows 2000.</strong> It is probably all the same for any operating
system (remember, that is the promise of Java and XML). I would like to do
TC4/Unix notes but do not have the time at the momement. If you can help then
please <link href="ctwig-contributing.html">contribute</link>.</p>
</s2>
<s2 title="Download Cocoon 2">
- <p>The latest distribution for any operating
system can be found in the <fork
href="http://xml.apache.org/cocoon2/dist/";>Cocoon 2 distribution folder</fork>.
This file contains the Cocoon code, samples, documentation and the Java
libraries that enable the Cocoon to work such as Xerces and Xalan. When you
have downloaded it then extract it to somewhere. This path becomes your
{COCOON_HOME}.</p>
+ <p>The latest distribution for any operating
system can be found in the <fork
href="http://xml.apache.org/cocoon/dist/";>Cocoon distribution folder</fork>.
This file contains the Cocoon code, samples, documentation and the Java
libraries that enable the Cocoon to work such as Xerces and Xalan. When you
have downloaded it then extract it to somewhere. This path becomes your
{COCOON_HOME}.</p>
</s2>
<s2 title="Basic Configuration">
- <p>Follow the instructions on building C2 as
per the installation guide that comes with C2. It can also be found <fork
href="http://xml.apache.org/cocoon2/install.html";>here</fork> as well.
Obviously since you have got the ZIP distribution you do not have to do the CVS
bit thus you can start at the Building Apache Cocoon 2 section. Do each of the
following steps:</p>
+ <p>Follow the instructions on building Cocoon
as per the installation guide that comes with Cocoon. It can also be found
<fork href="http://xml.apache.org/cocoon/install.html";>here</fork> as well.
Obviously since you have got the ZIP distribution you do not have to do the CVS
bit thus you can start at the Building Apache Cocoon 2 section. Do each of the
following steps:</p>
<ul>
<li>Set JAVA_HOME</li>
<li>Create the WAR using
1.5 +4 -4 xml-cocoon2/documentation/xdocs/ctwig/ctwig-resources.xml
Index: ctwig-resources.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/ctwig/ctwig-resources.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ctwig-resources.xml 2001/11/09 05:17:06 1.4
+++ ctwig-resources.xml 2001/11/29 16:00:53 1.5
@@ -11,14 +11,14 @@
<body>
<s1 title="Resources">
- <s2 title="Apache Cocoon 2 Web Site">
- <p>The main place is <link
href="http://xml.apache.org/cocoon2/";><code>http://xml.apache.org/cocoon2/</code></link></p>
+ <s2 title="Apache Cocoon Web Site">
+ <p>The main place is <link
href="http://xml.apache.org/cocoon/";><code>http://xml.apache.org/cocoon/</code></link></p>
<p>The C2 documentation is still (and always
will be) under development. There is a lot of useful information there and it
goes into a lot more detail than here. Read it and digest it. I am certainly
doing that as I go along and quite quickly understanding more of the
architecture and concepts. I will seek to distill the main points into this
site, but the main place is still the supplied documentation.</p>
<p>You will also find the documentation in your
C2 installation under {COCCON_HOME}/docs/</p>
</s2>
<s2 title="Apache Cocoon Users Mail List">
- <p><link href="mailto:[EMAIL
PROTECTED]">Subscribe</link> to the Cocoon users mail list! This is a great
resource for asking and answwering questions. For more details, and pointers
to other related lists, see the <fork
href="http://xml.apache.org/cocoon2/mail-lists.html";>documentation</fork>.</p>
- <p>You can also access an excellent,
searchable, archive of the users mail list at <fork
href="http://marc.theaimsgroup.com/?l=xml-cocoon-users";>The Aims Group</fork>.
Use this 'cos lots of things are there! Other list archive information is
available in the <fork
href="http://xml.apache.org/cocoon2/mail-archives.html";>documentation</fork>.</p>
+ <p><link href="mailto:[EMAIL
PROTECTED]">Subscribe</link> to the Cocoon users mail list! This is a great
resource for asking and answwering questions. For more details, and pointers
to other related lists, see the <fork
href="http://xml.apache.org/cocoon/mail-lists.html";>documentation</fork>.</p>
+ <p>You can also access an excellent,
searchable, archive of the users mail list at <fork
href="http://marc.theaimsgroup.com/?l=xml-cocoon-users";>The Aims Group</fork>.
Use this 'cos lots of things are there! Other list archive information is
available in the <fork
href="http://xml.apache.org/cocoon/mail-archives.html";>documentation</fork>.</p>
</s2>
<s2 title="Other Pages">
<ul>
1.3 +1 -1
xml-cocoon2/documentation/xdocs/developing/parent-component-manager.xml
Index: parent-component-manager.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/developing/parent-component-manager.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parent-component-manager.xml 2001/10/25 14:58:42 1.2
+++ parent-component-manager.xml 2001/11/29 16:00:54 1.3
@@ -162,7 +162,7 @@
<s2 title="Step 4: Use the component">
- <p>Cocoon2 components can now use the ComponentManager
given to them by Cocoon to look up the
+ <p>Cocoon components can now use the ComponentManager
given to them by Cocoon to look up the
component managed by the parent component
manager:</p>
<p>The following code was taken from
org/apache/cocoon/samples/parentcm/Generator.java</p>
1.3 +1 -1 xml-cocoon2/documentation/xdocs/installing/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/installing/book.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- book.xml 2001/10/25 14:58:42 1.2
+++ book.xml 2001/11/29 16:00:54 1.3
@@ -9,7 +9,7 @@
</menu>
<menu label="Installation">
- <external label="Download" href="http://xml.apache.org/cocoon2/dist"/>
+ <external label="Download" href="http://xml.apache.org/cocoon/dist"/>
<menu-item label="Installing" href="index.html"/>
<menu-item label="Jars" href="jars.html"/>
</menu>
1.4 +1 -1 xml-cocoon2/documentation/xdocs/installing/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/installing/index.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- index.xml 2001/11/26 05:55:47 1.3
+++ index.xml 2001/11/29 16:00:54 1.4
@@ -50,7 +50,7 @@
<s2 title="Download a distribution">
<p>
You can simply download the latest official release from the
- <link href="http://xml.apache.org/dist/cocoon2";>Cocoon
distribution</link>
+ <link href="http://xml.apache.org/dist/cocoon";>Cocoon
distribution</link>
directory.
</p>
</s2>
1.5 +1 -1 xml-cocoon2/documentation/xdocs/installing/jars.xml
Index: jars.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/documentation/xdocs/installing/jars.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jars.xml 2001/11/22 08:36:25 1.4
+++ jars.xml 2001/11/29 16:00:54 1.5
@@ -88,7 +88,7 @@
</tr>
<tr>
<td>
- <link href="http://xml.apache.org/cocoon2/";>Cocoon</link>
+ <link href="http://xml.apache.org/cocoon/";>Cocoon</link>
</td>
<td>Cocoon is a 100% pure Java publishing framework that relies on
new W3C technologies (such as XML, XSL, SVG, etc..) to provide web
1.5 +2 -2
xml-cocoon2/documentation/xdocs/userdocs/generators/jsp-generator.xml
Index: jsp-generator.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/jsp-generator.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jsp-generator.xml 2001/10/25 07:49:14 1.4
+++ jsp-generator.xml 2001/11/29 16:00:54 1.5
@@ -16,7 +16,7 @@
<p>The JspGenerator selects a JSPEngine component. The
JSPEngine component
launches a JSP servlet engine of your servlet
container,
feeds the HttpRequest into the
- JSP servlet engine, and pipes the jsp response as
SAX events into Cocoon2.
+ JSP servlet engine, and pipes the jsp response as
SAX events into Cocoon.
The JSP page is specified by the HttpRequest.
</p>
<p>
@@ -102,7 +102,7 @@
<s2 title="JSPEngineImplWLS">
<p>This JSPEngine is implemented especially for WebLogic
5.1. WebLogic 6.0, and WebLogic 6.1
may work, too. JSPEngineImplWLS finds the named
request dispatch for jsp, the jsp response
- is piped into Cocoon2.
+ is piped into Cocoon.
</p>
<p>The name of the JSP servlet is by default set to
'*.jsp'. This is the default servlet name
of the JSP servlet engine under WLS. You may adopt the
parameter servlet-name to your needs.
1.3 +2 -2
xml-cocoon2/documentation/xdocs/userdocs/generators/request-generator.xml
Index: request-generator.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/userdocs/generators/request-generator.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- request-generator.xml 2001/10/25 07:49:14 1.2
+++ request-generator.xml 2001/11/29 16:00:54 1.3
@@ -44,10 +44,10 @@
<header name="accept-language">de</header>
<header name="connection">Keep-Alive</header>
<header name="accept">image/gif, image/x-xbitmap, image/jpeg,
image/pjpeg, */*</header>
- <header name="host">thehost.serving.cocoon2</header>
+ <header name="host">thehost.serving.cocoon</header>
<header name="accept-encoding">gzip, deflate</header>
<header name="user-agent">Browser User Agent</header>
- <header
name="referer">http://thehost.serving.cocoon2/cocoon/welcome</header>
+ <header
name="referer">http://thehost.serving.cocoon/cocoon/welcome</header>
</requestHeaders>
<!-- All request parameters: -->
1.4 +1 -1
xml-cocoon2/documentation/xdocs/userdocs/serializers/svg-serializer.xml
Index: svg-serializer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/userdocs/serializers/svg-serializer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- svg-serializer.xml 2001/11/21 12:49:39 1.3
+++ svg-serializer.xml 2001/11/29 16:00:54 1.4
@@ -27,7 +27,7 @@
</p>
<note>
For examples of this serializer, see
the Cocoon welcome
- page in the distribution (<code>[cocoon2
+ page in the distribution (<code>[cocoon
root]/welcome</code>).
</note>
<p>
1.4 +2 -2
xml-cocoon2/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml
Index: cinclude-transformer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/cinclude-transformer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cinclude-transformer.xml 2001/11/21 02:40:30 1.3
+++ cinclude-transformer.xml 2001/11/29 16:00:54 1.4
@@ -86,7 +86,7 @@
xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
<title>Hello</title>
<content>
- <para>This is my first Cocoon2 page!</para>
+ <para>This is my first Cocoon page!</para>
<cinclude:include src="include.xml" element="included"/>
</content>
</page>
@@ -114,7 +114,7 @@
xmlns:cinclude="http://apache.org/cocoon/include/1.0";>
<title>Hello</title>
<content>
- <para>This is my first Cocoon2 page!</para>
+ <para>This is my first Cocoon page!</para>
<included>
<p>
I am <strong>included</strong> by CIncludeTransformer.
1.4 +2 -2
xml-cocoon2/documentation/xdocs/userdocs/transformers/xinclude-transformer.xml
Index: xinclude-transformer.xml
===================================================================
RCS file:
/home/cvs/xml-cocoon2/documentation/xdocs/userdocs/transformers/xinclude-transformer.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xinclude-transformer.xml 2001/11/21 02:40:30 1.3
+++ xinclude-transformer.xml 2001/11/29 16:00:54 1.4
@@ -91,7 +91,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude";>
<title>Hello</title>
<content>
- <para>This is my first Cocoon2 page!</para>
+ <para>This is my first Cocoon page!</para>
<xi:include href="include.xml"/>
</content>
</page>
@@ -119,7 +119,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude";>
<title>Hello</title>
<content>
- <para>This is my first Cocoon2 page!</para>
+ <para>This is my first Cocoon page!</para>
<p>
I am <strong>included</strong> by XIncludeTransformer.
I come from "include.xml".
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
