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/28 14:57:50 UTC
svn commit: r490727 - in /cocoon/trunk/core: ./ cocoon-core/ cocoon-environment/cocoon-environment-api/src/main/java/org/ cocoon-environment/cocoon-environment-impl/src/main/java/org/ cocoon-pipeline/cocoon-pipeline-api/ cocoon-pipeline/cocoon-pipeline...

Author: danielf
Date: Thu Dec 28 05:57:45 2006
New Revision: 490727

URL: http://svn.apache.org/viewvc?view=rev&rev=490727
Log:
Putting the content in the cocoon-environment modules into the cocoon-pipeline modules, as the pipeline modules where the only one that had dependencies on the cocoon-environment modules and there is no reason to use the cocoon-environment modules independently.

Added:
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/src/main/java/org/apache/cocoon/environment/
      - copied from r490686, cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/apache/cocoon/environment/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/AbstractEnvironment.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
      - copied unchanged from r490686, cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/ForwardRedirector.java
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/http/
      - copied from r490686, cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/http/
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/src/main/java/org/apache/cocoon/environment/impl/
      - copied from r490686, cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/apache/cocoon/environment/impl/
Removed:
    cocoon/trunk/core/cocoon-environment/cocoon-environment-api/src/main/java/org/
    cocoon/trunk/core/cocoon-environment/cocoon-environment-impl/src/main/java/org/
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-components/pom.xml
    cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/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=490727&r1=490726&r2=490727
==============================================================================
--- cocoon/trunk/core/cocoon-core/pom.xml (original)
+++ cocoon/trunk/core/cocoon-core/pom.xml Thu Dec 28 05:57:45 2006
@@ -117,11 +117,6 @@
     </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-components</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>

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=490727&r1=490726&r2=490727
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-api/pom.xml Thu Dec 28 05:57:45 2006
@@ -36,7 +36,7 @@
     <!-- Cocoon -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-environment-api</artifactId>
+      <artifactId>cocoon-common</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <!--  excalibur -->
@@ -108,6 +108,13 @@
           <artifactId>avalon-logkit</artifactId>
         </exclusion>
       </exclusions>
+    </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-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=490727&r1=490726&r2=490727
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/pom.xml Thu Dec 28 05:57:45 2006
@@ -41,11 +41,6 @@
     </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>

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=490727&r1=490726&r2=490727
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-impl/pom.xml Thu Dec 28 05:57:45 2006
@@ -86,11 +86,23 @@
       <artifactId>excalibur-instrument-api</artifactId>
       <version>2.1</version>
     </dependency>
+    <!-- commons -->
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2</version>
+    </dependency>
 
     <dependency>
       <groupId>jakarta-regexp</groupId>
       <artifactId>jakarta-regexp</artifactId>
       <version>1.4</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/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/pom.xml?view=diff&rev=490727&r1=490726&r2=490727
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Thu Dec 28 05:57:45 2006
@@ -36,7 +36,6 @@
     <module>cocoon-common</module>
     <module>cocoon-configuration</module>
     <module>cocoon-core</module>
-    <module>cocoon-environment</module>
     <module>cocoon-pipeline</module>
     <module>cocoon-sitemap</module>
     <module>cocoon-spring</module>