cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jheym...@apache.org
Subject svn commit: r328123 - in /cocoon: blocks/ blocks/ajax/trunk/ blocks/apples/trunk/ blocks/asciiart/trunk/ blocks/authentication-fw/trunk/ blocks/axis/trunk/ blocks/batik/trunk/ blocks/bsf/trunk/ blocks/captcha/trunk/ blocks/chaperon/trunk/ blocks/core-s...
Date Mon, 24 Oct 2005 18:30:53 GMT
Author: jheymans
Date: Mon Oct 24 11:29:45 2005
New Revision: 328123

URL: http://svn.apache.org/viewcvs?rev=328123&view=rev
Log:
- created pom in src/blocks, referenced from root pom as a module. Moved block definitions to this pom.
- setup forms block with new pom structure
- adding some name descriptors
- removing reports for now
- removed webapp block dependencies

Added:
    cocoon/blocks/forms/pom.xml   (with props)
    cocoon/blocks/forms/trunk/samples/pom.xml   (with props)
    cocoon/blocks/pom.xml   (with props)
Modified:
    cocoon/blocks/ajax/trunk/pom.xml
    cocoon/blocks/apples/trunk/pom.xml
    cocoon/blocks/asciiart/trunk/pom.xml
    cocoon/blocks/authentication-fw/trunk/pom.xml
    cocoon/blocks/axis/trunk/pom.xml
    cocoon/blocks/batik/trunk/pom.xml
    cocoon/blocks/bsf/trunk/pom.xml
    cocoon/blocks/captcha/trunk/pom.xml
    cocoon/blocks/chaperon/trunk/pom.xml
    cocoon/blocks/core-samples-additional/trunk/pom.xml
    cocoon/blocks/core-samples-main/trunk/pom.xml
    cocoon/blocks/cron/trunk/pom.xml
    cocoon/blocks/databases/trunk/pom.xml
    cocoon/blocks/deli/trunk/pom.xml
    cocoon/blocks/eventcache/trunk/pom.xml
    cocoon/blocks/faces/trunk/pom.xml
    cocoon/blocks/fop/trunk/pom.xml
    cocoon/blocks/forms/trunk/pom.xml
    cocoon/blocks/hsqldb/trunk/pom.xml
    cocoon/blocks/html/trunk/pom.xml
    cocoon/blocks/itext/trunk/pom.xml
    cocoon/blocks/javaflow/trunk/pom.xml
    cocoon/blocks/jcr/trunk/pom.xml
    cocoon/blocks/jfor/trunk/pom.xml
    cocoon/blocks/jms/trunk/pom.xml
    cocoon/blocks/jsp/trunk/mocks/pom.xml
    cocoon/blocks/jsp/trunk/pom.xml
    cocoon/blocks/linkrewriter/trunk/pom.xml
    cocoon/blocks/lucene/trunk/pom.xml
    cocoon/blocks/mail/trunk/pom.xml
    cocoon/blocks/midi/trunk/pom.xml
    cocoon/blocks/naming/trunk/pom.xml
    cocoon/blocks/ojb/trunk/pom.xml
    cocoon/blocks/paranoid/trunk/pom.xml
    cocoon/blocks/petstore/trunk/pom.xml
    cocoon/blocks/poi/trunk/pom.xml
    cocoon/blocks/portal-sample/trunk/pom.xml
    cocoon/blocks/portal/trunk/pom.xml
    cocoon/blocks/profiler/trunk/pom.xml
    cocoon/blocks/proxy/trunk/pom.xml
    cocoon/blocks/python/trunk/mocks/pom.xml
    cocoon/blocks/python/trunk/pom.xml
    cocoon/blocks/qdox/trunk/pom.xml
    cocoon/blocks/querybean/trunk/pom.xml
    cocoon/blocks/repository/trunk/pom.xml
    cocoon/blocks/scratchpad/trunk/garbage/pom.xml
    cocoon/blocks/scratchpad/trunk/mocks/pom.xml
    cocoon/blocks/scratchpad/trunk/pom.xml
    cocoon/blocks/serializers/trunk/pom.xml
    cocoon/blocks/session-fw/trunk/pom.xml
    cocoon/blocks/slide/trunk/pom.xml
    cocoon/blocks/slop/trunk/pom.xml
    cocoon/blocks/spring-app/trunk/pom.xml
    cocoon/blocks/stx/trunk/pom.xml
    cocoon/blocks/taglib/trunk/pom.xml
    cocoon/blocks/template/trunk/pom.xml
    cocoon/blocks/tour/trunk/pom.xml
    cocoon/blocks/velocity/trunk/pom.xml
    cocoon/blocks/web3/trunk/pom.xml
    cocoon/blocks/webdav/trunk/pom.xml
    cocoon/blocks/xmldb/trunk/pom.xml
    cocoon/blocks/xsp/trunk/pom.xml
    cocoon/trunk/core/pom.xml
    cocoon/trunk/core/test-core/pom.xml
    cocoon/trunk/pom.xml
    cocoon/trunk/src/mocks/pom.xml
    cocoon/trunk/webapp/pom.xml

Modified: cocoon/blocks/ajax/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/ajax/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/ajax/trunk/pom.xml (original)
+++ cocoon/blocks/ajax/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -29,6 +29,7 @@
   <artifactId>cocoon-ajax</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <name>Ajax Block</name>
   <build>
     <sourceDirectory>java</sourceDirectory>
     <testSourceDirectory>test</testSourceDirectory>
@@ -39,8 +40,35 @@
           <exclude>**/*.java</exclude>
         </excludes>
       </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>WEB-INF/**</include>
+        </includes>
+      </resource>
     </resources>
   </build>
+  <profiles>
+    <profile>
+      <id>samples</id>
+      <activation>
+        <property>
+          <name>samples</name>
+        </property>
+      </activation>
+      <build>
+        <resources>
+          <resource>
+            <directory>.</directory>
+            <includes>
+              <include>samples/**</include>
+            </includes>
+          </resource>
+        </resources>
+        <finalName>${artifactId}-samples-${version}</finalName>
+      </build>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>apache-cocoon</groupId>
@@ -54,12 +82,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
+</project>
\ No newline at end of file

Modified: cocoon/blocks/apples/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/apples/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/apples/trunk/pom.xml (original)
+++ cocoon/blocks/apples/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -48,16 +48,8 @@
     </dependency>
     <dependency>
       <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-forms</artifactId>
+      <artifactId>cocoon-forms-impl</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/asciiart/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/asciiart/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/asciiart/trunk/pom.xml (original)
+++ cocoon/blocks/asciiart/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -48,12 +48,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/authentication-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/authentication-fw/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/authentication-fw/trunk/pom.xml (original)
+++ cocoon/blocks/authentication-fw/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/axis/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/axis/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/axis/trunk/pom.xml (original)
+++ cocoon/blocks/axis/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -68,12 +68,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/batik/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/batik/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/batik/trunk/pom.xml (original)
+++ cocoon/blocks/batik/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -53,12 +53,4 @@
       <version>1.6</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/bsf/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/bsf/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/bsf/trunk/pom.xml (original)
+++ cocoon/blocks/bsf/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.3.0</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/captcha/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/captcha/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/captcha/trunk/pom.xml (original)
+++ cocoon/blocks/captcha/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -16,7 +16,7 @@
 -->
 
 <!--+
-    | @version $Id:$
+    | @version $Id$
     +-->
 <project>
   <parent>
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/chaperon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/chaperon/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/chaperon/trunk/pom.xml (original)
+++ cocoon/blocks/chaperon/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -64,12 +64,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/core-samples-additional/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-additional/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/core-samples-additional/trunk/pom.xml (original)
+++ cocoon/blocks/core-samples-additional/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>0.20.5</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/core-samples-main/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/core-samples-main/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/core-samples-main/trunk/pom.xml (original)
+++ cocoon/blocks/core-samples-main/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>0.20.5</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/cron/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/cron/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/cron/trunk/pom.xml (original)
+++ cocoon/blocks/cron/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -57,12 +57,4 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/databases/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/databases/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/databases/trunk/pom.xml (original)
+++ cocoon/blocks/databases/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -58,12 +58,4 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/deli/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/deli/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/deli/trunk/pom.xml (original)
+++ cocoon/blocks/deli/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -62,12 +62,4 @@
       <version>2.3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/eventcache/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/eventcache/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/eventcache/trunk/pom.xml (original)
+++ cocoon/blocks/eventcache/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -62,12 +62,4 @@
       <version>1.1-rc3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/faces/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/faces/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/faces/trunk/pom.xml (original)
+++ cocoon/blocks/faces/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -67,12 +67,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/fop/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/fop/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/fop/trunk/pom.xml (original)
+++ cocoon/blocks/fop/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>0.20.5</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Added: cocoon/blocks/forms/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/pom.xml?rev=328123&view=auto
==============================================================================
--- cocoon/blocks/forms/pom.xml (added)
+++ cocoon/blocks/forms/pom.xml Mon Oct 24 11:29:45 2005
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+  | @version $Id:$
+  |
+  +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon-blocks</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-forms-block</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <name>Forms Block</name>
+  <packaging>pom</packaging>
+  <modules>
+    <module>trunk/samples</module>
+    <module>trunk</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-ajax</artifactId>
+      <version>2.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>apache-cocoon</groupId>
+      <artifactId>cocoon-test-core</artifactId>
+      <version>2.2-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>    
+    <dependency>
+      <groupId>jakarta-oro</groupId>
+      <artifactId>jakarta-oro</artifactId>
+      <version>2.0.8</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta-regexp</groupId>
+      <artifactId>jakarta-regexp</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>xreporter</groupId>
+      <artifactId>xreporter-expression</artifactId>
+      <version>20040701</version>
+    </dependency>
+    <dependency>
+      <groupId>daisy</groupId>
+      <artifactId>daisy-htmlcleaner</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>icu4j</groupId>
+      <artifactId>icu4j</artifactId>
+      <version>3.0</version>
+    </dependency>
+  </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>apache</id>
+      <name>repository</name>
+      <url>scp://cvs.apache.org/x1/www/cvs.apache.org/repository</url>
+      <layout>legacy</layout>
+    </snapshotRepository>
+  </distributionManagement>
+</project>
\ No newline at end of file

Propchange: cocoon/blocks/forms/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/blocks/forms/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/pom.xml (original)
+++ cocoon/blocks/forms/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2005 The Apache Software Foundation
-
+  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -21,14 +21,15 @@
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
-    <artifactId>cocoon</artifactId>
+    <artifactId>cocoon-forms-block</artifactId>
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>apache-cocoon</groupId>
-  <artifactId>cocoon-forms</artifactId>
+  <artifactId>cocoon-forms-impl</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <name>Forms Implementation</name>
   <build>
     <sourceDirectory>java</sourceDirectory>
     <testSourceDirectory>test</testSourceDirectory>
@@ -39,62 +40,12 @@
           <exclude>**/*.java</exclude>
         </excludes>
       </resource>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>WEB-INF/**</include>
+        </includes>
+      </resource>
     </resources>
   </build>
-  <dependencies>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-ajax</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-oro</groupId>
-      <artifactId>jakarta-oro</artifactId>
-      <version>2.0.8</version>
-    </dependency>
-    <dependency>
-      <groupId>jakarta-regexp</groupId>
-      <artifactId>jakarta-regexp</artifactId>
-      <version>1.4</version>
-    </dependency>
-    <dependency>
-      <groupId>xreporter</groupId>
-      <artifactId>xreporter-expression</artifactId>
-      <version>20040701</version>
-    </dependency>
-    <dependency>
-      <groupId>daisy</groupId>
-      <artifactId>daisy-htmlcleaner</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>icu4j</groupId>
-      <artifactId>icu4j</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-test-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-ajax</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>    
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Added: cocoon/blocks/forms/trunk/samples/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/samples/pom.xml?rev=328123&view=auto
==============================================================================
--- cocoon/blocks/forms/trunk/samples/pom.xml (added)
+++ cocoon/blocks/forms/trunk/samples/pom.xml Mon Oct 24 11:29:45 2005
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+    | @version $Id:$
+    |
+    +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon-forms-block</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-forms-samples</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <name>Forms Samples</name>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>**</include>
+        </includes>
+        <excludes>
+          <exclude>pom.xml</exclude>
+        </excludes>
+      </resource>
+    </resources>
+  </build>
+  <dependencies>
+    <dependency>
+      <dependency>
+        <groupId>apache-cocoon</groupId>
+        <artifactId>cocoon-forms-impl</artifactId>
+        <version>2.2-SNAPSHOT</version>
+      </dependency>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Propchange: cocoon/blocks/forms/trunk/samples/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/blocks/hsqldb/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/hsqldb/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/hsqldb/trunk/pom.xml (original)
+++ cocoon/blocks/hsqldb/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.8.0.2</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/html/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/html/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/html/trunk/pom.xml (original)
+++ cocoon/blocks/html/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -63,12 +63,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/itext/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/itext/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/itext/trunk/pom.xml (original)
+++ cocoon/blocks/itext/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/javaflow/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/javaflow/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/javaflow/trunk/pom.xml (original)
+++ cocoon/blocks/javaflow/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-forms</artifactId>
+      <artifactId>cocoon-forms-impl</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: cocoon/blocks/jcr/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jcr/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/jcr/trunk/pom.xml (original)
+++ cocoon/blocks/jcr/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -63,12 +63,4 @@
       <version>20050422T153417</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/jfor/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jfor/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/jfor/trunk/pom.xml (original)
+++ cocoon/blocks/jfor/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>0.7.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/jms/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jms/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/jms/trunk/pom.xml (original)
+++ cocoon/blocks/jms/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2005 The Apache Software Foundation
-
+  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,9 +15,9 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id:$
-    |
-    +-->
+  | @version $Id:$
+  |
+  +-->
 <project>
   <parent>
     <groupId>apache-cocoon</groupId>
@@ -29,6 +29,7 @@
   <artifactId>cocoon-jms</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <name>Jms Block</name>
   <build>
     <sourceDirectory>java</sourceDirectory>
     <resources>
@@ -62,12 +63,4 @@
       <version>1.1-rc3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/jsp/trunk/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jsp/trunk/mocks/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/jsp/trunk/mocks/pom.xml (original)
+++ cocoon/blocks/jsp/trunk/mocks/pom.xml Mon Oct 24 11:29:45 2005
@@ -40,12 +40,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/jsp/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/jsp/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/jsp/trunk/pom.xml (original)
+++ cocoon/blocks/jsp/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -59,12 +59,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/linkrewriter/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/linkrewriter/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/linkrewriter/trunk/pom.xml (original)
+++ cocoon/blocks/linkrewriter/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/lucene/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/lucene/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/lucene/trunk/pom.xml (original)
+++ cocoon/blocks/lucene/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.4.3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/mail/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/mail/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/mail/trunk/pom.xml (original)
+++ cocoon/blocks/mail/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -65,12 +65,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/midi/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/midi/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/midi/trunk/pom.xml (original)
+++ cocoon/blocks/midi/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -54,12 +54,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/naming/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/naming/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/naming/trunk/pom.xml (original)
+++ cocoon/blocks/naming/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/ojb/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/ojb/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/ojb/trunk/pom.xml (original)
+++ cocoon/blocks/ojb/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -63,12 +63,4 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/paranoid/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/paranoid/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/paranoid/trunk/pom.xml (original)
+++ cocoon/blocks/paranoid/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -53,12 +53,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/petstore/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/petstore/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/petstore/trunk/pom.xml (original)
+++ cocoon/blocks/petstore/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.6R1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/poi/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/poi/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/poi/trunk/pom.xml (original)
+++ cocoon/blocks/poi/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.5.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Added: cocoon/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/pom.xml?rev=328123&view=auto
==============================================================================
--- cocoon/blocks/pom.xml (added)
+++ cocoon/blocks/pom.xml Mon Oct 24 11:29:45 2005
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2005 The Apache Software Foundation
+  
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+  
+    http://www.apache.org/licenses/LICENSE-2.0
+  
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--+
+    | @version $Id:$
+    |
+    +-->
+<project>
+  <parent>
+    <groupId>apache-cocoon</groupId>
+    <artifactId>cocoon</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>apache-cocoon</groupId>
+  <artifactId>cocoon-blocks</artifactId>
+  <version>2.2-SNAPSHOT</version>
+  <name>Cocoon Blocks</name>
+  <packaging>pom</packaging>
+  <modules>
+    <module>ajax/trunk</module>
+    <module>apples/trunk</module>
+    <module>asciiart/trunk</module>
+    <module>authentication-fw/trunk</module>
+    <module>axis/trunk</module>
+    <module>batik/trunk</module>
+    <module>bsf/trunk</module>
+    <module>chaperon/trunk</module>
+    <module>cron/trunk</module>
+    <module>databases/trunk</module>
+    <module>databases/trunk/mocks</module>
+    <module>deli/trunk</module>
+    <module>eventcache/trunk</module>
+    <module>faces/trunk</module>
+    <module>fop/trunk</module>
+    <module>forms</module>
+    <module>hsqldb/trunk</module>
+    <module>html/trunk</module>
+    <module>itext/trunk</module>
+    <module>javaflow/trunk</module>
+    <module>jfor/trunk</module>
+    <module>jms/trunk</module>
+    <module>jsp/trunk</module>
+    <module>jsp/trunk/mocks</module>
+    <module>linkrewriter/trunk</module>
+    <module>lucene/trunk</module>
+    <module>mail/trunk</module>
+    <module>midi/trunk</module>
+    <module>naming/trunk</module>
+    <module>ojb/trunk</module>
+    <module>ojb/trunk/mocks</module>
+    <module>paranoid/trunk</module>
+    <module>petstore/trunk</module>
+    <module>poi/trunk</module>
+    <module>portal/trunk</module>
+    <module>portal-sample/trunk</module>
+    <module>profiler/trunk</module>
+    <module>proxy/trunk</module>
+    <module>python/trunk</module>
+    <module>python/trunk/mocks</module>
+    <module>qdox/trunk</module>
+    <module>querybean/trunk</module>
+    <module>repository/trunk</module>
+    <module>scratchpad/trunk</module>
+    <module>scratchpad/trunk/garbage</module>
+    <module>scratchpad/trunk/mocks</module>
+    <module>serializers/trunk</module>
+    <module>session-fw/trunk</module>
+    <module>slide/trunk</module>
+    <module>slop/trunk</module>
+    <module>spring-app/trunk</module>
+    <module>stx/trunk</module>
+    <module>taglib/trunk</module>
+    <module>template/trunk</module>
+    <module>tour/trunk</module>
+    <module>velocity/trunk</module>
+    <module>web3/trunk</module>
+    <module>web3/trunk/mocks</module>
+    <module>webdav/trunk</module>
+    <module>xmldb/trunk</module>
+    <module>xsp/trunk</module>
+    <module>xsp/trunk/mocks</module>
+  </modules>
+</project>

Propchange: cocoon/blocks/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: cocoon/blocks/portal-sample/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/pom.xml (original)
+++ cocoon/blocks/portal-sample/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -29,6 +29,7 @@
   <artifactId>cocoon-portal-sample</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>war</packaging>
+  <name>Portal Sample Block</name>
   <build>
     <sourceDirectory>java</sourceDirectory>
     <resources>

Modified: cocoon/blocks/portal/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/pom.xml (original)
+++ cocoon/blocks/portal/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -59,7 +59,7 @@
     </dependency>
     <dependency>
       <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-forms</artifactId>
+      <artifactId>cocoon-forms-impl</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
     <dependency>

Modified: cocoon/blocks/profiler/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/profiler/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/profiler/trunk/pom.xml (original)
+++ cocoon/blocks/profiler/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -29,6 +29,7 @@
   <artifactId>cocoon-profiler</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <name>Profiler Block</name>
   <build>
     <sourceDirectory>java</sourceDirectory>
     <outputDirectory>target/webapp/BLOCK-INF/classes</outputDirectory>

Modified: cocoon/blocks/proxy/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/proxy/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/proxy/trunk/pom.xml (original)
+++ cocoon/blocks/proxy/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -53,12 +53,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/python/trunk/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/python/trunk/mocks/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/python/trunk/mocks/pom.xml (original)
+++ cocoon/blocks/python/trunk/mocks/pom.xml Mon Oct 24 11:29:45 2005
@@ -32,12 +32,4 @@
   <build>
     <sourceDirectory>.</sourceDirectory>
   </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/python/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/python/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/python/trunk/pom.xml (original)
+++ cocoon/blocks/python/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -58,12 +58,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/qdox/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/qdox/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/qdox/trunk/pom.xml (original)
+++ cocoon/blocks/qdox/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.5</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/querybean/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/querybean/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/querybean/trunk/pom.xml (original)
+++ cocoon/blocks/querybean/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/repository/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/repository/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/repository/trunk/pom.xml (original)
+++ cocoon/blocks/repository/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -57,12 +57,4 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/scratchpad/trunk/garbage/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/garbage/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/garbage/pom.xml (original)
+++ cocoon/blocks/scratchpad/trunk/garbage/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/scratchpad/trunk/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/mocks/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/mocks/pom.xml (original)
+++ cocoon/blocks/scratchpad/trunk/mocks/pom.xml Mon Oct 24 11:29:45 2005
@@ -44,12 +44,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/scratchpad/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/pom.xml (original)
+++ cocoon/blocks/scratchpad/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -100,12 +100,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/serializers/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/serializers/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/serializers/trunk/pom.xml (original)
+++ cocoon/blocks/serializers/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/session-fw/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/session-fw/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/session-fw/trunk/pom.xml (original)
+++ cocoon/blocks/session-fw/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/slide/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/slide/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/slide/trunk/pom.xml (original)
+++ cocoon/blocks/slide/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -82,12 +82,4 @@
       <version>1.0.1B-rc3</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/slop/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/slop/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/slop/trunk/pom.xml (original)
+++ cocoon/blocks/slop/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/spring-app/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/spring-app/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/spring-app/trunk/pom.xml (original)
+++ cocoon/blocks/spring-app/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -58,12 +58,4 @@
       <version>1.2.4</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/stx/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/stx/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/stx/trunk/pom.xml (original)
+++ cocoon/blocks/stx/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/taglib/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/taglib/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/taglib/trunk/pom.xml (original)
+++ cocoon/blocks/taglib/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>2.0</version>
     </dependency>  
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/template/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/pom.xml (original)
+++ cocoon/blocks/template/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -54,12 +54,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/tour/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/tour/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/tour/trunk/pom.xml (original)
+++ cocoon/blocks/tour/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -47,12 +47,4 @@
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/velocity/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/velocity/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/velocity/trunk/pom.xml (original)
+++ cocoon/blocks/velocity/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -52,12 +52,4 @@
       <version>1.4</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/web3/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/web3/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/web3/trunk/pom.xml (original)
+++ cocoon/blocks/web3/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -53,12 +53,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/webdav/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/webdav/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/webdav/trunk/pom.xml (original)
+++ cocoon/blocks/webdav/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -74,12 +74,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/xmldb/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xmldb/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/xmldb/trunk/pom.xml (original)
+++ cocoon/blocks/xmldb/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -77,12 +77,4 @@
       <version>1.1b4</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/blocks/xsp/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/xsp/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/blocks/xsp/trunk/pom.xml (original)
+++ cocoon/blocks/xsp/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -74,12 +74,4 @@
       <version>2.1</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/trunk/core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/trunk/core/pom.xml (original)
+++ cocoon/trunk/core/pom.xml Mon Oct 24 11:29:45 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2005 The Apache Software Foundation
-
+  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,9 +15,9 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id$
-    |
-    +-->
+  | @version $Id$
+  |
+  +-->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -27,6 +27,7 @@
   </parent>
   <artifactId>cocoon-core</artifactId>
   <packaging>jar</packaging>
+  <name>Cocoon Core</name>
   <build>
     <sourceDirectory>../src/java</sourceDirectory>
     <testSourceDirectory>../src/test</testSourceDirectory>
@@ -40,7 +41,7 @@
     </resources>
     <testResources>
       <testResource>
-      <directory>../src/test</directory>
+        <directory>../src/test</directory>
         <excludes>
           <exclude>**/*.java</exclude>
         </excludes>
@@ -120,7 +121,7 @@
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>2.0.2</version>
-    </dependency> 
+    </dependency>
     <dependency>
       <groupId>commons-javaflow</groupId>
       <artifactId>commons-javaflow</artifactId>
@@ -353,4 +354,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>apache</id>
+      <name>repository</name>
+      <url>scpexe://cvs.apache.org/x1/www/cvs.apache.org/repository</url>
+      <layout>legacy</layout>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

Modified: cocoon/trunk/core/test-core/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/test-core/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/trunk/core/test-core/pom.xml (original)
+++ cocoon/trunk/core/test-core/pom.xml Mon Oct 24 11:29:45 2005
@@ -27,6 +27,7 @@
   </parent>
   <artifactId>cocoon-test-core</artifactId>
   <packaging>jar</packaging>
+  <name>Core Tests</name>
   <build>
     <sourceDirectory>../../src/test</sourceDirectory>
     <resources>
@@ -65,12 +66,4 @@
       <version>0.8</version>
     </dependency>
   </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Mon Oct 24 11:29:45 2005
@@ -24,75 +24,14 @@
   <artifactId>cocoon</artifactId>
   <packaging>pom</packaging>
   <version>2.2-SNAPSHOT</version>
-  <name>Apache Cocoon Core</name>
+  <name>Apache Cocoon</name>
   <url>http://cocoon.apache.org</url>
   <modules>
     <module>core</module>
     <module>core/test-core</module>
     <module>webapp</module>
-    <module>src/blocks/ajax/trunk</module>
-    <module>src/blocks/apples/trunk</module>
-    <module>src/blocks/asciiart/trunk</module>
-    <module>src/blocks/authentication-fw/trunk</module>
-    <module>src/blocks/axis/trunk</module>
-    <module>src/blocks/batik/trunk</module>
-    <module>src/blocks/bsf/trunk</module>
-    <module>src/blocks/chaperon/trunk</module>
-    <module>src/blocks/cron/trunk</module>
-    <module>src/blocks/databases/trunk</module>
-    <module>src/blocks/databases/trunk/mocks</module>
-    <module>src/blocks/deli/trunk</module>
-    <module>src/blocks/eventcache/trunk</module>
-    <module>src/blocks/faces/trunk</module>
-    <module>src/blocks/fop/trunk</module>
-    <module>src/blocks/forms/trunk</module>
-    <module>src/blocks/hsqldb/trunk</module>
-    <module>src/blocks/html/trunk</module>
-    <module>src/blocks/itext/trunk</module>
-    <module>src/blocks/javaflow/trunk</module>
-    <module>src/blocks/jfor/trunk</module>
-    <module>src/blocks/jms/trunk</module>
-    <module>src/blocks/jsp/trunk</module>
-    <module>src/blocks/jsp/trunk/mocks</module>
-    <module>src/blocks/linkrewriter/trunk</module>
-    <module>src/blocks/lucene/trunk</module>
-    <module>src/blocks/mail/trunk</module>
-    <module>src/blocks/midi/trunk</module>
+    <module>src/blocks</module>
     <module>src/mocks</module>
-    <module>src/blocks/naming/trunk</module>
-    <module>src/blocks/ojb/trunk</module>
-    <module>src/blocks/ojb/trunk/mocks</module>
-    <module>src/blocks/paranoid/trunk</module>
-    <module>src/blocks/petstore/trunk</module>
-    <module>src/blocks/poi/trunk</module>
-    <module>src/blocks/portal/trunk</module>
-    <module>src/blocks/portal-sample/trunk</module>
-    <module>src/blocks/profiler/trunk</module>
-    <module>src/blocks/proxy/trunk</module>
-    <module>src/blocks/python/trunk</module>
-    <module>src/blocks/python/trunk/mocks</module>
-    <module>src/blocks/qdox/trunk</module>
-    <module>src/blocks/querybean/trunk</module>
-    <module>src/blocks/repository/trunk</module>
-    <module>src/blocks/scratchpad/trunk</module>
-    <module>src/blocks/scratchpad/trunk/garbage</module>
-    <module>src/blocks/scratchpad/trunk/mocks</module>
-    <module>src/blocks/serializers/trunk</module>
-    <module>src/blocks/session-fw/trunk</module>
-    <module>src/blocks/slide/trunk</module>
-    <module>src/blocks/slop/trunk</module>
-    <module>src/blocks/spring-app/trunk</module>
-    <module>src/blocks/stx/trunk</module>
-    <module>src/blocks/taglib/trunk</module>
-    <module>src/blocks/template/trunk</module>
-    <module>src/blocks/tour/trunk</module>
-    <module>src/blocks/velocity/trunk</module>
-    <module>src/blocks/web3/trunk</module>
-    <module>src/blocks/web3/trunk/mocks</module>
-    <module>src/blocks/webdav/trunk</module>
-    <module>src/blocks/xmldb/trunk</module>
-    <module>src/blocks/xsp/trunk</module>
-    <module>src/blocks/xsp/trunk/mocks</module>
   </modules>
   <repositories>
     <!-- Apache specific maven repositories available to all blocks -->
@@ -103,4 +42,17 @@
       <layout>legacy</layout>
     </repository>
   </repositories>
+  <scm>
+    <connection>http://svn.apache.org/repos/asf/cocoon/trunk</connection>
+    <url>http://svn.apache.org/repos/asf/cocoon/trunk</url>
+  </scm>
+  <distributionManagement>
+    <snapshotRepository>
+      <uniqueVersion>false</uniqueVersion>
+      <id>apache</id>
+      <name>repository</name>
+      <url>scpexe://cvs.apache.org/x1/www/cvs.apache.org/repository</url>
+      <layout>legacy</layout>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

Modified: cocoon/trunk/src/mocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/mocks/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/trunk/src/mocks/pom.xml (original)
+++ cocoon/trunk/src/mocks/pom.xml Mon Oct 24 11:29:45 2005
@@ -29,6 +29,7 @@
   <artifactId>cocoon-mocks</artifactId>
   <version>2.2-SNAPSHOT</version>
   <packaging>jar</packaging>
+  <name>Core Mocks</name>
   <build>
     <sourceDirectory>.</sourceDirectory>
   </build>

Modified: cocoon/trunk/webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/webapp/pom.xml?rev=328123&r1=328122&r2=328123&view=diff
==============================================================================
--- cocoon/trunk/webapp/pom.xml (original)
+++ cocoon/trunk/webapp/pom.xml Mon Oct 24 11:29:45 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright 2005 The Apache Software Foundation
-
+  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,9 +15,9 @@
   limitations under the License.
 -->
 <!--+
-    | @version $Id$
-    |
-    +-->
+  | @version $Id$
+  |
+  +-->
 <project>
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -27,6 +27,7 @@
   </parent>
   <artifactId>cocoon-webapp</artifactId>
   <packaging>war</packaging>
+  <name>Core Webapp</name>
   <build>
     <plugins>
       <plugin>
@@ -41,283 +42,6 @@
     <dependency>
       <groupId>apache-cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <!-- We temporary include all blocks here to see if the transitive dependencies
-         cause trouble: -->
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-core</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-ajax</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-apples</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-asciiart</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-authentication-fw</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-axis</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-batik</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-bsf</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-chaperon</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-cron</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-databases</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-deli</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-eventcache</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-faces</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-fop</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-forms</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-hsqldb</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-html</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-itext</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-javaflow</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-jfor</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-jms</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-jsp</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-linkrewriter</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-lucene</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-mail</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-midi</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-naming</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-ojb</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-paranoid</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-petstore</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-poi</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-portal</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-portal-sample</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-profiler</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-proxy</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-python</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-qdox</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-querybean</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-repository</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-scratchpad</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-serializers</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-session-fw</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-slide</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-slop</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-spring-app</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-stx</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-taglib</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-template</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-tour</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-velocity</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-web3</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-webdav</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-xmldb</artifactId>
-      <version>2.2-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>apache-cocoon</groupId>
-      <artifactId>cocoon-xsp</artifactId>
       <version>2.2-SNAPSHOT</version>
     </dependency>
   </dependencies>



Mime
View raw message