cziegeler 02/05/03 03:59:01
Modified: src/documentation cocoon.xconf
src/documentation/xdocs/installing book.xml
src/java/org/apache/cocoon/components/pipeline
AbstractEventPipeline.java
AbstractProcessingPipeline.java
Added: src/documentation/xdocs/installing updating.xml
Log:
Fixing doc build, adding updating document, fixing minor problem in releasing of
pipelines
Revision Changes Path
1.12 +2 -1 xml-cocoon2/src/documentation/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/cocoon.xconf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cocoon.xconf 2 May 2002 12:12:40 -0000 1.11
+++ cocoon.xconf 3 May 2002 10:59:01 -0000 1.12
@@ -60,7 +60,8 @@
<!-- XSLT Processor -->
<xslt-stylesheet-processor logger="core.xslt-processor">
- <parameter name="use-store" value="true"/>
+ <!-- This should be true, BUT setting this to true will crash Cocoon for now!
-->
+ <parameter name="use-store" value="false"/>
</xslt-stylesheet-processor>
<!-- URL Factory:
1.3 +1 -0 xml-cocoon2/src/documentation/xdocs/installing/book.xml
Index: book.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/documentation/xdocs/installing/book.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- book.xml 19 Jan 2002 06:13:39 -0000 1.2
+++ book.xml 3 May 2002 10:59:01 -0000 1.3
@@ -12,6 +12,7 @@
<menu label="Installation">
<external label="Download" href="http://xml.apache.org/cocoon/dist/"/>
<menu-item label="Installing" href="index.html"/>
+ <menu-item label="Updating" href="updating.html"/>
<menu-item label="Jars" href="jars.html"/>
</menu>
1.1 xml-cocoon2/src/documentation/xdocs/installing/updating.xml
Index: updating.xml
===================================================================
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.0//EN"
"dtd/document-v10.dtd">
<document>
<header>
<title>Updating Cocoon</title>
<authors>
<person name="Carsten Ziegeler" email="[EMAIL PROTECTED]"/>
</authors>
</header>
<body>
<s1 title="Updating Cocoon">
<p>
This is a brief discussion of the changes between the last official release
and the latest release of Apache Cocoon.
</p>
</s1>
<s1 title="Components">
<p>
The Cocoon architecture has had some significant changes. However, great care
has been
taken that all changes are in a compatible way. This effort has been successful
except
one change which shouldn't affect anybody (see below).
</p>
<s2 title="Source Resolving">
<p>Mention changes and update strategy...</p>
</s2>
<s2 title="XSLT Processor">
<p>Mention changes and update strategy...</p>
</s2>
<s2 title="XML Parser">
<p>Mention changes and update strategy...</p>
</s2>
<s2 title="Stores">
<p>Mention changes and update strategy...</p>
</s2>
<s2 title="Stream and Event Pipeline">
<p>Mention changes and update strategy...</p>
</s2>
</s1>
</body>
</document>
1.10 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java
Index: AbstractEventPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractEventPipeline.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractEventPipeline.java 6 Apr 2002 17:57:54 -0000 1.9
+++ AbstractEventPipeline.java 3 May 2002 10:59:01 -0000 1.10
@@ -76,7 +76,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Royal</a>
- * @version CVS $Id: AbstractEventPipeline.java,v 1.9 2002/04/06 17:57:54
vgritsenko Exp $
+ * @version CVS $Id: AbstractEventPipeline.java,v 1.10 2002/05/03 10:59:01
cziegeler Exp $
*/
public abstract class AbstractEventPipeline
extends AbstractXMLProducer
@@ -147,8 +147,8 @@
public void addTransformer (String role, String source, Parameters param)
throws Exception {
ComponentSelector selector = (ComponentSelector)
this.newManager.lookup(Transformer.ROLE + "Selector");
- this.transformerSelectors.add(selector);
this.transformers.add((Transformer)selector.select(role));
+ this.transformerSelectors.add(selector);
this.transformerSources.add(source);
this.transformerParams.add(param);
}
1.4 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractProcessingPipeline.java 2 May 2002 14:48:53 -0000 1.3
+++ AbstractProcessingPipeline.java 3 May 2002 10:59:01 -0000 1.4
@@ -78,7 +78,7 @@
* This is the base for all implementations of a <code>ProcessingPipeline</code>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractProcessingPipeline.java,v 1.3 2002/05/02 14:48:53
cziegeler Exp $
+ * @version CVS $Id: AbstractProcessingPipeline.java,v 1.4 2002/05/03 10:59:01
cziegeler Exp $
*/
public abstract class AbstractProcessingPipeline
extends AbstractLoggable
@@ -210,12 +210,12 @@
ComponentSelector selector = null;
try {
selector = (ComponentSelector) this.newManager.lookup(Transformer.ROLE
+ "Selector");
- this.transformerSelectors.add(selector);
} catch (ComponentException ce) {
throw new ProcessingException("Lookup of transformer selector failed.",
ce);
}
try {
this.transformers.add((Transformer)selector.select(role));
+ this.transformerSelectors.add(selector);
} catch (ComponentException ce) {
throw new ProcessingException("Lookup of transformer for role
'"+role+"' failed.", ce);
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
