You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/12/27 17:47:43 UTC
svn commit: r490536 - in /cocoon/trunk/core:
cocoon-common/src/main/java/org/apache/cocoon/
cocoon-common/src/main/java/org/apache/cocoon/util/location/ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/
cocoon-core/src/main/java/org/apache/coco...
Author: danielf
Date: Wed Dec 27 08:47:40 2006
New Revision: 490536
URL: http://svn.apache.org/viewvc?view=rev&rev=490536
Log:
Moving the pipeline implementations to the cocoon-pipeline-impl module. To make this possible the caching package is moved to cocoon-pipeline and split into API and implementation. The components.sax and part of xml and xml.dom packages are moved to the cocoon-xml-impl package. The xml APIs from cocoon-pipeline-api are moved to cocoon-xml-api. Some utility classes are moved from cocoon-core as well.
Added:
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ConnectionResetException.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ConnectionResetException.java
cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/util/location/LocationAttributes.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocationAttributes.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/caching/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/caching/Cache.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/Cache.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/caching/CacheableProcessingComponent.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/CacheableProcessingComponent.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/caching/CachedResponse.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/CachedResponse.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/CachingOutputStream.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/CachingOutputStream.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/ComponentCacheKey.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/ComponentCacheKey.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/IdentifierCacheKey.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/IdentifierCacheKey.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/PipelineCacheKey.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/PipelineCacheKey.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/
- copied from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/impl/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/impl/CacheImpl.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/
- copied from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/BaseCachingProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/CachingPointProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/CachingProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/ExpiresCachingProcessingPipeline.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/pipeline/impl/NonCachingProcessingPipeline.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/NonCachingProcessingPipeline.java
cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/HashUtil.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/HashUtil.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/
- copied from r490461, cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/AttributeTypes.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AttributeTypes.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLFragment.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLFragment.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLPipe.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLPipe.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLProducer.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLProducer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/
- copied from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamCompiler.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamCompiler.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/DocumentLocatorException.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/DocumentLocatorException.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamCompiler.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamConstants.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamConstants.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamFragment.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamFragment.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLInputStreamInterpreter.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLInputStreamInterpreter.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLOutputStreamCompiler.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLOutputStreamCompiler.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/XMLTeePipe.java
- copied unchanged from r490512, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/XMLTeePipe.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractSAXFragment.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractSAXFragment.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLPipe.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLPipe.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AttributesImpl.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AttributesImpl.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/DefaultLexicalHandler.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DefaultLexicalHandler.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/ImmutableAttributesImpl.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/ImmutableAttributesImpl.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/SaxBuffer.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/SaxBuffer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/XMLUtils.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLUtils.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/DOMBuilder.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMBuilder.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/DOMStreamer.java
- copied unchanged from r490493, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMStreamer.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/DOMUtil.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMUtil.java
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/DomHelper.java
- copied unchanged from r490461, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DomHelper.java
Removed:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ConnectionResetException.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/caching/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/HashUtil.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractSAXFragment.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLPipe.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AttributeTypes.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/AttributesImpl.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/DefaultLexicalHandler.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/ImmutableAttributesImpl.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/SaxBuffer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLFragment.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLUtils.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMBuilder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMStreamer.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DOMUtil.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/dom/DomHelper.java
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/
Modified:
cocoon/trunk/core/cocoon-core/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/ (props changed)
Modified: cocoon/trunk/core/cocoon-core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/pom.xml?view=diff&rev=490536&r1=490535&r2=490536
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Wed Dec 27 08:47:40 2006
@@ -122,7 +122,7 @@
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-pipeline-api</artifactId>
+ <artifactId>cocoon-pipeline-impl</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -347,12 +347,6 @@
<scope>test</scope>
</dependency>
<!-- runtime dependencies -->
- <dependency>
- <groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-pipeline-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-store-impl</artifactId>
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml?view=diff&rev=490536&r1=490535&r2=490536
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Wed Dec 27 08:47:40 2006
@@ -39,46 +39,12 @@
<artifactId>cocoon-environment-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
- <!-- excalibur -->
<dependency>
- <groupId>org.apache.excalibur.components.xmlutil</groupId>
- <artifactId>excalibur-xmlutil</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.excalibur.testcase</groupId>
- <artifactId>excalibur-testcase</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
- <artifactId>excalibur-pool-instrumented</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.pool</groupId>
- <artifactId>excalibur-pool-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avalon.framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.store</groupId>
- <artifactId>excalibur-store</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.components.sourceresolve</groupId>
- <artifactId>excalibur-sourceresolve</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.excalibur.containerkit.instrument</groupId>
- <artifactId>excalibur-instrument-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xml-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!-- excalibur -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
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=490536&r1=490535&r2=490536
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Wed Dec 27 08:47:40 2006
@@ -33,10 +33,32 @@
<packaging>jar</packaging>
<name>Cocoon Pipeline Implementation</name>
<dependencies>
+ <!-- Cocoon -->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-pipeline-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>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-xml-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <!-- Excalibur -->
+ <dependency>
+ <groupId>org.apache.excalibur.components.store</groupId>
+ <artifactId>excalibur-store</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <artifactId>excalibur-instrument-api</artifactId>
+ <version>2.1</version>
</dependency>
</dependencies>
</project>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml?view=diff&rev=490536&r1=490535&r2=490536
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml Wed Dec 27 08:47:40 2006
@@ -32,4 +32,50 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Cocoon XML API</name>
+ <dependencies>
+ <!-- excalibur -->
+ <dependency>
+ <groupId>org.apache.excalibur.components.xmlutil</groupId>
+ <artifactId>excalibur-xmlutil</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.excalibur.testcase</groupId>
+ <artifactId>excalibur-testcase</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-instrumented</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.components.store</groupId>
+ <artifactId>excalibur-store</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <artifactId>excalibur-sourceresolve</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+ <artifactId>excalibur-instrument-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
</project>
Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml?view=diff&rev=490536&r1=490535&r2=490536
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Wed Dec 27 08:47:40 2006
@@ -33,15 +33,63 @@
<packaging>jar</packaging>
<name>Cocoon XML Implementation</name>
<dependencies>
+ <!-- Cocoon -->
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-common</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-xml-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <!-- Excalibur -->
+ <dependency>
+ <groupId>org.apache.excalibur.components.pool</groupId>
+ <artifactId>excalibur-pool-api</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.excalibur.components.sourceresolve</groupId>
+ <artifactId>excalibur-sourceresolve</artifactId>
+ <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avalon.logkit</groupId>
+ <artifactId>avalon-logkit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
Propchange: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Dec 27 08:47:40 2006
@@ -4,4 +4,5 @@
.project
.wtpmodules
.deployables
-build.properties
+build.properties
+.settings
Re: svn commit: r490536 - in /cocoon/trunk/core: cocoon-common/src/main/java/org/apache/cocoon/
cocoon-common/src/main/java/org/apache/cocoon/util/location/ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/coco...
Posted by Daniel Fagerstrom <da...@nada.kth.se>.
Carsten Ziegeler skrev:
> Daniel wrote:
>
>> OK, I can move the xml stuff that I moved to cocoon-xml to
>> cocoon-pipeline instead. Then later when we pojofy (or springify) the
>> xml stuff we can move generally useful stuff with few dependencies to
>> cocoon-xml.
>>
> Great and thanks!
>
Done!
/Daniel
Re: svn commit: r490536 - in /cocoon/trunk/core: cocoon-common/src/main/java/org/apache/cocoon/
cocoon-common/src/main/java/org/apache/cocoon/util/location/ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/coco...
Posted by Carsten Ziegeler <cz...@apache.org>.
Daniel wrote:
> OK, I can move the xml stuff that I moved to cocoon-xml to
> cocoon-pipeline instead. Then later when we pojofy (or springify) the
> xml stuff we can move generally useful stuff with few dependencies to
> cocoon-xml.
Great and thanks!
Carsten
--
Carsten Ziegeler - Chief Architect
http://www.s-und-n.de
http://www.osoco.org/weblogs/rael/
Re: svn commit: r490536 - in /cocoon/trunk/core: cocoon-common/src/main/java/org/apache/cocoon/
cocoon-common/src/main/java/org/apache/cocoon/util/location/ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/coco...
Posted by Daniel Fagerstrom <da...@nada.kth.se>.
Carsten Ziegeler skrev:
> danielf@apache.org wrote:
>
>> Author: danielf
>> Date: Wed Dec 27 08:47:40 2006
>> New Revision: 490536
>>
>> URL: http://svn.apache.org/viewvc?view=rev&rev=490536
>> Log:
>> Moving the pipeline implementations to the cocoon-pipeline-impl module. To make this possible the caching package is moved to cocoon-pipeline and split into API and implementation. The components.sax and part of xml and xml.dom packages are moved to the cocoon-xml-impl package. The xml APIs from cocoon-pipeline-api are moved to cocoon-xml-api. Some utility classes are moved from cocoon-core as well.
>>
>>
> I'm not that happy with moving stuff to cocoon-xml :)
> My idea of the cocoon-xml stuff is to have a very small and simple xml
> package you can use in every web application (like the spring module).
> Therefore I would like to add only really needed stuff and more
> important have as less dependencies as possible. So I want to avoid any
> dependency (either from api or impl) to any of the avalon/excalibur stuff.
> For example with a Cocoon 3.0 we will (perhaps) cut all dependencies to
> Avalon. If we start today with providing new stuff that is not dependent
> on excalibur, the migration can start earlier and will be easier.
>
OK, I can move the xml stuff that I moved to cocoon-xml to
cocoon-pipeline instead. Then later when we pojofy (or springify) the
xml stuff we can move generally useful stuff with few dependencies to
cocoon-xml.
/Daniel
Re: svn commit: r490536 - in /cocoon/trunk/core: cocoon-common/src/main/java/org/apache/cocoon/
cocoon-common/src/main/java/org/apache/cocoon/util/location/ cocoon-core/
cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/coco...
Posted by Carsten Ziegeler <cz...@apache.org>.
danielf@apache.org wrote:
> Author: danielf
> Date: Wed Dec 27 08:47:40 2006
> New Revision: 490536
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=490536
> Log:
> Moving the pipeline implementations to the cocoon-pipeline-impl module. To make this possible the caching package is moved to cocoon-pipeline and split into API and implementation. The components.sax and part of xml and xml.dom packages are moved to the cocoon-xml-impl package. The xml APIs from cocoon-pipeline-api are moved to cocoon-xml-api. Some utility classes are moved from cocoon-core as well.
>
I'm not that happy with moving stuff to cocoon-xml :)
My idea of the cocoon-xml stuff is to have a very small and simple xml
package you can use in every web application (like the spring module).
Therefore I would like to add only really needed stuff and more
important have as less dependencies as possible. So I want to avoid any
dependency (either from api or impl) to any of the avalon/excalibur stuff.
For example with a Cocoon 3.0 we will (perhaps) cut all dependencies to
Avalon. If we start today with providing new stuff that is not dependent
on excalibur, the migration can start earlier and will be easier.
Carsten
--
Carsten Ziegeler - Chief Architect
http://www.s-und-n.de
http://www.osoco.org/weblogs/rael/