You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/04/10 14:31:47 UTC

svn commit: r392933 - in /cocoon/trunk: ./ blocks/ blocks/cocoon-batik/ blocks/cocoon-batik/cocoon-batik-impl/ blocks/cocoon-batik/cocoon-batik-sample/ blocks/cocoon-bsf/ blocks/cocoon-bsf/cocoon-bsf-impl/ blocks/cocoon-bsf/cocoon-bsf-sample/ blocks/co...

Author: cziegeler
Date: Mon Apr 10 05:31:44 2006
New Revision: 392933

URL: http://svn.apache.org/viewcvs?rev=392933&view=rev
Log:
Add some blocks to build

Modified:
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
    cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
    cocoon/trunk/blocks/cocoon-batik/pom.xml
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
    cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
    cocoon/trunk/blocks/cocoon-bsf/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
    cocoon/trunk/blocks/cocoon-captcha/pom.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
    cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
    cocoon/trunk/blocks/cocoon-chaperon/pom.xml
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
    cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
    cocoon/trunk/blocks/cocoon-cron/pom.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
    cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
    cocoon/trunk/blocks/cocoon-deli/pom.xml
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
    cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
    cocoon/trunk/blocks/cocoon-eventcache/pom.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
    cocoon/trunk/blocks/cocoon-faces/pom.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
    cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
    cocoon/trunk/blocks/cocoon-jms/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
    cocoon/trunk/blocks/cocoon-portal/pom.xml
    cocoon/trunk/blocks/cocoon-profiler/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/main/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/pom.xml
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
    cocoon/trunk/blocks/cocoon-template/pom.xml
    cocoon/trunk/blocks/pom.xml
    cocoon/trunk/pom.xml

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-batik</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/cocoon-batik-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-batik</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-batik/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-batik/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-batik/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-batik/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-batik</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-bsf</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/cocoon-bsf-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-bsf</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-bsf/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-bsf/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-bsf/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-bsf/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-bsf</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-captcha</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-captcha-impl</artifactId>

Modified: cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/cocoon-captcha-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>cocoon-captcha</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-captcha-sample</artifactId>

Modified: cocoon/trunk/blocks/cocoon-captcha/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-captcha/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-captcha/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-captcha/pom.xml Mon Apr 10 05:31:44 2006
@@ -20,7 +20,7 @@
     +-->
 <project>
   <parent>
-    <artifactId>cocoon</artifactId>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
     <version>1-SNAPSHOT</version>
   </parent>
@@ -29,7 +29,7 @@
   <artifactId>cocoon-captcha</artifactId>
   <packaging>pom</packaging>
   <name>Captcha Block</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <modules>
     <module>cocoon-captcha-impl</module>
     <module>cocoon-captcha-sample</module>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-chaperon</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/cocoon-chaperon-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-chaperon</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-chaperon/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-chaperon/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-chaperon/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-chaperon/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-chaperon</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-cron</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/cocoon-cron-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-cron</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-cron/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-cron/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-cron/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-cron/pom.xml Mon Apr 10 05:31:44 2006
@@ -20,16 +20,16 @@
     +-->
 <project>
   <parent>
-    <artifactId>cocoon</artifactId>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-cron</artifactId>
   <packaging>pom</packaging>
   <name>Cron Block</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <modules>
     <module>cocoon-cron-impl</module>
     <module>cocoon-cron-sample</module>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deli</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/cocoon-deli-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-deli</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-deli/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-deli/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-deli/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-deli/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-deli</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-eventcache</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/cocoon-eventcache-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-eventcache</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-eventcache/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-eventcache/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-eventcache/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-eventcache/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-eventcache</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-faces</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-faces</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-faces/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-faces/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-faces</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jms</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/cocoon-jms-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-jms</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-jms/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-jms/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-jms/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-jms/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-jms</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-portal-impl</artifactId>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis</artifactId>
-      <version>1.2.1</version>
+      <version>1.3</version>
       <exclusions>
         <exclusion>
           <artifactId>mail</artifactId>
@@ -68,12 +68,12 @@
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis-saaj</artifactId>
-      <version>1.2.1</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis-jaxrpc</artifactId>
-      <version>1.2.1</version>
+      <version>1.3</version>
     </dependency>
     <dependency>
       <groupId>axis</groupId>

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-portal</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cocoon-portal-sample</artifactId>

Modified: cocoon/trunk/blocks/cocoon-portal/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-portal/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/pom.xml Mon Apr 10 05:31:44 2006
@@ -20,16 +20,16 @@
     +-->
 <project>
   <parent>
-    <artifactId>cocoon</artifactId>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-portal</artifactId>
   <packaging>pom</packaging>
   <name>Portal Block</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <modules>
     <module>cocoon-portal-impl</module>
     <!-- module>cocoon-portal-sample</module -->

Modified: cocoon/trunk/blocks/cocoon-profiler/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-profiler/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-profiler/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-profiler</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,14 +15,14 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     |
     +-->
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-taglib</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/main/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/main/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/main/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/src/main/java/org/apache/cocoon/jxpath/JXPathCocoonContexts.java Mon Apr 10 05:31:44 2006
@@ -500,5 +500,20 @@
         public InputStream getResourceAsStream(String path) {
             return this.delegate.getResourceAsStream(path);
         }
+
+        public void log(Exception arg0, String arg1) {
+            // TODO Auto-generated method stub
+            
+        }
+
+        public void log(String arg0, Throwable arg1) {
+            // TODO Auto-generated method stub
+            
+        }
+
+        public void log(String arg0) {
+            // TODO Auto-generated method stub
+            
+        }
     }
 }

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-taglib</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-taglib/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-taglib/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/pom.xml Mon Apr 10 05:31:44 2006
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project
   xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,15 +24,15 @@
   
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-blocks</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>1-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-taglib</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
     
   <packaging>pom</packaging>
   

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/pom.xml Mon Apr 10 05:31:44 2006
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-template</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-template/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-template/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-template/pom.xml Mon Apr 10 05:31:44 2006
@@ -20,16 +20,16 @@
     +-->
 <project>
   <parent>
-    <artifactId>cocoon</artifactId>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>2.2.0-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-template</artifactId>
   <packaging>pom</packaging>
   <name>Template framework</name>
-  <version>1.0-SNAPSHOT</version>
+  <version>1-SNAPSHOT</version>
   <modules>
     <module>cocoon-template-impl</module>
   </modules>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Mon Apr 10 05:31:44 2006
@@ -43,16 +43,16 @@
 		<module>cocoon-asciiart</module>
 		<module>cocoon-authentication-fw</module>
 		<module>cocoon-axis</module>
-		<!-- module>cocoon-batik</module>
-		<module>cocoon-bsf</module -->
+		<module>cocoon-batik</module>
+		<module>cocoon-bsf</module>
 		<module>cocoon-captcha</module>
-		<!-- module>cocoon-chaperon</module>
-		<module>cocoon-core-samples-additional</module>
-		<module>cocoon-core-samples-main</module>
+		<module>cocoon-chaperon</module>
+		<!-- module>cocoon-core-samples-additional</module>
+		<module>cocoon-core-samples-main</module -->
 		<module>cocoon-cron</module>
 		<module>cocoon-deli</module>
 		<module>cocoon-eventcache</module>
-		<module>cocoon-faces</module-->
+		<module>cocoon-faces</module>
 		<module>cocoon-fop</module>
         <module>cocoon-forms</module>
 		<!-- module>cocoon-hsqldb</module>
@@ -60,9 +60,9 @@
 		<module>cocoon-itext</module>
 		<module>cocoon-javaflow</module>
 		<module>cocoon-jcr</module>
-		<module>cocoon-jfor</module>
+		<module>cocoon-jfor</module -->
 		<module>cocoon-jms</module>
-		<module>cocoon-jsp</module>
+		<!-- module>cocoon-jsp</module>
 		<module>cocoon-linkrewriter</module>
 		<module>cocoon-lucene</module>
 		<module>cocoon-mail</module>
@@ -71,9 +71,9 @@
 		<module>cocoon-ojb</module>
 		<module>cocoon-paranoid</module>
 		<module>cocoon-petstore</module>
-		<module>cocoon-poi</module>
+		<module>cocoon-poi</module -->
 		<module>cocoon-portal</module>
-		<module>cocoon-profiler</module>
+		<!--  module>cocoon-profiler</module>
 		<module>cocoon-proxy</module>
 		<module>cocoon-python</module>
 		<module>cocoon-qdox</module>
@@ -84,10 +84,10 @@
 		<module>cocoon-session-fw</module>
 		<!-- module>cocoon-slide</module>
 		<module>cocoon-slop</module>
-		<module>cocoon-stx</module>
+		<module>cocoon-stx</module -->
 		<module>cocoon-taglib</module>
 		<module>cocoon-template</module>
-		<module>cocoon-tour</module>
+		<!-- >module>cocoon-tour</module>
 		<module>cocoon-velocity</module>
 		<module>cocoon-web3</module>
 		<module>cocoon-webdav</module>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=392933&r1=392932&r2=392933&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Apr 10 05:31:44 2006
@@ -43,7 +43,6 @@
   
   <modules>
     <module>blocks</module>
-    <module>blocks-tobeconverted</module>    
     <!--
     <module>commons</module-->
     <module>core</module>