cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dani...@apache.org
Subject svn commit: r490703 - in /cocoon/trunk/core: cocoon-pipeline/cocoon-pipeline-api/ cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/ cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/xlink/ cocoon-pipeline/co...
Date Thu, 28 Dec 2006 11:47:59 GMT
Author: danielf
Date: Thu Dec 28 03:47:56 2006
New Revision: 490703

URL: http://svn.apache.org/viewvc?view=rev&rev=490703
Log:
Moving Avalon dependent XML code to the pipeline modules.

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/AttributeTypes.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/AttributeTypes.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLConsumer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLFragment.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLFragment.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLPipe.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLPipe.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/XMLProducer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/XMLProducer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/xml/xlink/
      - copied from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/xlink/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/components/sax/
      - copied from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/components/sax/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractSAXFragment.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractSAXFragment.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLConsumer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLPipe.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLPipe.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AbstractXMLProducer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/AttributesImpl.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/AttributesImpl.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/ContentHandlerWrapper.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/DefaultLexicalHandler.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/DefaultLexicalHandler.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/EmbeddedXMLPipe.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/ImmutableAttributesImpl.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/ImmutableAttributesImpl.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/IncludeXMLConsumer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/SaxBuffer.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/SaxBuffer.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/XMLBaseSupport.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/XMLUtils.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/XMLUtils.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/dom/
      - copied from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/dom/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/xml/xlink/
      - copied from r490686, cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/xml/xlink/
Removed:
    cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/xml/
    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/xml/
Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/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

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=490703&r1=490702&r2=490703
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Thu Dec 28 03:47:56 2006
@@ -39,11 +39,6 @@
       <artifactId>cocoon-environment-api</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.avalon.framework</groupId>
@@ -64,6 +59,49 @@
         <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.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>

Modified: 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=diff&rev=490703&r1=490702&r2=490703
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Thu Dec 28 03:47:56
2006
@@ -54,6 +54,11 @@
       <artifactId>cocoon-util</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>
 
     <dependency>
       <groupId>javax.servlet</groupId>

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=490703&r1=490702&r2=490703
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Thu Dec 28 03:47:56 2006
@@ -49,12 +49,33 @@
       <artifactId>cocoon-util</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <!-- Excalibur -->
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-xml-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <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>
-    <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.excalibur.components.store</groupId>
       <artifactId>excalibur-store</artifactId>

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=490703&r1=490702&r2=490703
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml Thu Dec 28 03:47:56 2006
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+ <?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
@@ -32,50 +32,4 @@
   <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=490703&r1=490702&r2=490703
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml Thu Dec 28 03:47:56 2006
@@ -36,40 +36,8 @@
     <!-- 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>



Mime
View raw message