cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r488011 - in /cocoon/trunk/core: ./ cocoon-core/ cocoon-core/src/main/java/org/apache/cocoon/ cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/ cocoon-core/src/main/java/org/apache/cocoon/environment/ cocoon-core/src/main/jav...
Date Sun, 17 Dec 2006 17:10:05 GMT
Author: danielf
Date: Sun Dec 17 09:10:02 2006
New Revision: 488011

URL: http://svn.apache.org/viewvc?view=rev&rev=488011
Log:
Moved ProcessingPipeline with all the interface that it depends on to an own block.

Added:
    cocoon/trunk/core/cocoon-pipeline-api/   (with props)
    cocoon/trunk/core/cocoon-pipeline-api/pom.xml
    cocoon/trunk/core/cocoon-pipeline-api/src/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ProcessingException.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/components/pipeline/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/Environment.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Environment.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/SourceResolver.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/SourceResolver.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/generation/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/generation/Generator.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/Generator.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/generation/GeneratorFactory.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/GeneratorFactory.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/reading/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/reading/Reader.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/Reader.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/serialization/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/serialization/Serializer.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/Serializer.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/serialization/SerializerFactory.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/SerializerFactory.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/sitemap/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/sitemap/SitemapErrorHandler.java
      - copied unchanged from r486827, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapErrorHandler.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/sitemap/SitemapOutputComponent.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapOutputComponent.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/transformation/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/transformation/Transformer.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/Transformer.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/transformation/TransformerFactory.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TransformerFactory.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/Locatable.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/Locatable.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/LocatableException.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatableException.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/LocatedException.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatedException.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/LocatedRuntimeException.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatedRuntimeException.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/Location.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/Location.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/LocationImpl.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocationImpl.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/LocationUtils.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocationUtils.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/MultiLocatable.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/MultiLocatable.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLPipe.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLPipe.java
    cocoon/trunk/core/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLProducer.java
      - copied unchanged from r486802, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLProducer.java
Removed:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/Environment.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/SourceResolver.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/Generator.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/GeneratorFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/Reader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/Serializer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/serialization/SerializerFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapErrorHandler.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapModelComponent.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapOutputComponent.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/Transformer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/transformation/TransformerFactory.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/Locatable.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatableException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatedException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocatedRuntimeException.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/Location.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocationImpl.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/LocationUtils.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/location/MultiLocatable.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLPipe.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/xml/XMLProducer.java
Modified:
    cocoon/trunk/core/cocoon-core/pom.xml
    cocoon/trunk/core/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=488011&r1=488010&r2=488011
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Sun Dec 17 09:10:02 2006
@@ -105,6 +105,11 @@
     </site>
   </distributionManagement>  
   <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-pipeline-api</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
     <!--  excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components.pool</groupId>
@@ -118,17 +123,6 @@
       </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-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>org.apache.excalibur.containerkit.logger</groupId>
       <artifactId>excalibur-logger</artifactId>
       <version>2.1</version>
@@ -149,27 +143,9 @@
       <version>2.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.excalibur.components.xmlutil</groupId>
-      <artifactId>excalibur-xmlutil</artifactId>
+      <groupId>org.apache.excalibur.containerkit.instrument</groupId>
+      <artifactId>excalibur-instrument-api</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-impl</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.avalon.framework</groupId>
-          <artifactId>avalon-framework-api</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
@@ -247,11 +223,6 @@
           <groupId>avalon-framework</groupId>
         </exclusion>
       </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>commons-jexl</groupId>

Propchange: cocoon/trunk/core/cocoon-pipeline-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Dec 17 09:10:02 2006
@@ -0,0 +1 @@
+target

Added: cocoon/trunk/core/cocoon-pipeline-api/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline-api/pom.xml?view=auto&rev=488011
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline-api/pom.xml (added)
+++ cocoon/trunk/core/cocoon-pipeline-api/pom.xml Sun Dec 17 09:10:02 2006
@@ -0,0 +1,113 @@
+<?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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.cocoon</groupId>
+    <artifactId>cocoon-core-modules</artifactId>
+    <version>3-SNAPSHOT</version>
+  </parent>
+  <artifactId>cocoon-pipeline-api</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <name>Pipeline 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-api</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>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+      <version>4.3</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-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.avalon.framework</groupId>
+          <artifactId>avalon-framework-impl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <!-- commons -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+    </dependency>
+  </dependencies>
+</project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=488011&r1=488010&r2=488011
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Sun Dec 17 09:10:02 2006
@@ -34,6 +34,7 @@
   <modules>
     <module>cocoon-blocks-fw</module>
     <module>cocoon-core</module>
+    <module>cocoon-pipeline-api</module>
     <module>cocoon-webapp</module>
   </modules>
   <scm>



Mime
View raw message