You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/10/04 09:46:06 UTC

svn commit: r581791 - in /cocoon/trunk/blocks: ./ cocoon-faces/cocoon-faces-impl/ cocoon-faces/cocoon-faces-sample/ cocoon-imageop/ cocoon-imageop/cocoon-imageop-impl/ cocoon-imageop/cocoon-imageop-sample/ cocoon-itext/ cocoon-midi/ cocoon-midi/cocoon-...

Author: vgritsenko
Date: Thu Oct  4 00:46:03 2007
New Revision: 581791

URL: http://svn.apache.org/viewvc?rev=581791&view=rev
Log:
flattening, again

Removed:
    cocoon/trunk/blocks/cocoon-imageop/pom.xml
    cocoon/trunk/blocks/cocoon-itext/pom.xml
    cocoon/trunk/blocks/cocoon-midi/pom.xml
    cocoon/trunk/blocks/cocoon-naming/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/pom.xml
    cocoon/trunk/blocks/cocoon-petstore/pom.xml
    cocoon/trunk/blocks/cocoon-poi/pom.xml
    cocoon/trunk/blocks/cocoon-profiler/pom.xml
    cocoon/trunk/blocks/cocoon-proxy/pom.xml
    cocoon/trunk/blocks/cocoon-python/pom.xml
    cocoon/trunk/blocks/cocoon-qdox/pom.xml
    cocoon/trunk/blocks/cocoon-querybean/pom.xml
    cocoon/trunk/blocks/cocoon-repository/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/pom.xml
    cocoon/trunk/blocks/cocoon-session-fw/pom.xml
    cocoon/trunk/blocks/cocoon-slide/pom.xml
    cocoon/trunk/blocks/cocoon-slop/pom.xml
    cocoon/trunk/blocks/cocoon-stx/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/pom.xml
Modified:
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
    cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
    cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
    cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
    cocoon/trunk/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
    cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
    cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
    cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
    cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
    cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/pom.xml
    cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
    cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
    cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
    cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
    cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
    cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
    cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
    cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
    cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
    cocoon/trunk/blocks/pom.xml

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -26,8 +26,9 @@
 
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-faces</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-faces-impl</artifactId>

Modified: cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-faces/cocoon-faces-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -26,8 +26,9 @@
 
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-faces</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-faces-sample</artifactId>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -26,8 +26,9 @@
 
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-imageop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-imageop-impl</artifactId>

Modified: cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-imageop/cocoon-imageop-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -26,8 +26,9 @@
 
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-imageop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>cocoon-imageop-sample</artifactId>

Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,37 +17,37 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-midi</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-midi-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Midi Block Implementation</name>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-<!--
+    <!--
           Test dependencies
           TODO remove these when MNG-1378 is fixed, these are inherited from the root pom normally
      -->

Modified: cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-midi/cocoon-midi-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-midi</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-midi-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Midi Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-naming/cocoon-naming-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,28 +17,29 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-naming</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-naming-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Naming Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-naming/cocoon-naming-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-naming/cocoon-naming-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-naming/cocoon-naming-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-naming/cocoon-naming-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,28 +17,29 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-naming</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-naming-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Naming Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-naming-impl</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,44 +17,42 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-ojb</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-ojb-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Ojb Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-ojb-mocks</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>ojb</groupId>
       <artifactId>db-ojb</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>jdo</groupId>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-mocks/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,22 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-ojb</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-ojb-mocks</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Ojb Block Mocks</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies/>
 </project>

Modified: cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-ojb/cocoon-ojb-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-ojb</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-ojb-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Ojb Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -48,7 +50,7 @@
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-databases-sample</artifactId>
     </dependency>
-<!--  For now we have to depend on the querybean block as the ojb configuration contains
+    <!--  For now we have to depend on the querybean block as the ojb configuration contains
           mappings for some beans from the querybean block :( -->
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,33 +17,33 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-petstore</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-petstore-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Petstore Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-petstore/cocoon-petstore-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-petstore</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-petstore-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Petstore Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,33 +17,33 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-poi</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-poi-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Poi Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>poi</groupId>
       <artifactId>poi</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-poi/cocoon-poi-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-poi</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-poi-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Poi Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,22 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-profiler</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-profiler-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Profiler Block</name>
+  <packaging>jar</packaging>
 
   <dependencies>
     <dependency>

Modified: cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-profiler/cocoon-profiler-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-profiler</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-profiler-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Profiler Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,38 +17,37 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-proxy</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-proxy-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Proxy Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-proxy/cocoon-proxy-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-proxy</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-proxy-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Proxy Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,38 +17,37 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-python</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-python-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Python Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-python-mocks</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-xsp-impl</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-python/cocoon-python-mocks/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,22 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-python</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-python-mocks</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Python Block Mocks</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies/>
 </project>

Modified: cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,33 +17,33 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-qdox</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-qdox-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Qdox Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>qdox</groupId>
       <artifactId>qdox</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-qdox/cocoon-qdox-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-qdox</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-qdox-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Qdox Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,33 +17,33 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-querybean</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-querybean-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Querybean Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-lucene-impl</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-querybean/cocoon-querybean-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-querybean</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-querybean-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Querybean Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-repository/cocoon-repository-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,56 +17,53 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-repository</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-repository-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Repository Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-eventcache-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-datasource</artifactId>    
-      
     </dependency>
     <!-- test -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,58 +17,53 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-scratchpad</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-scratchpad-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Scratchpad Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-flowscript-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.axis</groupId>
       <artifactId>axis</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>axis</groupId>
       <artifactId>axis-wsdl4j</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-betwixt</groupId>
       <artifactId>commons-betwixt</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
@@ -83,7 +78,6 @@
     <dependency>
       <groupId>org.apache.excalibur.components</groupId>
       <artifactId>excalibur-sourceresolve</artifactId>
-      
       <exclusions>
         <exclusion>
           <groupId>d-haven-managed-pool</groupId>
@@ -102,23 +96,19 @@
     <dependency>
       <groupId>castor</groupId>
       <artifactId>castor</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
       <type>test-jar</type>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-scratchpad/cocoon-scratchpad-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-scratchpad</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-scratchpad-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Scratchpad Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,26 +17,29 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-session-fw</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>cocoon-session-fw-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Session Framework Implementation</name>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-session-fw/cocoon-session-fw-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,27 +17,32 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
-    <artifactId>cocoon-session-fw</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
+
   <artifactId>cocoon-session-fw-sample</artifactId>
-  <packaging>jar</packaging>
   <version>1.0.0-SNAPSHOT</version>
-  <name>Session Framework Sample Application </name>
+  <name>Session Framework Sample Application</name>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-session-fw-impl</artifactId>
     </dependency>
   </dependencies>
+
   <pluginRepositories>
     <pluginRepository>
       <id>snapshots</id>

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,69 +17,61 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slide</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-slide-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Slide Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-jms-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-repository-impl</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>slide</groupId>
       <artifactId>slide-kernel</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>slide</groupId>
       <artifactId>slide-stores</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>slide</groupId>
       <artifactId>slide-webdavservlet</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>jdom</groupId>
       <artifactId>jdom</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
       <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-      
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
-      
       <scope>provided</scope>
     </dependency>
   </dependencies>

Modified: cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slide/cocoon-slide-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,24 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
     <artifactId>cocoon-slide</artifactId>
     <version>1-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-slide-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Slide Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -22,23 +22,24 @@
     |
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-slop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-slop-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Slop Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-slop/cocoon-slop-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -23,17 +23,19 @@
     +-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-slop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-slop-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Slop Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,28 +17,29 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-stx</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-stx-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Stx Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-stx/cocoon-stx-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-stx</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-stx-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Stx Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-impl/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,33 +17,33 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-taglib</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-taglib-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Taglib Block Implementation</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
-      
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
-      
     </dependency>
   </dependencies>
 </project>

Modified: cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-taglib/cocoon-taglib-sample/pom.xml Thu Oct  4 00:46:03 2007
@@ -17,23 +17,25 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!--+
-    | @version $Id$
-    |
-    +-->
+
+<!--
+  - @version $Id$
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-taglib</artifactId>
-    <version>1-SNAPSHOT</version>
+    <artifactId>cocoon-blocks-modules</artifactId>
+    <version>6-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
+
   <artifactId>cocoon-taglib-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
   <name>Taglib Block Samples</name>
-  <description/>
+  <packaging>jar</packaging>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?rev=581791&r1=581790&r2=581791&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Thu Oct  4 00:46:03 2007
@@ -178,26 +178,43 @@
         <module>cocoon-lucene/cocoon-lucene-sample</module>
         <module>cocoon-mail/cocoon-mail-impl</module>
         <module>cocoon-mail/cocoon-mail-sample</module>        
-        <module>cocoon-midi</module>
-        <module>cocoon-naming</module>
-        <module>cocoon-ojb</module>
-        <module>cocoon-petstore</module>
-        <module>cocoon-poi</module>
+        <module>cocoon-midi/cocoon-midi-impl</module>
+        <module>cocoon-midi/cocoon-midi-sample</module>
+        <module>cocoon-naming/cocoon-naming-impl</module>
+        <module>cocoon-naming/cocoon-naming-sample</module>
+        <module>cocoon-ojb/cocoon-ojb-impl</module>
+        <module>cocoon-ojb/cocoon-ojb-mocks</module>
+        <module>cocoon-ojb/cocoon-ojb-sample</module>
+        <module>cocoon-petstore/cocoon-petstore-impl</module>
+        <module>cocoon-petstore/cocoon-petstore-sample</module>
+        <module>cocoon-poi/cocoon-poi-impl</module>
+        <module>cocoon-poi/cocoon-poi-sample</module>
         <module>cocoon-portal</module>
-        <module>cocoon-profiler</module>
-        <module>cocoon-proxy</module>
-        <module>cocoon-python</module>
-        <module>cocoon-qdox</module>
-        <module>cocoon-querybean</module>
-        <module>cocoon-repository</module>
-        <module>cocoon-scratchpad</module>
+        <module>cocoon-profiler/cocoon-profiler-impl</module>
+        <module>cocoon-profiler/cocoon-profiler-sample</module>
+        <module>cocoon-proxy/cocoon-proxy-impl</module>
+        <module>cocoon-proxy/cocoon-proxy-sample</module>
+        <module>cocoon-python/cocoon-python-impl</module>
+        <module>cocoon-python/cocoon-python-mocks</module>
+        <module>cocoon-qdox/cocoon-qdox-impl</module>
+        <module>cocoon-qdox/cocoon-qdox-sample</module>
+        <module>cocoon-querybean/cocoon-querybean-impl</module>
+        <module>cocoon-querybean/cocoon-querybean-sample</module>
+        <module>cocoon-repository/cocoon-repository-impl</module>
+        <module>cocoon-scratchpad/cocoon-scratchpad-impl</module>
+        <module>cocoon-scratchpad/cocoon-scratchpad-sample</module>
         <module>cocoon-serializers/cocoon-serializers-charsets</module>
         <module>cocoon-serializers/cocoon-serializers-impl</module>
-        <module>cocoon-session-fw</module>
-        <module>cocoon-slide</module>
-        <module>cocoon-slop</module>
-        <module>cocoon-stx</module>
-        <module>cocoon-taglib</module>
+        <module>cocoon-session-fw/cocoon-session-fw-impl</module>
+        <module>cocoon-session-fw/cocoon-session-fw-sample</module>
+        <module>cocoon-slide/cocoon-slide-impl</module>
+        <module>cocoon-slide/cocoon-slide-sample</module>
+        <module>cocoon-slop/cocoon-slop-impl</module>
+        <module>cocoon-slop/cocoon-slop-sample</module>
+        <module>cocoon-stx/cocoon-stx-impl</module>
+        <module>cocoon-stx/cocoon-stx-sample</module>
+        <module>cocoon-taglib/cocoon-taglib-impl</module>
+        <module>cocoon-taglib/cocoon-taglib-sample</module>
         <module>cocoon-tour</module>
         <module>cocoon-validation</module>
         <module>cocoon-velocity</module>