You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by st...@apache.org on 2009/01/30 21:18:15 UTC

svn commit: r739401 - in /cocoon/cocoon3/trunk/cocoon-pipeline/src: main/java/org/apache/cocoon/pipeline/CachingPipeline.java test/java/org/apache/cocoon/pipeline/PipelineTest.java

Author: stevendolg
Date: Fri Jan 30 20:18:14 2009
New Revision: 739401

URL: http://svn.apache.org/viewvc?rev=739401&view=rev
Log:
COCOON3-23

Remove CachingPipeline.setup(OutputStream) and rely on the implementation of the base class.

Modified:
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java
    cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/PipelineTest.java

Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java?rev=739401&r1=739400&r2=739401&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/CachingPipeline.java Fri Jan 30 20:18:14 2009
@@ -163,11 +163,6 @@
     }
 
     @Override
-    public void setup(OutputStream outputStream) {
-        this.setup(outputStream);
-    }
-
-    @Override
     public void setup(OutputStream outputStream, Map<String, Object> parameters) {
         // create a caching output stream to intercept the result
         this.cachingOutputStream = new CachingOutputStream(outputStream);

Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/PipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/PipelineTest.java?rev=739401&r1=739400&r2=739401&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/PipelineTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/apache/cocoon/pipeline/PipelineTest.java Fri Jan 30 20:18:14 2009
@@ -24,6 +24,13 @@
 
 public class PipelineTest extends TestCase {
 
+    public void testCachingPipelineWithReader() throws Exception {
+        Pipeline pipeline = new CachingPipeline();
+        pipeline.addComponent(new FileReaderComponent(this.getClass().getResource("/test.xml")));
+        pipeline.setup(System.out);
+        pipeline.execute();
+    }
+
     /**
      * A very simple pipeline that only uses a reader.
      */