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/29 13:37:03 UTC
svn commit: r490991 - in /cocoon/trunk/core: ./ cocoon-common/src/main/java/org/ cocoon-common/src/test/java/org/ cocoon-pipeline/cocoon-pipeline-api/ cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ cocoon-pipeline/cocoon-pipeline-...

Author: danielf
Date: Fri Dec 29 04:37:01 2006
New Revision: 490991

URL: http://svn.apache.org/viewvc?view=rev&rev=490991
Log:
Moving the contents of the module cocoon-common (exceptions with ProcessingException as a prominent member, Constants and the util.location package used by the ProcessingException) to the cocoon-pipeline-api module and updated the dependencies. After some of the recent refactoring the common module was only used in the pipeline and sitemap modules and there is not much reason to use it outside these, so there doesn't seem to be any point in having it as a separate module.

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/CascadingIOException.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/CascadingIOException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ConnectionResetException.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ConnectionResetException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/Constants.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/Constants.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ConstantsInitializationException.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ConstantsInitializationException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/Modifiable.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/Modifiable.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ProcessingException.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ProcessingException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/ResourceNotFoundException.java
      - copied unchanged from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/ResourceNotFoundException.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/util/location/
      - copied from r490958, cocoon/trunk/core/cocoon-common/src/main/java/org/apache/cocoon/util/location/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/org/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/org/apache/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/org/apache/cocoon/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/org/apache/cocoon/util/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/test/java/org/apache/cocoon/util/location/
      - copied from r490958, cocoon/trunk/core/cocoon-common/src/test/java/org/apache/cocoon/util/location/
Removed:
    cocoon/trunk/core/cocoon-common/src/main/java/org/
    cocoon/trunk/core/cocoon-common/src/test/java/org/
Modified:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
    cocoon/trunk/core/cocoon-util/pom.xml
    cocoon/trunk/core/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=490991&r1=490990&r2=490991
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Fri Dec 29 04:37:01 2006
@@ -33,13 +33,7 @@
   <name>Pipeline API</name>
 
   <dependencies>
-    <!-- Cocoon -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-common</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    <!--  excalibur -->
+    <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
       <artifactId>avalon-framework-api</artifactId>
@@ -109,12 +103,25 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- Commons -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+    </dependency>
 
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.4</version>
       <scope>provided</scope>
+    </dependency>
+    <!-- Test Dependencies  -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml?view=diff&rev=490991&r1=490990&r2=490991
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-components/pom.xml Fri Dec 29 04:37:01 2006
@@ -43,5 +43,12 @@
       <artifactId>cocoon-pipeline-components</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>

Modified: cocoon/trunk/core/cocoon-util/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-util/pom.xml?view=diff&rev=490991&r1=490990&r2=490991
==============================================================================
--- cocoon/trunk/core/cocoon-util/pom.xml (original)
+++ cocoon/trunk/core/cocoon-util/pom.xml Fri Dec 29 04:37:01 2006
@@ -33,12 +33,6 @@
   <packaging>jar</packaging>
   <name>Cocoon Util</name>
   <dependencies>
-    <!-- Cocoon -->
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-common</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
     <!-- Excalibur -->
     <dependency>
       <groupId>org.apache.avalon.framework</groupId>
@@ -46,6 +40,11 @@
       <version>4.3</version>
     </dependency>
     <!-- Commons -->
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <version>2.1</version>
+    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=490991&r1=490990&r2=490991
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Fri Dec 29 04:37:01 2006
@@ -33,7 +33,6 @@
   <name>Cocoon Core [modules]</name>
   <modules>
     <module>cocoon-blocks-fw</module>
-    <module>cocoon-common</module>
     <module>cocoon-configuration</module>
     <module>cocoon-core</module>
     <module>cocoon-pipeline</module>