cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r740554 [1/2] - in /cocoon/cocoon3/trunk: cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/ cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/ cocoon-optional/src/ma...
Date Wed, 04 Feb 2009 01:10:42 GMT
Author: reinhard
Date: Wed Feb  4 01:10:39 2009
New Revision: 740554

URL: http://svn.apache.org/viewvc?rev=740554&view=rev
Log:
move SAX components to the cocoon-sax module
use the SAX prefix for all SAX specific classes

Added:
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXGenerator.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java   (contents, props changed)
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSAXPipelineComponent.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXProducer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractXMLProducer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXSerializer.java
      - copied, changed from r740229, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSerializer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXTransformer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXConsumer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java   (contents, props changed)
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXPipelineComponent.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXProducer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLProducer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/CleaningTransformer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/CleaningTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/FileGenerator.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/FileGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/IncludeTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaErrorHandler.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaValidationException.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/StringGenerator.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/StringGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/TraxErrorListener.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLSerializer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLSerializer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTProcessorErrorListener.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTProcessorErrorListener.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTTransformer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributeTypes.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributeTypes.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributesImpl.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributesImpl.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/EmbeddedSAXPipe.java
      - copied, changed from r740229, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/EmbeddedXMLPipe.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ImmutableAttributesImpl.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/ImmutableAttributesImpl.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/IncludeXMLConsumer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumerAdapter.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/SaxBuffer.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/TransformationUtils.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/TransformationUtils.java
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/XMLUtils.java
      - copied, changed from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/XMLUtils.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/AbstractReader.java   (contents, props changed)
      - copied, changed from r740223, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractReader.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/FileReaderComponent.java
      - copied, changed from r740223, cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/FileReaderComponent.java
Removed:
    cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/sax/
    cocoon/cocoon3/trunk/cocoon-pipeline/src/test/java/org/
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/
    cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/
Modified:
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGenerator.java
    cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java
    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/betwixt/BetwixtBeanGeneratorTest.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/neko/NekoGeneratorTestCase.java
    cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
    cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformerTest.java
    cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/util/TransformationUtilsTest.java
    cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/PipelineTest.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceSerializer.java
    cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceTransformer.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/java/org/apache/cocoon/sitemap/component/ExceptionGenerator.java
    cocoon/cocoon3/trunk/cocoon-sitemap/src/main/resources/META-INF/cocoon/spring/cocoon-pipeline-component.xml

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGenerator.java Wed Feb  4 01:10:39 2009
@@ -20,15 +20,15 @@
 import java.io.IOException;
 
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.component.sax.AbstractGenerator;
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXGenerator;
+import org.apache.cocoon.sax.SAXConsumer;
 import org.apache.commons.betwixt.BindingConfiguration;
 import org.apache.commons.betwixt.XMLIntrospector;
 import org.apache.commons.betwixt.io.SAXBeanWriter;
 import org.xml.sax.SAXException;
 
-public final class BetwixtBeanGenerator extends AbstractGenerator {
+public final class BetwixtBeanGenerator extends AbstractSAXGenerator {
 
     private Object bean;
 
@@ -54,7 +54,7 @@
     }
 
     @Override
-    protected void setXMLConsumer(XMLConsumer xmlConsumer) {
+    protected void setXMLConsumer(SAXConsumer xmlConsumer) {
         this.saxBeanWriter = new SAXBeanWriter(xmlConsumer);
 
         if (this.bindingConfiguration != null) {

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/pipeline/components/sax/fop/FopSerializer.java Wed Feb  4 01:10:39 2009
@@ -24,15 +24,15 @@
 import org.apache.cocoon.pipeline.caching.CacheKey;
 import org.apache.cocoon.pipeline.caching.SimpleCacheKey;
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
-import org.apache.cocoon.pipeline.component.sax.AbstractSerializer;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXSerializer;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;
 import org.apache.fop.apps.MimeConstants;
 import org.xml.sax.ContentHandler;
 
-public class FopSerializer extends AbstractSerializer implements CachingPipelineComponent {
+public class FopSerializer extends AbstractSAXSerializer implements CachingPipelineComponent {
 
     private final static FopFactory FOP_FACTORY = FopFactory.newInstance();
 

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=740554&r1=740553&r2=740554&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 Wed Feb  4 01:10:39 2009
@@ -22,14 +22,14 @@
 
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.SetupException;
-import org.apache.cocoon.pipeline.component.sax.AbstractGenerator;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXGenerator;
 import org.cyberneko.html.parsers.SAXParser;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXNotRecognizedException;
 import org.xml.sax.SAXNotSupportedException;
 
-public final class NekoGenerator extends AbstractGenerator {
+public final class NekoGenerator extends AbstractSAXGenerator {
 
     private URL htmlSource;
 

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/betwixt/BetwixtBeanGeneratorTest.java Wed Feb  4 01:10:39 2009
@@ -23,7 +23,7 @@
 import org.apache.cocoon.optional.pipeline.components.sax.betwixt.BetwixtBeanGenerator;
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.pipeline.component.sax.XMLSerializer;
+import org.apache.cocoon.sax.component.XMLSerializer;
 import org.apache.commons.betwixt.BindingConfiguration;
 import org.apache.commons.betwixt.IntrospectionConfiguration;
 import org.apache.commons.betwixt.XMLIntrospector;

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=740554&r1=740553&r2=740554&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 Wed Feb  4 01:10:39 2009
@@ -24,8 +24,8 @@
 
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.pipeline.component.sax.FileGenerator;
-import org.apache.cocoon.pipeline.component.sax.XSLTTransformer;
+import org.apache.cocoon.sax.component.FileGenerator;
+import org.apache.cocoon.sax.component.XSLTTransformer;
 import org.apache.commons.io.IOUtils;
 import org.junit.Test;
 

Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/neko/NekoGeneratorTestCase.java Wed Feb  4 01:10:39 2009
@@ -22,7 +22,7 @@
 
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.pipeline.component.sax.XMLSerializer;
+import org.apache.cocoon.sax.component.XMLSerializer;
 import org.custommonkey.xmlunit.examples.CountingNodeTester;
 import org.junit.Test;
 import org.w3c.dom.Node;

Modified: cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sample/src/main/java/org/apache/cocoon/sample/generation/TimestampGenerator.java Wed Feb  4 01:10:39 2009
@@ -20,15 +20,15 @@
 import java.util.Date;
 
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.component.sax.AbstractGenerator;
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
-import org.apache.cocoon.pipeline.util.ImmutableAttributesImpl;
+import org.apache.cocoon.sax.AbstractSAXGenerator;
+import org.apache.cocoon.sax.SAXConsumer;
+import org.apache.cocoon.sax.util.ImmutableAttributesImpl;
 import org.xml.sax.SAXException;
 
-public class TimestampGenerator extends AbstractGenerator {
+public class TimestampGenerator extends AbstractSAXGenerator {
 
     public void execute() {
-        XMLConsumer consumer = this.getXMLConsumer();
+        SAXConsumer consumer = this.getXMLConsumer();
         try {
             try {
                 Thread.sleep(500);

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXGenerator.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractGenerator.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXGenerator.java Wed Feb  4 01:10:39 2009
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.component.Starter;
 
-public abstract class AbstractGenerator extends AbstractXMLProducer implements Starter {
+public abstract class AbstractSAXGenerator extends AbstractSAXProducer implements Starter {
 
 }

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSAXPipelineComponent.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSAXPipelineComponent.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSAXPipelineComponent.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.component.AbstractPipelineComponent;
 

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXProducer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractXMLProducer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXProducer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXProducer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractXMLProducer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractXMLProducer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXProducer.java Wed Feb  4 01:10:39 2009
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.SetupException;
 import org.apache.cocoon.pipeline.component.Consumer;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
 
-public abstract class AbstractXMLProducer extends AbstractSAXPipelineComponent implements XMLProducer {
+public abstract class AbstractSAXProducer extends AbstractSAXPipelineComponent implements SAXProducer {
 
-    private XMLConsumer xmlConsumer;
+    private SAXConsumer xmlConsumer;
 
     /**
      * {@inheritDoc}
@@ -32,18 +32,18 @@
      * @see org.apache.cocoon.pipeline.component.Producer#setConsumer(org.apache.cocoon.pipeline.component.Consumer)
      */
     public final void setConsumer(Consumer consumer) {
-        if (!(consumer instanceof XMLConsumer)) {
+        if (!(consumer instanceof SAXConsumer)) {
             throw new SetupException("XMLProducer requires an XMLConsumer.");
         }
 
-        this.setXMLConsumer((XMLConsumer) consumer);
+        this.setXMLConsumer((SAXConsumer) consumer);
     }
 
-    protected XMLConsumer getXMLConsumer() {
+    protected SAXConsumer getXMLConsumer() {
         return this.xmlConsumer;
     }
 
-    protected void setXMLConsumer(XMLConsumer xmlConsumer) {
+    protected void setXMLConsumer(SAXConsumer xmlConsumer) {
         this.xmlConsumer = xmlConsumer;
     }
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXSerializer.java (from r740229, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSerializer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXSerializer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXSerializer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSerializer.java&r1=740229&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXSerializer.java Wed Feb  4 01:10:39 2009
@@ -14,15 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import java.io.OutputStream;
 import java.util.Map;
 
 import org.apache.cocoon.pipeline.component.Finisher;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.util.SAXConsumerAdapter;
 
-public abstract class AbstractSerializer extends XMLConsumerAdapter implements SAXPipelineComponent, Finisher {
+public abstract class AbstractSAXSerializer extends SAXConsumerAdapter implements SAXPipelineComponent, Finisher {
 
     private OutputStream outputStream;
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXTransformer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXTransformer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXTransformer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractTransformer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/AbstractTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/AbstractSAXTransformer.java Wed Feb  4 01:10:39 2009
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.util.SaxBuffer;
+import org.apache.cocoon.sax.util.SaxBuffer;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 
-public abstract class AbstractTransformer extends AbstractXMLProducer implements XMLConsumer {
+public abstract class AbstractSAXTransformer extends AbstractSAXProducer implements SAXConsumer {
 
     private List<String[]> namespaces = new ArrayList<String[]>();
 
@@ -121,7 +121,7 @@
         this.getXMLConsumer().startPrefixMapping(prefix, uri);
     }
 
-    private XMLConsumer originalXMLConsumer;
+    private SAXConsumer originalXMLConsumer;
 
     private boolean isRecording;
 
@@ -130,7 +130,7 @@
      * 
      * @param recorder
      */
-    protected void setRecorder(XMLConsumer recorder) {
+    protected void setRecorder(SAXConsumer recorder) {
         if (this.isRecording) {
             throw new ProcessingException("Only one recorder can be set.");
         }
@@ -143,16 +143,16 @@
     /**
      * Remove a recorder. Do not invoke this method directly.
      */
-    protected XMLConsumer removeRecorder() {
-        XMLConsumer saxBuffer = this.getXMLConsumer();
+    protected SAXConsumer removeRecorder() {
+        SAXConsumer saxBuffer = this.getXMLConsumer();
         this.setXMLConsumer(this.originalXMLConsumer);
         this.isRecording = false;
         return saxBuffer;
     }
 
     /**
-     * Start recording of SAX events. All incoming events are recorded and not forwarded. The resulting SAXBuffer can be
-     * obtained by the matching {@link #endSAXRecording} call.
+     * Start recording of SAX events. All incoming events are recorded and not forwarded. The
+     * resulting SAXBuffer can be obtained by the matching {@link #endSAXRecording} call.
      */
     public void startSAXRecording() throws SAXException {
         this.setRecorder(new SaxBuffer());

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXConsumer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXConsumer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXConsumer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXConsumer.java Wed Feb  4 01:10:39 2009
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.component.Consumer;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.ext.LexicalHandler;
 
-public interface XMLConsumer extends ContentHandler, LexicalHandler, Consumer {
+public interface SAXConsumer extends ContentHandler, LexicalHandler, Consumer {
 
 }

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXPipelineComponent.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXPipelineComponent.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SAXPipelineComponent.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.component.PipelineComponent;
 

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXPipelineComponent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXProducer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLProducer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXProducer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXProducer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLProducer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLProducer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/SAXProducer.java Wed Feb  4 01:10:39 2009
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax;
 
 import org.apache.cocoon.pipeline.component.Producer;
 
-public interface XMLProducer extends Producer, SAXPipelineComponent {
+public interface SAXProducer extends Producer, SAXPipelineComponent {
 
 }

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/CleaningTransformer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/CleaningTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/CleaningTransformer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/CleaningTransformer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/CleaningTransformer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/CleaningTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/CleaningTransformer.java Wed Feb  4 01:10:39 2009
@@ -16,15 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import org.apache.cocoon.pipeline.caching.CacheKey;
 import org.apache.cocoon.pipeline.caching.SimpleCacheKey;
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
+import org.apache.cocoon.sax.AbstractSAXTransformer;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 
-public class CleaningTransformer extends AbstractTransformer implements CachingPipelineComponent {
+public class CleaningTransformer extends AbstractSAXTransformer implements CachingPipelineComponent {
 
     private static final String EMPTY_NS = "";
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/FileGenerator.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/FileGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/FileGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/FileGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/FileGenerator.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/FileGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/FileGenerator.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.io.IOException;
 import java.net.URL;
@@ -29,11 +29,12 @@
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
 import org.apache.cocoon.pipeline.util.URLConnectionUtils;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXGenerator;
+import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-public class FileGenerator extends AbstractGenerator implements CachingPipelineComponent {
+public class FileGenerator extends AbstractSAXGenerator implements CachingPipelineComponent {
 
     private final Log logger = LogFactory.getLog(this.getClass());
 
@@ -86,7 +87,7 @@
     /**
      * {@inheritDoc}
      * 
-     * @see org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer#setConfiguration(java.util.Map)
+     * @see org.apache.cocoon.sax.AbstractSAXProducer#setConfiguration(java.util.Map)
      */
     @Override
     public void setConfiguration(Map<String, ? extends Object> configuration) {

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/IncludeTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/IncludeTransformer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/IncludeTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/IncludeTransformer.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -23,8 +23,9 @@
 import java.util.Map;
 
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.util.IncludeXMLConsumer;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXTransformer;
+import org.apache.cocoon.sax.util.IncludeSAXConsumer;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.Attributes;
@@ -33,7 +34,7 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-public class IncludeTransformer extends AbstractTransformer {
+public class IncludeTransformer extends AbstractSAXTransformer {
 
     private final Log logger = LogFactory.getLog(this.getClass());
 
@@ -64,7 +65,7 @@
 
             XMLReader xmlReader = XMLReaderFactory.createXMLReader();
             xmlReader.setContentHandler(this.getXMLConsumer());
-            IncludeXMLConsumer includeXMLConsumer = new IncludeXMLConsumer(this.getXMLConsumer());
+            IncludeSAXConsumer includeXMLConsumer = new IncludeSAXConsumer(this.getXMLConsumer());
             xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", includeXMLConsumer);
 
             BufferedInputStream inputStream = new BufferedInputStream(source.openStream());

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaErrorHandler.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaErrorHandler.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaErrorHandler.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import org.apache.commons.logging.Log;
 import org.xml.sax.ErrorHandler;

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaProcessorTransformer.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.net.URL;
 import java.util.Map;
@@ -28,11 +28,14 @@
 
 import org.apache.cocoon.pipeline.SetupException;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXTransformer;
+import org.apache.cocoon.sax.SAXConsumer;
+import org.apache.cocoon.sax.util.SAXConsumerAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.SAXException;
 
-public final class SchemaProcessorTransformer extends AbstractTransformer {
+public final class SchemaProcessorTransformer extends AbstractSAXTransformer {
 
     private final static SchemaFactory SCHEMA_FACTORY = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
 
@@ -64,12 +67,12 @@
     }
 
     @Override
-    protected void setXMLConsumer(XMLConsumer xmlConsumer) {
+    protected void setXMLConsumer(SAXConsumer xmlConsumer) {
         ValidatorHandler validatorHandler = this.schema.newValidatorHandler();
         validatorHandler.setErrorHandler(new SchemaErrorHandler(this.logger, this.source.toExternalForm()));
         validatorHandler.setContentHandler(xmlConsumer);
 
-        super.setXMLConsumer(new XMLConsumerAdapter(validatorHandler, xmlConsumer));
+        super.setXMLConsumer(new SAXConsumerAdapter(validatorHandler, xmlConsumer));
     }
 
     private void init(URL source) {

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaValidationException.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaValidationException.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/SchemaValidationException.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaValidationException.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import org.apache.cocoon.pipeline.ProcessingException;
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/StringGenerator.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/StringGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/StringGenerator.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/StringGenerator.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/StringGenerator.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/StringGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/StringGenerator.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.io.ByteArrayInputStream;
 
@@ -24,9 +24,10 @@
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.component.Starter;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXProducer;
+import org.apache.cocoon.sax.util.XMLUtils;
 
-public class StringGenerator extends AbstractXMLProducer implements Starter {
+public class StringGenerator extends AbstractSAXProducer implements Starter {
 
     private String xmlString;
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/TraxErrorListener.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/TraxErrorListener.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/TraxErrorListener.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/TraxErrorListener.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLSerializer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLSerializer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLSerializer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLSerializer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLSerializer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XMLSerializer.java Wed Feb  4 01:10:39 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.io.OutputStream;
 import java.util.Map;
@@ -32,8 +32,9 @@
 import org.apache.cocoon.pipeline.caching.CacheKey;
 import org.apache.cocoon.pipeline.caching.SimpleCacheKey;
 import org.apache.cocoon.pipeline.component.CachingPipelineComponent;
+import org.apache.cocoon.sax.AbstractSAXSerializer;
 
-public class XMLSerializer extends AbstractSerializer implements CachingPipelineComponent {
+public class XMLSerializer extends AbstractSAXSerializer implements CachingPipelineComponent {
 
     private static final SAXTransformerFactory SAX_TRANSFORMER_FACTORY = (SAXTransformerFactory) TransformerFactory
             .newInstance();

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTProcessorErrorListener.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTProcessorErrorListener.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTProcessorErrorListener.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTProcessorErrorListener.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTProcessorErrorListener.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTProcessorErrorListener.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTProcessorErrorListener.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.TransformerException;

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTTransformer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XSLTTransformer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/XSLTTransformer.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.component;
 
 import java.net.URL;
 import java.util.HashMap;
@@ -30,13 +30,16 @@
 
 import org.apache.cocoon.pipeline.SetupException;
 import org.apache.cocoon.pipeline.util.StringRepresentation;
+import org.apache.cocoon.sax.AbstractSAXTransformer;
+import org.apache.cocoon.sax.SAXConsumer;
+import org.apache.cocoon.sax.util.SAXConsumerAdapter;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-public class XSLTTransformer extends AbstractTransformer {
+public class XSLTTransformer extends AbstractSAXTransformer {
 
     private final Log log = LogFactory.getLog(XSLTTransformer.class);
     private Map<String, Object> parameters;
@@ -75,7 +78,7 @@
     }
 
     @Override
-    protected void setXMLConsumer(XMLConsumer consumer) {
+    protected void setXMLConsumer(SAXConsumer consumer) {
         TransformerHandler transformerHandler;
         try {
             transformerHandler = this.createTransformerHandler();
@@ -101,7 +104,7 @@
         TraxErrorListener traxErrorListener = new TraxErrorListener(this.log, this.source.toExternalForm());
         transformerHandler.getTransformer().setErrorListener(traxErrorListener);
 
-        super.setXMLConsumer(new XMLConsumerAdapter(transformerHandler, transformerHandler));
+        super.setXMLConsumer(new SAXConsumerAdapter(transformerHandler, transformerHandler));
     }
 
     private TransformerHandler createTransformerHandler() throws Exception {

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributeTypes.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributeTypes.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributeTypes.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributeTypes.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributeTypes.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributeTypes.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributeTypes.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 /**
  * Insert the type's description here.

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributesImpl.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributesImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributesImpl.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributesImpl.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributesImpl.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/AttributesImpl.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/AttributesImpl.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 import org.xml.sax.Attributes;
 
@@ -40,11 +40,11 @@
     }
 
     /**
-     * Add an attribute of type CDATA with empty Namespace to the end of the list.
+     * Add an attribute of type CDATA with empty namespace to the end of the list.
      * 
      * <p>
-     * For the sake of speed, this method does no checking to see if the attribute is already in the list: that is the
-     * responsibility of the application.
+     * For the sake of speed, this method does no checking to see if the attribute is already in the
+     * list: that is the responsibility of the application.
      * </p>
      * 
      * @param localName The local name.
@@ -58,8 +58,8 @@
      * Add an attribute of type CDATA with the namespace to the end of the list.
      * 
      * <p>
-     * For the sake of speed, this method does no checking to see if the attribute is already in the list: that is the
-     * responsibility of the application.
+     * For the sake of speed, this method does no checking to see if the attribute is already in the
+     * list: that is the responsibility of the application.
      * </p>
      * 
      * @param namespace The namespace.
@@ -74,14 +74,16 @@
      * Add an attribute of type CDATA to the end of the list.
      * 
      * <p>
-     * For the sake of speed, this method does no checking to see if the attribute is already in the list: that is the
-     * responsibility of the application.
+     * For the sake of speed, this method does no checking to see if the attribute is already in the
+     * list: that is the responsibility of the application.
      * </p>
      * 
-     * @param uri The Namespace URI, or the empty string if none is available or Namespace processing is not being
+     * @param uri The Namespace URI, or the empty string if none is available or Namespace
+     *            processing is not being performed.
+     * @param localName The local name, or the empty string if Namespace processing is not being
      *            performed.
-     * @param localName The local name, or the empty string if Namespace processing is not being performed.
-     * @param qName The qualified (prefixed) name, or the empty string if qualified names are not available.
+     * @param qName The qualified (prefixed) name, or the empty string if qualified names are not
+     *            available.
      * @param value The attribute value.
      */
     public void addCDATAAttribute(String uri, String localName, String qName, String value) {

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/EmbeddedSAXPipe.java (from r740229, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/EmbeddedXMLPipe.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/EmbeddedSAXPipe.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/EmbeddedSAXPipe.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/EmbeddedXMLPipe.java&r1=740229&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/EmbeddedXMLPipe.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/EmbeddedSAXPipe.java Wed Feb  4 01:10:39 2009
@@ -14,10 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
-import org.apache.cocoon.pipeline.component.sax.XMLConsumerAdapter;
+import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
@@ -31,21 +30,21 @@
  * 
  * @version $Id$
  */
-public class EmbeddedXMLPipe extends XMLConsumerAdapter {
+public class EmbeddedSAXPipe extends SAXConsumerAdapter {
 
     private boolean inDTD;
 
-    public EmbeddedXMLPipe() {
+    public EmbeddedSAXPipe() {
     }
 
-    public EmbeddedXMLPipe(ContentHandler handler) {
+    public EmbeddedSAXPipe(ContentHandler handler) {
         this.setContentHandler(handler);
         if (handler instanceof LexicalHandler) {
             this.setLexicalHandler((LexicalHandler) handler);
         }
     }
 
-    public EmbeddedXMLPipe(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
+    public EmbeddedSAXPipe(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
         super();
         this.contentHandler = contentHandler;
         this.lexicalHandler = lexicalHandler;
@@ -54,7 +53,7 @@
     /**
      * Creates an EmbeddedXMLPipe that writes into the given XMLConsumer.
      */
-    public EmbeddedXMLPipe(XMLConsumer consumer) {
+    public EmbeddedSAXPipe(SAXConsumer consumer) {
         this.setConsumer(consumer);
     }
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ImmutableAttributesImpl.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/ImmutableAttributesImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ImmutableAttributesImpl.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ImmutableAttributesImpl.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/ImmutableAttributesImpl.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/ImmutableAttributesImpl.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/ImmutableAttributesImpl.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 import org.xml.sax.Attributes;
 

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/IncludeXMLConsumer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/IncludeXMLConsumer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/IncludeXMLConsumer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/IncludeSAXConsumer.java Wed Feb  4 01:10:39 2009
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
+import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -33,14 +33,14 @@
  * </ul>
  * 
  * <p>
- * It is more complicated version of {@link EmbeddedXMLPipe} which, except being used to include other files into the
+ * It is more complicated version of {@link EmbeddedSAXPipe} which, except being used to include other files into the
  * SAX events stream, can perform optional operations described above.
  * </p>
  * 
- * @see EmbeddedXMLPipe
+ * @see EmbeddedSAXPipe
  * @version $Id$
  */
-public class IncludeXMLConsumer implements XMLConsumer {
+public class IncludeSAXConsumer implements SAXConsumer {
 
     private final ContentHandler contentHandler;
     private final LexicalHandler lexicalHandler;
@@ -53,21 +53,21 @@
     /**
      * Constructor
      */
-    public IncludeXMLConsumer(XMLConsumer consumer) {
+    public IncludeSAXConsumer(SAXConsumer consumer) {
         this(consumer, consumer);
     }
 
     /**
      * Constructor
      */
-    public IncludeXMLConsumer(ContentHandler contentHandler) {
+    public IncludeSAXConsumer(ContentHandler contentHandler) {
         this(contentHandler, contentHandler instanceof LexicalHandler ? (LexicalHandler) contentHandler : null);
     }
 
     /**
      * Constructor
      */
-    public IncludeXMLConsumer(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
+    public IncludeSAXConsumer(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
         this.contentHandler = contentHandler;
         this.lexicalHandler = lexicalHandler;
     }

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumerAdapter.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumerAdapter.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/component/sax/XMLConsumerAdapter.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SAXConsumerAdapter.java Wed Feb  4 01:10:39 2009
@@ -14,30 +14,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.component.sax;
+package org.apache.cocoon.sax.util;
 
+import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.ext.LexicalHandler;
 
-public class XMLConsumerAdapter implements XMLConsumer {
+public class SAXConsumerAdapter implements SAXConsumer {
 
     protected ContentHandler contentHandler;
     protected LexicalHandler lexicalHandler;
-    protected XMLConsumer consumer;
+    protected SAXConsumer consumer;
 
-    public XMLConsumerAdapter() {
+    public SAXConsumerAdapter() {
     }
 
-    public XMLConsumerAdapter(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
+    public SAXConsumerAdapter(ContentHandler contentHandler, LexicalHandler lexicalHandler) {
         super();
         this.contentHandler = contentHandler;
         this.lexicalHandler = lexicalHandler;
     }
 
-    public void setConsumer(XMLConsumer consumer) {
+    public void setConsumer(SAXConsumer consumer) {
         this.consumer = consumer;
         this.setContentHandler(consumer);
         this.setLexicalHandler(consumer);

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/SaxBuffer.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/SaxBuffer.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/SaxBuffer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/SaxBuffer.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -24,7 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
+import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
@@ -35,18 +35,18 @@
  * A class that can record SAX events and replay them later.
  * 
  * <p>
- * Use this class if you need to frequently generate smaller amounts of SAX events, or replay a set of recorded start
- * events immediately.
+ * Use this class if you need to frequently generate smaller amounts of SAX events, or replay a set
+ * of recorded start events immediately.
  * </p>
  * 
  * <p>
- * Both {@link ContentHandler} and {@link LexicalHandler} are supported, the only exception is that the
- * setDocumentLocator event is not recorded.
+ * Both {@link ContentHandler} and {@link LexicalHandler} are supported, the only exception is that
+ * the setDocumentLocator event is not recorded.
  * </p>
  * 
  * @version $Id$
  */
-public class SaxBuffer implements XMLConsumer, Serializable {
+public class SaxBuffer implements SAXConsumer, Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -175,8 +175,8 @@
     }
 
     /**
-     * Stream this buffer into the provided content handler. If contentHandler object implements LexicalHandler, it will
-     * get lexical events as well.
+     * Stream this buffer into the provided content handler. If contentHandler object implements
+     * LexicalHandler, it will get lexical events as well.
      */
     public void toSAX(ContentHandler contentHandler) throws SAXException {
         for (SaxBit saxbit : this.saxbits) {
@@ -480,7 +480,8 @@
         public final char[] ch;
 
         public Characters(char[] ch, int start, int length) {
-            // make a copy so that we don't hold references to a potentially large array we don't control
+            // make a copy so that we don't hold references to a potentially large array we don't
+            // control
             this.ch = new char[length];
             System.arraycopy(ch, start, this.ch, 0, length);
         }
@@ -505,7 +506,8 @@
         public final char[] ch;
 
         public Comment(char[] ch, int start, int length) {
-            // make a copy so that we don't hold references to a potentially large array we don't control
+            // make a copy so that we don't hold references to a potentially large array we don't
+            // control
             this.ch = new char[length];
             System.arraycopy(ch, start, this.ch, 0, length);
         }
@@ -562,7 +564,8 @@
         public final char[] ch;
 
         public IgnorableWhitespace(char[] ch, int start, int length) {
-            // make a copy so that we don't hold references to a potentially large array we don't control
+            // make a copy so that we don't hold references to a potentially large array we don't
+            // control
             this.ch = new char[length];
             System.arraycopy(ch, start, this.ch, 0, length);
         }

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/TransformationUtils.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/TransformationUtils.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/TransformationUtils.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/TransformationUtils.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/TransformationUtils.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/TransformationUtils.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/TransformationUtils.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
@@ -24,9 +24,9 @@
 
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.pipeline.component.sax.StringGenerator;
-import org.apache.cocoon.pipeline.component.sax.XMLSerializer;
-import org.apache.cocoon.pipeline.component.sax.XSLTTransformer;
+import org.apache.cocoon.sax.component.StringGenerator;
+import org.apache.cocoon.sax.component.XMLSerializer;
+import org.apache.cocoon.sax.component.XSLTTransformer;
 
 /**
  * This class contains utility methods to transform an XML string by using XSLT. It hides all the details of the Java

Copied: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/XMLUtils.java (from r739793, cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/XMLUtils.java)
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/XMLUtils.java?p2=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/XMLUtils.java&p1=cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/XMLUtils.java&r1=739793&r2=740554&rev=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/pipeline/util/XMLUtils.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/util/XMLUtils.java Wed Feb  4 01:10:39 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.pipeline.util;
+package org.apache.cocoon.sax.util;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
@@ -32,7 +32,8 @@
 
 import org.apache.cocoon.pipeline.PipelineException;
 import org.apache.cocoon.pipeline.ProcessingException;
-import org.apache.cocoon.pipeline.component.sax.XMLConsumer;
+import org.apache.cocoon.pipeline.util.URLConnectionUtils;
+import org.apache.cocoon.sax.SAXConsumer;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -40,14 +41,15 @@
 import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
- * Utilities for the usage of an {@link XMLReader} together with a {@link XMLConsumer}.
+ * Utilities for the usage of an {@link XMLReader} together with a {@link SAXConsumer}.
  */
 public abstract class XMLUtils {
 
-    private static final SAXTransformerFactory SAX_TRANSFORMER_FACTORY = (SAXTransformerFactory) TransformerFactory.newInstance();
+    private static final SAXTransformerFactory SAX_TRANSFORMER_FACTORY = (SAXTransformerFactory) TransformerFactory
+            .newInstance();
 
     /**
-     * Serialize the content of a {@link SaxBuffer} into an {@link OutputStream}.
+     * Serialize the content of a {@link SAXBuffer} into an {@link OutputStream}.
      * 
      * @param outputStream OutputStream to use.
      * @param saxBuffer A SaxBuffer containing the SAX events.
@@ -61,7 +63,7 @@
             transformerHandler.setResult(new StreamResult(outputStream));
 
             transformerHandler.startDocument();
-            saxBuffer.toSAX(new EmbeddedXMLPipe(transformerHandler));
+            saxBuffer.toSAX(new EmbeddedSAXPipe(transformerHandler));
             transformerHandler.endDocument();
         } catch (Exception e) {
             throw new ProcessingException("Can't stream the provided SaxBuffer.", e);
@@ -69,38 +71,39 @@
     }
 
     /**
-     * Use a SAX parser and read the content of an {@link InputStream} into an {@link XMLConsumer}.
+     * Use a SAX parser and read the content of an {@link InputStream} into an {@link SAXConsumer}.
      * 
      * @param inputStream InputStream containing the content to be parsed.
      * @param xmlConsumer The XMLConsumer to use.
      * @throws IOException if the {@link InputStream} can't be used.
      * @throws SAXException if the {@link InputStream} can't be parsed.
      */
-    public static void toSax(final InputStream inputStream, final XMLConsumer xmlConsumer) throws IOException, SAXException {
+    public static void toSax(final InputStream inputStream, final SAXConsumer xmlConsumer) throws IOException,
+            SAXException {
         createXMLReader(xmlConsumer).parse(new InputSource(new BufferedInputStream(inputStream)));
     }
 
     /**
-     * Use a SAX parser and read the content of an {@link InputStream} into an {@link XMLConsumer}.
+     * Use a SAX parser and read the content of an {@link InputStream} into an {@link SAXConsumer}.
      * 
      * @param string A String to be parsed.
      * @param xmlConsumer The XMLConsumer to use.
      * @throws IOException if the {@link InputStream} can't be used.
      * @throws SAXException if the {@link InputStream} can't be parsed.
      */
-    public static void toSax(final String string, final XMLConsumer xmlConsumer) throws IOException, SAXException {
+    public static void toSax(final String string, final SAXConsumer xmlConsumer) throws IOException, SAXException {
         createXMLReader(xmlConsumer).parse(new InputSource(new StringReader(string)));
     }
 
     /**
-     * Stream a {@link URLConnection} into an {@link XMLConsumer} by using
-     * {@link XMLUtils#toSax(InputStream, XMLConsumer)}. The {@link URLConnection} is closed after
+     * Stream a {@link URLConnection} into an {@link SAXConsumer} by using
+     * {@link XMLUtils#toSax(InputStream, SAXConsumer)}. The {@link URLConnection} is closed after
      * streaming.
      * 
      * @param The {@link URLConnection} to be streamed.
-     * @param An {@link XMLConsumer} as target.
+     * @param An {@link SAXConsumer} as target.
      */
-    public static void toSax(URLConnection urlConnection, XMLConsumer xmlConsumer) {
+    public static void toSax(URLConnection urlConnection, SAXConsumer xmlConsumer) {
         try {
             InputStream inputStream = urlConnection.getInputStream();
             XMLUtils.toSax(inputStream, xmlConsumer);
@@ -113,7 +116,7 @@
         }
     }
 
-    private static XMLReader createXMLReader(final XMLConsumer xmlConsumer) {
+    private static XMLReader createXMLReader(final SAXConsumer xmlConsumer) {
         XMLReader xmlReader;
         try {
             xmlReader = XMLReaderFactory.createXMLReader();

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformerTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformerTest.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformerTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/component/sax/SchemaProcessorTransformerTest.java Wed Feb  4 01:10:39 2009
@@ -24,6 +24,10 @@
 
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
+import org.apache.cocoon.sax.component.SchemaProcessorTransformer;
+import org.apache.cocoon.sax.component.SchemaValidationException;
+import org.apache.cocoon.sax.component.StringGenerator;
+import org.apache.cocoon.sax.component.XMLSerializer;
 import org.custommonkey.xmlunit.Diff;
 import org.junit.Test;
 

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/util/TransformationUtilsTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/util/TransformationUtilsTest.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/util/TransformationUtilsTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/pipeline/util/TransformationUtilsTest.java Wed Feb  4 01:10:39 2009
@@ -22,6 +22,7 @@
 
 import junit.framework.TestCase;
 
+import org.apache.cocoon.sax.util.TransformationUtils;
 import org.custommonkey.xmlunit.Diff;
 
 public class TransformationUtilsTest extends TestCase {

Modified: cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/PipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/PipelineTest.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/PipelineTest.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/test/java/org/apache/cocoon/sax/PipelineTest.java Wed Feb  4 01:10:39 2009
@@ -24,9 +24,9 @@
 
 import org.apache.cocoon.pipeline.NonCachingPipeline;
 import org.apache.cocoon.pipeline.Pipeline;
-import org.apache.cocoon.pipeline.component.sax.StringGenerator;
-import org.apache.cocoon.pipeline.component.sax.XMLSerializer;
-import org.apache.cocoon.pipeline.component.sax.XSLTTransformer;
+import org.apache.cocoon.sax.component.StringGenerator;
+import org.apache.cocoon.sax.component.XMLSerializer;
+import org.apache.cocoon.sax.component.XSLTTransformer;
 import org.custommonkey.xmlunit.Diff;
 
 public class PipelineTest extends TestCase {

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/component/RequestParametersGenerator.java Wed Feb  4 01:10:39 2009
@@ -24,13 +24,13 @@
 import javax.servlet.http.HttpServletRequest;
 
 import org.apache.cocoon.pipeline.component.Starter;
-import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
+import org.apache.cocoon.sax.AbstractSAXProducer;
 import org.apache.cocoon.servlet.util.HttpContextHelper;
 import org.apache.cocoon.sitemap.InvocationException;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
-public class RequestParametersGenerator extends AbstractXMLProducer implements Starter {
+public class RequestParametersGenerator extends AbstractSAXProducer implements Starter {
 
     private Map<String, Object> parameters;
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServiceConsumerGenerator.java Wed Feb  4 01:10:39 2009
@@ -25,11 +25,11 @@
 import org.apache.cocoon.pipeline.PipelineException;
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.component.Starter;
-import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXProducer;
+import org.apache.cocoon.sax.util.XMLUtils;
 import org.apache.cocoon.servlet.util.HttpContextHelper;
 
-public class ServiceConsumerGenerator extends AbstractXMLProducer implements Starter {
+public class ServiceConsumerGenerator extends AbstractSAXProducer implements Starter {
 
     private Map<String, ? extends Object> inputParameters;
 

Modified: cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java?rev=740554&r1=740553&r2=740554&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-servlet/src/main/java/org/apache/cocoon/servlet/ssf/ServletServiceGenerator.java Wed Feb  4 01:10:39 2009
@@ -21,10 +21,10 @@
 
 import org.apache.cocoon.pipeline.ProcessingException;
 import org.apache.cocoon.pipeline.component.Starter;
-import org.apache.cocoon.pipeline.component.sax.AbstractXMLProducer;
-import org.apache.cocoon.pipeline.util.XMLUtils;
+import org.apache.cocoon.sax.AbstractSAXProducer;
+import org.apache.cocoon.sax.util.XMLUtils;
 
-public class ServletServiceGenerator extends AbstractXMLProducer implements Starter {
+public class ServletServiceGenerator extends AbstractSAXProducer implements Starter {
 
     private URL service;
 



Mime
View raw message