You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/03/30 15:54:32 UTC
svn commit: r390132 - in /cocoon/trunk: ./ blocks-tobeconverted/
blocks-tobeconverted/cocoon-ajax/ blocks-tobeconverted/cocoon-default/
blocks-tobeconverted/cocoon-forms/
blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/ core/
core/cocoon-webapp/ ...
Author: reinhard
Date: Thu Mar 30 05:54:30 2006
New Revision: 390132
URL: http://svn.apache.org/viewcvs?rev=390132&view=rev
Log:
integrate the deployer, start to get cocoon-webapp working again; minor cleanups
Removed:
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/LICENSE.txt
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/NOTICE.txt
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/LICENSE.txt
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/NOTICE.txt
Modified:
cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml
cocoon/trunk/blocks-tobeconverted/cocoon-default/pom.xml
cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/pom.xml
cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml
cocoon/trunk/blocks-tobeconverted/pom.xml
cocoon/trunk/core/cocoon-webapp/pom.xml
cocoon/trunk/core/pom.xml
cocoon/trunk/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
cocoon/trunk/tools/cocoon-block-deployer/pom.xml
Modified: cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-ajax/pom.xml Thu Mar 30 05:54:30 2006
@@ -23,9 +23,9 @@
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</artifactId>
+ <artifactId>cocoon-blocks-tobeconverted-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks-tobeconverted/cocoon-default/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-default/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-default/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-default/pom.xml Thu Mar 30 05:54:30 2006
@@ -19,8 +19,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-tobeconverted-modules</artifactId>
+ <version>x-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
@@ -28,24 +28,24 @@
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-default</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
- <dependencies>
+ <!--dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-blocks-fw-ecm-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-blocks-fw-servlet-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-sitemap-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
- </dependencies>
+ </dependencies-->
</project>
Modified: cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-forms/cocoon-forms-sample/pom.xml Thu Mar 30 05:54:30 2006
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-forms</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cocoon-forms-sample</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Forms Block Samples</name>
<dependencies>
Modified: cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/cocoon-forms/pom.xml Thu Mar 30 05:54:30 2006
@@ -23,9 +23,9 @@
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</artifactId>
+ <artifactId>cocoon-blocks-tobeconverted-modules</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
Modified: cocoon/trunk/blocks-tobeconverted/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks-tobeconverted/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/blocks-tobeconverted/pom.xml (original)
+++ cocoon/trunk/blocks-tobeconverted/pom.xml Thu Mar 30 05:54:30 2006
@@ -44,9 +44,9 @@
<module>cocoon-captcha</module>
<module>cocoon-core-components</module>
<module>cocoon-cron</module>
- <module>cocoon-databases</module>
- <module>cocoon-default</module>
- -->
+ <module>cocoon-databases</module>
+ -->
+ <module>cocoon-default</module>
<module>cocoon-forms</module>
<!--module>cocoon-jcr</module>
<module>cocoon-mocks</module>
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Thu Mar 30 05:54:30 2006
@@ -25,8 +25,8 @@
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>cocoon-core-modules</artifactId>
+ <version>x-SNAPSHOT</version>
</parent>
<artifactId>cocoon-webapp</artifactId>
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<configuration>
<serverVersion>2.3</serverVersion>
</configuration>
@@ -90,7 +90,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin-demo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Thu Mar 30 05:54:30 2006
@@ -38,6 +38,8 @@
<name>Cocoon Core [modules]</name>
<modules>
+ <!-- module>cocoon-blocks-fw</module>-->
<module>cocoon-core</module>
+ <module>cocoon-webapp</module>
</modules>
</project>
Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Thu Mar 30 05:54:30 2006
@@ -47,7 +47,7 @@
<!--
<module>commons</module-->
<module>core</module>
- <!--module>tools</module-->
+ <module>tools</module>
</modules>
<repositories>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-core/pom.xml Thu Mar 30 05:54:30 2006
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<name>Cocoon Deployer - Core</name>
<url>http://cocoon.apache.org</url>
@@ -186,4 +186,4 @@
</pluginRepository>
</pluginRepositories>
-</project>
+</project>
\ No newline at end of file
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-minimal-webapp/pom.xml Thu Mar 30 05:54:30 2006
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-minimal-webapp</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>war</packaging>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin-demo/pom.xml Thu Mar 30 05:54:30 2006
@@ -22,12 +22,12 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin-demo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</plugin>
<plugin>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-default</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/pom.xml Thu Mar 30 05:54:30 2006
@@ -22,11 +22,11 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-core</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-tutorial-simple-block/pom.xml Thu Mar 30 05:54:30 2006
@@ -19,23 +19,23 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon</artifactId>
- <version>2.2.0-SNAPSHOT</version>
- </parent>
+ <artifactId>cocoon-deployer</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
<packaging>jar</packaging>
<name>cocoon-tutorial-simple-block</name>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-tutorial-simple-block</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-default</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/tools/cocoon-block-deployer/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/cocoon-block-deployer/pom.xml?rev=390132&r1=390131&r2=390132&view=diff
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/pom.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/pom.xml Thu Mar 30 05:54:30 2006
@@ -21,26 +21,25 @@
<project>
<parent>
- <artifactId>cocoon</artifactId>
<groupId>org.apache.cocoon</groupId>
- <version>2.2.0-SNAPSHOT</version>
+ <artifactId>cocoon-tools-modules</artifactId>
+ <version>x-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Cocoon Deployer - Projects</name>
<modules>
- <module>cocoon-archetype-block</module>
<module>cocoon-deployer-core</module>
+ <module>cocoon-deployer-minimal-webapp</module>
<module>cocoon-deployer-plugin</module>
<module>cocoon-deployer-plugin-demo</module>
- <module>cocoon-deployer-minimal-webapp</module>
<module>cocoon-tutorial-simple-block</module>
</modules>