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/02/08 00:14:35 UTC
svn commit: r375768 - in /cocoon/trunk/cocoon-blocks-fw: ./ cocoon-blocks-fw-ecm-impl/ cocoon-blocks-fw-ecm-impl/src/ cocoon-blocks-fw-ecm-impl/src/main/ cocoon-blocks-fw-ecm-impl/src/main/java/ cocoon-blocks-fw-ecm-impl/src/main/java/org/ cocoon-block...

Author: danielf
Date: Tue Feb  7 15:14:29 2006
New Revision: 375768

URL: http://svn.apache.org/viewcvs?rev=375768&view=rev
Log:
Splitting the blocks fw into a servlet part with the core specific stuff and ecm for the ecm bridge.

Added:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml   (with props)
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/src/main/java/org/apache/cocoon/container/
      - copied from r375761, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml   (with props)
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/blocks/servlet/
      - copied from r375761, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/main/java/org/apache/cocoon/components/
      - copied from r375761, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/src/test/
      - copied from r375761, cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/
Removed:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/servlet/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/components/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/container/
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/test/
Modified:
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
    cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml
    cocoon/trunk/cocoon-blocks-fw/pom.xml

Added: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml?rev=375768&view=auto
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml (added)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml Tue Feb  7 15:14:29 2006
@@ -0,0 +1,31 @@
+<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">
+  <parent>
+    <artifactId>cocoon-blocks-fw</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-blocks-fw-ecm-impl</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>Blocks ECM Bridge</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-ecm-impl/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml?rev=375768&r1=375767&r2=375768&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-impl/pom.xml Tue Feb  7 15:14:29 2006
@@ -12,27 +12,15 @@
   <name>Blocks Framework Implementation</name>
   <dependencies>
     <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2.0-SNAPSHOT</version>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+      <version>4.3</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.3</version>
       <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-sitemap-impl</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>httpunit</groupId>
-      <artifactId>httpunit</artifactId>
-      <version>1.6</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml?rev=375768&r1=375767&r2=375768&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-sample/pom.xml Tue Feb  7 15:14:29 2006
@@ -54,7 +54,12 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
-      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <artifactId>cocoon-blocks-fw-ecm-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-servlet-impl</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>

Added: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml?rev=375768&view=auto
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml (added)
+++ cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml Tue Feb  7 15:14:29 2006
@@ -0,0 +1,49 @@
+<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">
+  <parent>
+    <artifactId>cocoon-blocks-fw</artifactId>
+    <groupId>org.apache.cocoon</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>cocoon-blocks-fw-servlet-impl</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>Blocks Framework Servlet Implementation</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-sitemap-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-blocks-fw-ecm-impl</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-blocks-fw/cocoon-blocks-fw-servlet-impl/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: cocoon/trunk/cocoon-blocks-fw/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-blocks-fw/pom.xml?rev=375768&r1=375767&r2=375768&view=diff
==============================================================================
--- cocoon/trunk/cocoon-blocks-fw/pom.xml (original)
+++ cocoon/trunk/cocoon-blocks-fw/pom.xml Tue Feb  7 15:14:29 2006
@@ -31,6 +31,8 @@
   <version>1.0-SNAPSHOT</version>
   <modules>
     <module>cocoon-blocks-fw-impl</module>
+    <module>cocoon-blocks-fw-ecm-impl</module>
+    <module>cocoon-blocks-fw-servlet-impl</module>
     <module>cocoon-blocks-fw-sample</module>
   </modules>
 </project>