svn commit: r890318 - in /cocoon/cocoon3/trunk/cocoon-optional/src: main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/ test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/ test/java/org/apache/cocoon/optional/pipeline/compo...

[re...@apache.org]

Author: reinhard
Date: Mon Dec 14 13:40:47 2009
New Revision: 890318

URL: http://svn.apache.org/viewvc?rev=890318&view=rev
Log:
merge URLGenerator with SAXGeneratar
add SAXBuffer as input source for SAXGenerator
unit tests for both cases

Modified:
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGenerator.java
    cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java
    cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumerTestCase.java

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGenerator.java?rev=890318&r1=890317&r2=890318&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGenerator.java Mon Dec 14 13:40:47 2009
@@ -29,7 +29,7 @@
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
 
-public final class NekoGenerator extends AbstractSAXGenerator {
+public class NekoGenerator extends AbstractSAXGenerator {
 
     private URL htmlSource;
 

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java?rev=890318&r1=890317&r2=890318&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializerTestCase.java Mon Dec 14 13:40:47 2009
@@ -16,7 +16,7 @@
  */
 package org.apache.cocoon.optional.pipeline.components.sax.fop;
 
-import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,7 +25,7 @@
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
 import org.apache.cocoon.sax.SAXPipelineComponent;
-import org.apache.cocoon.sax.component.URLGenerator;
+import org.apache.cocoon.sax.component.SAXGenerator;
 import org.apache.cocoon.sax.component.XSLTTransformer;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
@@ -35,7 +35,7 @@
     @Test
     public void testPipelineWithFOPSerializer() throws Exception {
         Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
-        pipeline.addComponent(new URLGenerator(this.getClass().getResource("page.xml")));
+        pipeline.addComponent(new SAXGenerator(this.getClass().getResource("page.xml")));
         pipeline.addComponent(new XSLTTransformer(this.getClass().getResource("page2fo.xsl")));
         pipeline.addComponent(new FopSerializer());
 

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumerTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumerTestCase.java?rev=890318&r1=890317&r2=890318&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumerTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/solr/SolrConsumerTestCase.java Mon Dec 14 13:40:47 2009
@@ -27,7 +27,7 @@
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
 import org.apache.cocoon.sax.SAXPipelineComponent;
-import org.apache.cocoon.sax.component.URLGenerator;
+import org.apache.cocoon.sax.component.SAXGenerator;
 import org.apache.cocoon.sax.component.XMLSerializer;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -58,7 +58,7 @@
     public void testPipelineWithSolrConsumer() throws Exception {
         Pipeline<SAXPipelineComponent> pipeline = new NonCachingPipeline<SAXPipelineComponent>();
 
-        pipeline.addComponent(new URLGenerator(this.getClass().getResource("sample.xml")));
+        pipeline.addComponent(new SAXGenerator(this.getClass().getResource("sample.xml")));
         pipeline.addComponent(new SolrConsumer(this.solr));
         pipeline.addComponent(new XMLSerializer());