svn commit: r490567 [1/2] - in /cocoon/trunk/core: cocoon-common/src/main/java/org/apache/cocoon/ cocoon-core/ cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/cocoon/components/source/ cocoon-core/src/main/java/org/apa...

[da...@apache.org]

Author: danielf
Date: Wed Dec 27 13:10:05 2006
New Revision: 490567

URL: http://svn.apache.org/viewvc?view=rev&rev=490567
Log:
Starting to move generators, transformers, serializers, readers and sources that can be used in a pipeline without needing a sitemap, to cocoon-pipeline-components. Their dependencies are also moved when needed.
* I needed to factor out part of the SourceUtil to a new class as the SourceUtil depends on sitemap specific classes.
* xpointer and xslt components are moved to cocoon-pipeline-components
* Abstract sitemap component classes are moved to cocoon-pipeline-impl
* I didn't move the CIncludeTransformer, I18nTransformer and Includetransformer as their dependencies is more complicated and need more though.
* Configuration files and tests are not moved yet.

Added:
    cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/CascadingIOException.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/CascadingIOException.java
    cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/Modifiable.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Modifiable.java
    cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ResourceNotFoundException.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ResourceNotFoundException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/   (with props)
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/EmptySource.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/EmptySource.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/EmptySourceFactory.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/EmptySourceFactory.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/ZipSource.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ZipSource.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/PointerPart.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/PointerPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ShorthandPart.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/ShorthandPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/UnsupportedPart.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/UnsupportedPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointerPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XmlnsPart.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/
      - copied from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/ParseException.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/ParseException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/SimpleCharStream.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/Token.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/Token.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/TokenMgrError.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/TokenMgrError.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserConstants.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserConstants.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/
      - copied from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxErrorListener.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxErrorListener.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java
      - copied, changed from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/CalendarGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/CalendarGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/ExceptionGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ExceptionGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FileGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/RequestGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/RequestParseException.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ImageReader.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/LinkSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/LinkSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/TextSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/TextSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/XMLSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/XMLSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/AugmentTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AugmentTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/FilterTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/FilterTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/LogTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java
      - copied, changed from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/
      - copied from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/ItemGroup.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/PageRules.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/PageRules.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/Pagesheet.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/Pagesheet.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/pagination/Paginator.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/Paginator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/URLRewriter.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/URLRewriter.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/impl/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/util/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/source/util/SourceUtil.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/generation/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/generation/AbstractGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/AbstractGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/generation/ServiceableGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ServiceableGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/generation/ServletGenerator.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ServletGenerator.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/reading/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/reading/AbstractReader.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/AbstractReader.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/reading/ServiceableReader.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ServiceableReader.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/serialization/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/serialization/AbstractSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/helpers/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/transformation/helpers/TextRecorder.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/TextRecorder.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ByteRange.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ByteRange.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/FileFormatException.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/FileFormatException.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ImageProperties.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ImageProperties.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ImageUtils.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ImageUtils.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/MIMEUtils.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/ResizableContainer.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ResizableContainer.java
    cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/xlink/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/xlink/XLinkHandler.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/xlink/XLinkHandler.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
      - copied unchanged from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/xlink/
      - copied from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/xlink/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/xlink/XLinkPipe.java
      - copied unchanged from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/xlink/XLinkPipe.java
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/CascadingIOException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Modifiable.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ResourceNotFoundException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/URLRewriter.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/EmptySource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/EmptySourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/MultiSourceValidity.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/TraversableContextSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ZipSource.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/ZipSourceFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/AbstractGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/CSVGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/CalendarGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ExceptionGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FileGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FragmentExtractorGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ImageDirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/LinkStatusGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/MP3DirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/RequestParseException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ServiceableGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/ServletGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/SessionAttributeGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/AbstractReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ImageReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ServiceableReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/HTMLSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/LinkSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/TextSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/XMLSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/ZipArchiveSerializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractDOMTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractExtractionTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AbstractTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/AugmentTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/EncodeURLTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/FilterTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/FragmentExtractorTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/LogTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ReadDOMSessionTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/RoleFilterTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/ServiceableTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/NOPRecorder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/ParametersRecorder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/helpers/TextRecorder.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/pagination/
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ByteRange.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/FileFormatException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ImageProperties.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ImageUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/MIMEUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/ResizableContainer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/TraxErrorHandler.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/xlink/
    cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/xlink/XLinkHandler.java
Modified:
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/SourceUtil.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
    cocoon/trunk/core/cocoon-pipeline/pom.xml

Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=490567&r1=490566&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Wed Dec 27 13:10:05 2006
@@ -122,6 +122,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-components</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-pipeline-impl</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/SourceUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/SourceUtil.java?view=diff&rev=490567&r1=490566&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/SourceUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/SourceUtil.java Wed Dec 27 13:10:05 2006
@@ -17,36 +17,16 @@
 package org.apache.cocoon.components.source;
 
 import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;
-import org.apache.cocoon.util.NetUtils;
 import org.apache.cocoon.xml.IncludeXMLConsumer;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.excalibur.source.Source;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.SourceNotFoundException;
-import org.apache.excalibur.source.SourceParameters;
-import org.apache.excalibur.source.SourceResolver;
-import org.apache.excalibur.xml.sax.SAXParser;
-import org.apache.excalibur.xml.sax.XMLizable;
-import org.apache.excalibur.xmlizer.XMLizer;
-import org.apache.regexp.RE;
-import org.apache.regexp.RECompiler;
-import org.apache.regexp.REProgram;
-import org.apache.regexp.RESyntaxException;
 import org.w3c.dom.Document;
 import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
@@ -54,7 +34,7 @@
  *
  * @version $Id$
  */
-public abstract class SourceUtil {
+public abstract class SourceUtil extends org.apache.cocoon.components.source.util.SourceUtil{
 
     /**
      * Get the current sitemap component manager.
@@ -67,52 +47,6 @@
         return EnvironmentHelper.getSitemapServiceManager(); 
     }
 
-    private static REProgram uripattern;
-
-    static {
-        try {
-            uripattern = new RECompiler().compile("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?$");
-        } catch (RESyntaxException e) {
-            // Should not happen
-            throw new RuntimeException("Error parsing regular expression.", e);
-        }
-    }
-
-    /**
-     * Generates SAX events from the XMLizable and handle SAXException.
-     *
-     * @param  source    the data
-     */
-    static public void toSAX(XMLizable      source,
-                             ContentHandler handler)
-    throws SAXException, IOException, ProcessingException {
-        try {
-            source.toSAX(handler);
-        } catch (SAXException e) {
-            // Unwrap ProcessingException, IOException, and extreme cases of SAXExceptions.
-            // Handle SourceException.
-            // See also handleSAXException
-            final Exception cause = e.getException();
-            if (cause != null) {
-                if (cause instanceof SourceException) {
-                    throw handle((SourceException) cause);
-                }
-                if (cause instanceof ProcessingException) {
-                    throw (ProcessingException) cause;
-                }
-                if (cause instanceof IOException) {
-                    throw (IOException) cause;
-                }
-                if (cause instanceof SAXException) {
-                    throw (SAXException) cause;
-                }
-            }
-
-            // Throw original SAX exception
-            throw e;
-        }
-    }
-
     /**
      * Generates SAX events from the given source.
      *
@@ -150,46 +84,6 @@
     }
 
     /**
-     * Generates SAX events from the given source by using XMLizer.
-     *
-     * <p><b>NOTE</b>: If the implementation can produce lexical events,
-     * care should be taken that <code>handler</code> can actually
-     * directly implement the LexicalHandler interface!</p>
-     *
-     * @param  source    the data
-     * @throws ProcessingException if no suitable converter is found
-     */
-    static public void toSAX(ServiceManager manager,
-                             Source         source,
-                             String         mimeTypeHint,
-                             ContentHandler handler)
-    throws SAXException, IOException, ProcessingException {
-        if (source instanceof XMLizable) {
-            toSAX((XMLizable) source, handler);
-        } else {
-            String mimeType = source.getMimeType();
-            if (null == mimeType) {
-                mimeType = mimeTypeHint;
-            }
-
-            XMLizer xmlizer = null;
-            try {
-                xmlizer = (XMLizer) manager.lookup(XMLizer.ROLE);
-                xmlizer.toSAX(source.getInputStream(),
-                              mimeType,
-                              source.getURI(),
-                              handler);
-            } catch (SourceException e) {
-                throw SourceUtil.handle(e);
-            } catch (ServiceException e) {
-                throw new ProcessingException("Exception during streaming source.", e);
-            } finally {
-                manager.release(xmlizer);
-            }
-        }
-    }
-
-    /**
      * Generates SAX events from the given source with possible URL rewriting.
      *
      * <p><b>NOTE</b>: If the implementation can produce lexical events,
@@ -223,66 +117,6 @@
     }
 
     /**
-     * Generates character SAX events from the given source.
-     *
-     * @param source The data
-     * @param encoding The character encoding of the data
-     */
-    static public void toCharacters(Source source,
-                                    String encoding,
-                                    ContentHandler handler)
-    throws SAXException, IOException, ProcessingException {
-        try {
-            Reader r = encoding == null?
-                    new InputStreamReader(source.getInputStream()):
-                    new InputStreamReader(source.getInputStream(), encoding);
-
-            int len;
-            char[] chr = new char[4096];
-            try {
-                while ((len = r.read(chr)) > 0) {
-                    handler.characters(chr, 0, len);
-                }
-            } finally {
-                r.close();
-            }
-        } catch (SAXException e) {
-            handleSAXException(source.getURI(), e);
-        }
-    }
-
-    /**
-     * Generates SAX events from the given source by parsing it.
-     *
-     * <p><b>NOTE</b>: If the implementation can produce lexical events,
-     * care should be taken that <code>handler</code> can actually
-     * directly implement the LexicalHandler interface!</p>
-     *
-     * @param  source    the data
-     * @throws ProcessingException if no suitable converter is found
-     */
-    static public void parse(ServiceManager manager,
-                             Source source,
-                             ContentHandler handler)
-    throws SAXException, IOException, ProcessingException {
-        if (source instanceof XMLizable) {
-            toSAX((XMLizable) source, handler);
-        } else {
-            SAXParser parser = null;
-            try {
-                parser = (SAXParser) manager.lookup(SAXParser.ROLE);
-                parser.parse(getInputSource(source), handler);
-            } catch (SourceException e) {
-                throw SourceUtil.handle(e);
-            } catch (ServiceException e) {
-                throw new ProcessingException("Exception during parsing source.", e);
-            } finally {
-                manager.release(parser);
-            }
-        }
-    }
-
-    /**
      * Generates a DOM from the given source
      * @param source The data
      *
@@ -305,348 +139,5 @@
         }
 
         return document;
-    }
-
-    /**
-     * Generates a DOM from the given source
-     * @param source The data
-     *
-     * @return Created DOM document.
-     *
-     * @throws IOException If a io exception occurs.
-     * @throws ProcessingException if no suitable converter is found
-     * @throws SAXException If a SAX exception occurs.
-     */
-    static public Document toDOM(ServiceManager manager, Source source)
-    throws SAXException, IOException, ProcessingException {
-        DOMBuilder builder = new DOMBuilder();
-
-        toSAX(manager, source, null, builder);
-
-        Document document = builder.getDocument();
-        if (document == null) {
-            throw new ProcessingException("Could not build DOM for '" +
-                                          source.getURI() + "'");
-        }
-
-        return document;
-    }
-
-    /**
-     * Generates a DOM from the given source
-     * @param source The data
-     *
-     * @return Created DOM document.
-     *
-     * @throws IOException If a io exception occurs.
-     * @throws ProcessingException if no suitable converter is found
-     * @throws SAXException If a SAX exception occurs.
-     */
-    static public Document toDOM(ServiceManager manager, String mimeTypeHint, Source source)
-    throws SAXException, IOException, ProcessingException {
-        DOMBuilder builder = new DOMBuilder();
-
-        toSAX(manager, source, mimeTypeHint, builder);
-
-        Document document = builder.getDocument();
-        if (document == null) {
-            throw new ProcessingException("Could not build DOM for '" +
-                                          source.getURI() + "'");
-        }
-
-        return document;
-    }
-
-    /**
-     * Make a ProcessingException from a SourceException.
-     * If the exception is a SourceNotFoundException then a
-     * ResourceNotFoundException is thrown.
-     *
-     * @param se Source exception
-     * @return Created processing exception.
-     */
-    static public ProcessingException handle(SourceException se) {
-        if (se instanceof SourceNotFoundException) {
-            return new ResourceNotFoundException("Resource not found.", se);
-        }
-        return new ProcessingException("Exception during source resolving.",
-                                       se);
-    }
-
-    /**
-     * Make a ProcessingException from a SourceException.
-     * If the exception is a SourceNotFoundException then a
-     * ResourceNotFoundException is thrown.
-     *
-     * @param message Additional exception message.
-     * @param se Source exception.
-     * @return Created processing exception.
-     */
-    static public ProcessingException handle(String message,
-                                             SourceException se) {
-        if (se instanceof SourceNotFoundException) {
-            return new ResourceNotFoundException(message, se);
-        }
-        return new ProcessingException(message, se);
-    }
-
-    /**
-     * Handle SAXException catched in Generator's generate method.
-     *
-     * @param source Generator's source
-     * @param e SAXException happened in the generator's generate method.
-     */
-    static public void handleSAXException(String source, SAXException e)
-    throws ProcessingException, IOException, SAXException {
-        final Exception cause = e.getException();
-        if (cause != null) {
-            // Unwrap ProcessingException, IOException, and extreme cases of SAXExceptions.
-            // Handle SourceException.
-            // See also toSax(XMLizable, ContentHandler)
-            if (cause instanceof SourceException) {
-                throw handle((SourceException) cause);
-            }
-            if (cause instanceof ProcessingException) {
-                throw (ProcessingException) cause;
-            }
-            if (cause instanceof IOException) {
-                throw (IOException) cause;
-            }
-            if (cause instanceof SAXException) {
-                throw (SAXException) cause;
-            }
-            throw new ProcessingException("Could not read resource " +
-                                          source, cause);
-        }
-        throw e;
-    }
-
-    /**
-     * Get an InputSource object
-     *
-     * @param source Source.
-     *
-     * @return Input stream of the source.
-     *
-     * @throws IOException If a io exception occurs.
-     * @throws ProcessingException If an exception occurs during
-     *                             processing.
-     */
-    static public InputSource getInputSource(Source source)
-    throws IOException, ProcessingException {
-        try {
-            final InputSource newObject = new InputSource(source.getInputStream());
-
-            newObject.setSystemId(source.getURI());
-            return newObject;
-        } catch (SourceException se) {
-            throw handle(se);
-        }
-    }
-
-    /**
-     * Get a <code>Source</code> object
-     *
-     * @param uri URI of the source.
-     * @param typeParameters Type of Source query.  Currently, only
-     * <code>method</code> parameter (value typically <code>GET</code> or
-     * <code>POST</code>) is recognized.  May be <code>null</code>.
-     * @param resourceParameters Parameters of the source.  May be <code>null</code>
-     * @param resolver Resolver for the source.
-     *
-     * @return The resolved source.
-     *
-     * @throws IOException If a io exception occurs.
-     * @throws SAXException If a SAX exception occurs.
-     * @throws SourceException If the source an exception throws.
-     */
-    static public Source getSource(String uri,
-                                   Parameters typeParameters,
-                                   SourceParameters resourceParameters,
-                                   SourceResolver resolver)
-    throws IOException, SAXException, SourceException {
-
-        // first step: encode parameters which are already appended to the url
-        int queryPos = uri.indexOf('?');
-        if (queryPos != -1) {
-            String queryString = uri.substring(queryPos+1);
-            SourceParameters queries = new SourceParameters(queryString);
-
-            if (queries.hasParameters()) {
-                StringBuffer buffer = new StringBuffer(uri.substring(0, queryPos));
-                char separator = '?';
-
-                Iterator i = queries.getParameterNames();
-                while (i.hasNext()) {
-                    String current = (String) i.next();
-                    Iterator values = queries.getParameterValues(current);
-                    while (values.hasNext()) {
-                        buffer.append(separator)
-                                .append(current)
-                                .append('=')
-                                .append(NetUtils.encode((String) values.next(), "utf-8"));
-                        separator = '&';
-                    }
-                }
-                uri = buffer.toString();
-            }
-        }
-
-        String method = ((typeParameters!=null)
-                         ? typeParameters.getParameter("method", "GET")
-                         : "GET");
-        if (method.equalsIgnoreCase("POST") &&
-                (resourceParameters == null ||
-                !resourceParameters.hasParameters())) {
-            method = "GET";
-        }
-
-        if (uri.startsWith("cocoon:") && resourceParameters != null &&
-                resourceParameters.hasParameters()) {
-            int pos = uri.indexOf(";jsessionid=");
-
-            StringBuffer buf;
-            if (pos == -1) {
-                buf = new StringBuffer(uri);
-            } else {
-                buf = new StringBuffer(uri.substring(0, pos));
-            }
-            buf.append(((uri.indexOf('?') == -1) ? '?' : '&'));
-            buf.append(resourceParameters.getEncodedQueryString());
-            uri = buf.toString();
-        }
-
-        Map resolverParameters = new HashMap();
-        resolverParameters.put(SourceResolver.METHOD, method);
-        if (typeParameters != null) {
-            String encoding = typeParameters.getParameter("encoding",
-                 System.getProperty("file.encoding", "ISO-8859-1"));
-            if (encoding != null && !"".equals(encoding)) {
-                resolverParameters.put(SourceResolver.URI_ENCODING, encoding);
-            }
-        }
-        resolverParameters.put(SourceResolver.URI_PARAMETERS,
-                               resourceParameters);
-
-        return resolver.resolveURI(uri, null, resolverParameters);
-    }
-
-    /**
-     * Return the scheme of a URI. Just as there are many different methods
-     * of access to resources, there are a variety of schemes for identifying
-     * such resources.
-     * (see <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>).
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Scheme of the URI.
-     */
-    public static String getScheme(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(2);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
-    }
-
-    /**
-     * Return the authority of a URI. This authority is
-     * typically defined by an Internet-based server or a scheme-specific
-     * registry of naming authorities
-     * (see <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>).
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Scheme of the URI.
-     */
-    public static String getAuthority(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(4);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
-    }
-
-    /**
-     * Return the path of a URI. The path contains data, specific to the
-     * authority (or the scheme if there is no authority component),
-     * identifying the resource within the scope of that scheme and authority
-     * (see <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>).
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Path of the URI.
-     */
-    public static String getPath(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(5);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
-    }
-
-    /**
-     * Return the path of a URI, if the URI can't contains a authority.
-     * This implementation differ to the RFC 2396.
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Path of the URI.
-     */
-    public static String getPathWithoutAuthority(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(4) + re.getParen(5);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
-    }
-
-    /**
-     * Return the query of a URI. The query is a string of information to
-     * be interpreted by the resource
-     * (see <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>).
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Query of the URI.
-     */
-    public static String getQuery(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(7);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
-    }
-
-    /**
-     * Return the fragment of a URI. When a URI reference is used to perform
-     * a retrieval action on the identified resource, the optional fragment
-     * identifier, consists of additional reference information to be
-     * interpreted by the user agent after the retrieval action has been
-     * successfully completed
-     * (see <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>).
-     *
-     * @param uri Uniform resource identifier.
-     *
-     * @return Fragment of the URI.
-     */
-    public static String getFragment(String uri) {
-        RE re = new RE(uripattern);
-        if (re.match(uri)) {
-            return re.getParen(9);
-        } else {
-            throw new IllegalArgumentException("'" + uri +
-                                               "' is not a correct URI");
-        }
     }
 }

Propchange: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Dec 27 13:10:05 2006
@@ -0,0 +1 @@
+target

Added: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml?view=auto&rev=490567
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (added)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Wed Dec 27 13:10:05 2006
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<!--+
+    | @version $Id$
+    |
+    +-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-pipeline</artifactId>
+    <version>2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-pipeline-components</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Cocoon Pipeline Components</name>
+  <dependencies>
+    <!-- Cocoon -->
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-environment-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-util</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/ElementPathPart.java Wed Dec 27 13:10:05 2006
@@ -20,7 +20,7 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.ProcessingException;
 
 import java.util.StringTokenizer;
@@ -51,7 +51,7 @@
         PathInclusionPipe pipe = new PathInclusionPipe(expression, xpointerContext);
         pipe.setConsumer(xpointerContext.getXmlConsumer());
         try {
-            SourceUtil.toSAX(xpointerContext.getSource(), pipe);
+            SourceUtil.toSAX(xpointerContext.getServiceManager(), xpointerContext.getSource(), pipe);
         } catch (IOException e) {
             throw new SAXException("Exception while trying to XInclude data: " + e.getMessage(), e);
         } catch (ProcessingException e) {

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xpointer/XPointerContext.java Wed Dec 27 13:10:05 2006
@@ -21,7 +21,7 @@
 import org.apache.excalibur.xml.xpath.PrefixResolver;
 import org.apache.avalon.framework.logger.Logger;
 import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.xml.XMLConsumer;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.xml.sax.SAXException;
@@ -60,7 +60,7 @@
     public Document getDocument() throws SAXException, ResourceNotFoundException {
         if (document == null) {
             try {
-                document = SourceUtil.toDOM(source);
+                document = SourceUtil.toDOM(manager, source);
             } catch (ResourceNotFoundException e) {
                 throw e;
             } catch (Exception e) {

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java (from r490563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java&r1=490563&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java Wed Dec 27 13:10:05 2006
@@ -48,7 +48,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceResolver;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java Wed Dec 27 13:10:05 2006
@@ -20,7 +20,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FileGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FileGenerator.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/FileGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/FileGenerator.java Wed Dec 27 13:10:05 2006
@@ -19,7 +19,7 @@
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.core.xml.SAXParser;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.sitemap.DisposableSitemapComponent;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/TraversableGenerator.java Wed Dec 27 13:10:05 2006
@@ -20,7 +20,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.components.source.impl.MultiSourceValidity;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.excalibur.source.Source;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathDirectoryGenerator.java Wed Dec 27 13:10:05 2006
@@ -29,7 +29,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.ProcessingException;
 
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 
 import org.apache.cocoon.environment.SourceResolver;
 

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/generation/XPathTraversableGenerator.java Wed Dec 27 13:10:05 2006
@@ -25,7 +25,7 @@
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.Context;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.SourceResolver;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/reading/ResourceReader.java Wed Dec 27 13:10:05 2006
@@ -24,7 +24,7 @@
 
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.Context;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/LogTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/LogTransformer.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/LogTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/LogTransformer.java Wed Dec 27 13:10:05 2006
@@ -20,7 +20,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.SourceResolver;
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/SourceWritingTransformer.java Wed Dec 27 13:10:05 2006
@@ -27,7 +27,7 @@
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.serialization.Serializer;
 import org.apache.cocoon.xml.XMLUtils;
@@ -614,7 +614,7 @@
             // Insert?
             if (exists && this.state == STATE_INSERT) {
                 message = "content inserted at: " + path;
-                resource = SourceUtil.toDOM(source);
+                resource = SourceUtil.toDOM(this.manager, source);
                 // import the fragment
                 Node importNode = resource.importNode(fragment, true);
                 // get the node

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TeeTransformer.java Wed Dec 27 13:10:05 2006
@@ -32,7 +32,7 @@
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.util.ClassUtils;
 import org.apache.excalibur.source.ModifiableSource;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/TraxTransformer.java Wed Dec 27 13:10:05 2006
@@ -41,7 +41,7 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.components.xslt.TraxErrorListener;
 import org.apache.cocoon.environment.Cookie;
 import org.apache.cocoon.environment.ObjectModelHelper;

Copied: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java (from r490536, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java?view=diff&rev=490567&p1=cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java&r1=490536&p2=cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/java/org/apache/cocoon/transformation/XIncludeTransformer.java Wed Dec 27 13:10:05 2006
@@ -35,7 +35,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.caching.CacheableProcessingComponent;
-import org.apache.cocoon.components.source.SourceUtil;
+import org.apache.cocoon.components.source.util.SourceUtil;
 import org.apache.cocoon.components.source.impl.MultiSourceValidity;
 import org.apache.cocoon.components.xpointer.XPointer;
 import org.apache.cocoon.components.xpointer.XPointerContext;
@@ -478,7 +478,7 @@
                             }
                             xptr.process(context);
                         } else {
-                            SourceUtil.toSAX(url, new IncludeXMLConsumer(subPipe));
+                            SourceUtil.toSAX(manager, url, new IncludeXMLConsumer(subPipe));
                         }
                         // restore locator on the consumer
                         if (locator != null)

Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml?view=diff&rev=490567&r1=490566&r2=490567
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Wed Dec 27 13:10:05 2006
@@ -41,6 +41,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-configuration-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-util</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
@@ -59,6 +64,12 @@
       <groupId>org.apache.excalibur.containerkit.instrument</groupId>
       <artifactId>excalibur-instrument-api</artifactId>
       <version>2.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
     </dependency>
   </dependencies>
 </project>