cziegeler 02/05/27 06:14:53
Modified: src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
ProcessingPipeline.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
AggregateNode.java GenerateNode.java
HandleErrorsNode.java ReadNode.java
SerializeNode.java TransformNode.java
src/webapp sitemap.xmap
Log:
Activated the new processing pipeline, mounts and caching do not work...
Revision Changes Path
1.11 +8 -1
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractProcessingPipeline.java 27 May 2002 12:12:10 -0000 1.10
+++ AbstractProcessingPipeline.java 27 May 2002 13:14:52 -0000 1.11
@@ -81,7 +81,7 @@
*
* @since @next-version@
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
- * @version CVS $Id: AbstractProcessingPipeline.java,v 1.10 2002/05/27 12:12:10
cziegeler Exp $
+ * @version CVS $Id: AbstractProcessingPipeline.java,v 1.11 2002/05/27 13:14:52
cziegeler Exp $
*/
public abstract class AbstractProcessingPipeline
extends AbstractLogEnabled
@@ -159,6 +159,13 @@
*/
public void setup(Parameters params) {
this.parameters = params;
+ }
+
+ /**
+ * Get the generator - used for content aggregation
+ */
+ public Generator getGenerator() {
+ return this.generator;
}
/**
1.6 +7 -1
xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
Index: ProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessingPipeline.java 27 May 2002 12:12:10 -0000 1.5
+++ ProcessingPipeline.java 27 May 2002 13:14:52 -0000 1.6
@@ -55,6 +55,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.xml.XMLConsumer;
/**
@@ -77,7 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Giacomo Pati</a>
- * @version CVS $Id: ProcessingPipeline.java,v 1.5 2002/05/27 12:12:10 cziegeler
Exp $
+ * @version CVS $Id: ProcessingPipeline.java,v 1.6 2002/05/27 13:14:52 cziegeler
Exp $
*/
public interface ProcessingPipeline
extends Component, Recomposable {
@@ -103,6 +104,11 @@
*/
void setGenerator (String role, String source, Parameters param)
throws ProcessingException;
+
+ /**
+ * Get the generator - used for content aggregation
+ */
+ Generator getGenerator();
/**
* Add a transformer at the end of the pipeline.
1.4 +10 -11
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AggregateNode.java 22 Mar 2002 22:26:13 -0000 1.3
+++ AggregateNode.java 27 May 2002 13:14:52 -0000 1.4
@@ -52,8 +52,7 @@
import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.components.pipeline.EventPipeline;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.sitemap.PatternException;
@@ -83,7 +82,7 @@
* <a
href="http://marc.theaimsgroup.com/?l=xml-cocoon-dev&m=100517130418424";>here</a>.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: AggregateNode.java,v 1.3 2002/03/22 22:26:13 sylvain Exp $
+ * @version CVS $Id: AggregateNode.java,v 1.4 2002/05/27 13:14:52 cziegeler Exp $
*/
public class AggregateNode extends AbstractProcessingNode {
@@ -94,7 +93,7 @@
/** All parts */
private Part[] allParts;
-
+
/** Pre-filtered Part[] for views that have a matching label in any of the
parts */
private Map viewParts;
@@ -124,11 +123,11 @@
List mapStack = context.getMapStack();
// Setup aggregator
- EventPipeline eventPipeline = context.getEventPipeline();
+ ProcessingPipeline processingPipeline = context.getProcessingPipeline();
- eventPipeline.setGenerator("!content-aggregator!", null,
Parameters.EMPTY_PARAMETERS);
+ processingPipeline.setGenerator("!content-aggregator!", null,
Parameters.EMPTY_PARAMETERS);
- ContentAggregator aggregator =
(ContentAggregator)eventPipeline.getGenerator();
+ ContentAggregator aggregator =
(ContentAggregator)processingPipeline.getGenerator();
aggregator.setRootElement(
this.element.resolve(mapStack),
this.nsURI.resolve(mapStack),
@@ -137,7 +136,7 @@
// Get actual parts, potentially filtered by the view
Part[] actualParts;
-
+
String cocoonView = env.getView();
if (cocoonView == null) {
// Keep all parts
@@ -146,7 +145,7 @@
} else {
// Are there some parts that match this view ?
actualParts = (Part[])this.viewParts.get(cocoonView);
-
+
// If not, keep all parts
if (actualParts == null) {
actualParts = this.allParts;
@@ -166,7 +165,7 @@
);
}
}
-
+
// Bug #7196 : Some parts matched the view : jump to that view
if (actualParts != this.allParts) {
ProcessingNode viewNode =
(ProcessingNode)this.viewNodes.get(cocoonView);
@@ -175,7 +174,7 @@
getLogger().info("Jumping to view '" + cocoonView + "' from
aggregate part at " + this.getLocation());
}
return viewNode.invoke(env, context);
- }
+ }
}
// Check aggregate-level view
1.3 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java
Index: GenerateNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/GenerateNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GenerateNode.java 29 Apr 2002 14:46:16 -0000 1.2
+++ GenerateNode.java 27 May 2002 13:14:52 -0000 1.3
@@ -65,7 +65,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: GenerateNode.java,v 1.2 2002/04/29 14:46:16 cziegeler Exp $
+ * @version CVS $Id: GenerateNode.java,v 1.3 2002/05/27 13:14:52 cziegeler Exp $
*/
public class GenerateNode extends AbstractProcessingNode implements
ParameterizableProcessingNode {
@@ -99,7 +99,7 @@
List mapStack = context.getMapStack();
- context.getEventPipeline().setGenerator(
+ context.getProcessingPipeline().setGenerator(
this.generatorName,
source.resolve(mapStack),
MapStackResolver.buildParameters(this.parameters, mapStack)
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java
Index: HandleErrorsNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/HandleErrorsNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HandleErrorsNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ HandleErrorsNode.java 27 May 2002 13:14:52 -0000 1.2
@@ -68,7 +68,7 @@
* Handles <map:handle-errors>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: HandleErrorsNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: HandleErrorsNode.java,v 1.2 2002/05/27 13:14:52 cziegeler Exp $
*/
public final class HandleErrorsNode extends AbstractParentProcessingNode {
@@ -96,7 +96,7 @@
getLogger().info("Processing handle-errors at " + getLocation());
}
- context.getEventPipeline().setGenerator("!notifying-generator!", "",
Parameters.EMPTY_PARAMETERS);
+ context.getProcessingPipeline().setGenerator("!notifying-generator!", "",
Parameters.EMPTY_PARAMETERS);
return invokeNodes(this.children, env, context);
}
1.2 +9 -20
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java
Index: ReadNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ReadNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ ReadNode.java 27 May 2002 13:14:52 -0000 1.2
@@ -50,7 +50,7 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.sitemap.PatternException;
@@ -65,7 +65,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: ReadNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: ReadNode.java,v 1.2 2002/05/27 13:14:52 cziegeler Exp $
*/
public class ReadNode extends AbstractProcessingNode implements
ParameterizableProcessingNode {
@@ -103,25 +103,14 @@
List mapStack = context.getMapStack();
- StreamPipeline pipeline = context.getStreamPipeline();
+ ProcessingPipeline pipeline = context.getProcessingPipeline();
- if (this.mimeType == null) {
- // No mime-type set on node
- pipeline.setReader(
- this.readerName,
- source.resolve(mapStack),
- MapStackResolver.buildParameters(this.parameters, mapStack)
- );
-
- } else {
- // mime-type set on node
- pipeline.setReader(
- this.readerName,
- source.resolve(mapStack),
- MapStackResolver.buildParameters(this.parameters, mapStack),
- this.mimeType
- );
- }
+ pipeline.setReader(
+ this.readerName,
+ source.resolve(mapStack),
+ MapStackResolver.buildParameters(this.parameters, mapStack),
+ this.mimeType
+ );
// Set status code if there is one
if (this.statusCode >= 0) {
1.2 +10 -21
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SerializeNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ SerializeNode.java 27 May 2002 13:14:52 -0000 1.2
@@ -54,7 +54,7 @@
import org.apache.cocoon.Constants;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.components.pipeline.StreamPipeline;
+import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.sitemap.PatternException;
@@ -66,7 +66,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: SerializeNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: SerializeNode.java,v 1.2 2002/05/27 13:14:52 cziegeler Exp $
*/
public class SerializeNode extends AbstractProcessingNode {
@@ -118,30 +118,19 @@
// Perform link translation if requested
if (env.getObjectModel().containsKey(Constants.LINK_OBJECT)) {
- context.getEventPipeline().addTransformer(
+ context.getProcessingPipeline().addTransformer(
"!link-translator!", null, Parameters.EMPTY_PARAMETERS
);
}
- StreamPipeline pipeline = context.getStreamPipeline();
+ ProcessingPipeline pipeline = context.getProcessingPipeline();
- if (this.mimeType == null) {
- // No mime-type set on node
- pipeline.setSerializer(
- this.serializerName,
- null,
- Parameters.EMPTY_PARAMETERS // No parameters on serializers
- );
-
- } else {
- // mime-type set on node
- pipeline.setSerializer(
- this.serializerName,
- null,
- Parameters.EMPTY_PARAMETERS,
- this.mimeType
- );
- }
+ pipeline.setSerializer(
+ this.serializerName,
+ null,
+ Parameters.EMPTY_PARAMETERS, // No parameters on serializers
+ this.mimeType
+ );
// Set status code if there is one
if (this.statusCode >= 0) {
1.2 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java
Index: TransformNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/TransformNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransformNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ TransformNode.java 27 May 2002 13:14:52 -0000 1.2
@@ -65,7 +65,7 @@
/**
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Sylvain Wallez</a>
- * @version CVS $Id: TransformNode.java,v 1.1 2002/03/05 08:26:23 sylvain Exp $
+ * @version CVS $Id: TransformNode.java,v 1.2 2002/05/27 13:14:52 cziegeler Exp $
*/
public class TransformNode extends AbstractProcessingNode implements
ParameterizableProcessingNode {
@@ -96,7 +96,7 @@
List mapStack = context.getMapStack();
- context.getEventPipeline().addTransformer(
+ context.getProcessingPipeline().addTransformer(
this.transformerName,
source.resolve(mapStack),
MapStackResolver.buildParameters(this.parameters, mapStack)
1.57 +2 -1 xml-cocoon2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/webapp/sitemap.xmap,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sitemap.xmap 27 May 2002 12:43:22 -0000 1.56
+++ sitemap.xmap 27 May 2002 13:14:53 -0000 1.57
@@ -315,7 +315,8 @@
<!--
The different pipeline implementations
-->
- <map:pipelines default="caching">
+ <map:pipelines default="noncaching">
+ <!-- ATTENTION: The caching pipeline is currently not working, use at your own
risk! -->
<map:pipeline name="caching"
src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
<map:pipeline name="noncaching"
src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
</map:pipelines>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
