Return-Path: 
 <cvs-return-29644-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@www.apache.org
Received: (qmail 87706 invoked from network); 5 Feb 2007 18:54:46 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 5 Feb 2007 18:54:46 -0000
Received: (qmail 30701 invoked by uid 500); 5 Feb 2007 18:54:52 -0000
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 30571 invoked by uid 500); 5 Feb 2007 18:54:52 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
List-Post: <mailto:cvs@cocoon.apache.org>
List-Id: <cvs.cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 30560 invoked by uid 99); 5 Feb 2007 18:54:52 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 10:54:52 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Feb 2007 10:54:44 -0800
Received: by eris.apache.org (Postfix, from userid 65534)
	id 32D621A981A; Mon,  5 Feb 2007 10:54:24 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r503812 - in /cocoon/trunk/blocks:
 cocoon-fop/cocoon-fop-impl/pom.xml cocoon-fop/cocoon-fop-ng-impl/pom.xml
 cocoon-fop/cocoon-fop-ng-sample/pom.xml
 cocoon-fop/cocoon-fop-sample/pom.xml cocoon-fop/pom.xml pom.xml
Date: Mon, 05 Feb 2007 18:54:23 -0000
To: cvs@cocoon.apache.org
From: reinhard@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070205185424.32D621A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: reinhard
Date: Mon Feb  5 10:54:22 2007
New Revision: 503812

URL: http://svn.apache.org/viewvc?view=rev&rev=503812
Log:
flatten pom hierarchy

Removed:
    cocoon/trunk/blocks/cocoon-fop/pom.xml
Modified:
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
    cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
    cocoon/trunk/blocks/pom.xml

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml?view=diff&rev=503812&r1=503811&r2=503812
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml Mon Feb  5 10:54:22 2007
@@ -19,43 +19,49 @@
 -->
 <!--+
     | @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>
+  <packaging>jar</packaging>  
+
   <parent>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-fop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>3-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-fop-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>FOP Block Implementation</name>
+  <name>Cocoon FOP Block Implementation</name>
+  
   <distributionManagement>
     <site>
       <id>website</id>
       <url>${docs.deploymentBaseUrl}/blocks/fop/${docs.version}/</url>
     </site>
   </distributionManagement>
+  
   <properties>
-    <docs.name>Cocoon FOP</docs.name>    
+    <docs.name>Cocoon FOP</docs.name>
     <docs.version>1.0</docs.version>
-  </properties>     
+  </properties>
+  
   <build>
     <plugins>
       <plugin>
         <groupId>org.daisycms</groupId>
         <artifactId>daisy-maven-plugin</artifactId>
-        <configuration>        
+        <configuration>
           <navDocId>1218</navDocId>
-          <collection>cdocs-fop</collection>          
+          <collection>cdocs-fop</collection>
           <skipFirstNavigationDocumentLevel>true</skipFirstNavigationDocumentLevel>
         </configuration>
-      </plugin>         
-    </plugins> 
-    </build>
-    <dependencies>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
       <artifactId>cocoon-core</artifactId>
@@ -90,4 +96,6 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
+  
 </project>
+

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml?view=diff&rev=503812&r1=503811&r2=503812
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml Mon Feb  5 10:54:22 2007
@@ -19,19 +19,22 @@
 -->
 <!--+
     | @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>
+  <packaging>jar</packaging>
+  
   <parent>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-fop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>3-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>cocoon-fop-ng-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>FOP 0.92 Block Implementation</name>
+  <name>Cocoon FOP 0.92 Block Implementation</name>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -69,4 +72,5 @@
       </exclusions>
     </dependency>
   </dependencies>
-</project>
+  
+</project>
\ No newline at end of file

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml?view=diff&rev=503812&r1=503811&r2=503812
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml Mon Feb  5 10:54:22 2007
@@ -19,20 +19,22 @@
 -->
 <!--+
     | @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>
+  <packaging>jar</packaging>  
+  
   <parent>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-fop</artifactId>
-    <version>1-SNAPSHOT</version>
+    <version>3-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <groupId>org.apache.cocoon</groupId>
   <artifactId>cocoon-fop-ng-sample</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>FOP 0.92 Block Samples</name>
+  <version>1.0.0-SNAPSHOT</version>  
+  <name>Cocoon FOP 0.92 Block Samples</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.cocoon</groupId>
@@ -45,4 +47,5 @@
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
-</project>
+
+</project>
\ No newline at end of file

Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml?view=diff&rev=503812&r1=503811&r2=503812
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml Mon Feb  5 10:54:22 2007
@@ -19,30 +19,34 @@
 -->
 <!--+
     | @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-fop</artifactId>
-        <version>1-SNAPSHOT</version>
-    </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+    
+  <parent>
+    <artifactId>cocoon-blocks-modules</artifactId>
     <groupId>org.apache.cocoon</groupId>
-    <artifactId>cocoon-fop-sample</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>FOP Block Samples</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-fop-impl</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-core-main-sample</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
+    <version>3-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.cocoon</groupId>
+  <artifactId>cocoon-fop-sample</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <name>Cocoon FOP Block Samples</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-fop-impl</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-core-main-sample</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=503812&r1=503811&r2=503812
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Mon Feb  5 10:54:22 2007
@@ -85,7 +85,10 @@
         <module>cocoon-deli</module>
         <module>cocoon-eventcache</module>
         <module>cocoon-faces</module>
-        <module>cocoon-fop</module>
+        <module>cocoon-fop/cocoon-fop-impl</module>
+        <module>cocoon-fop/cocoon-fop-ng-impl</module>        
+        <module>cocoon-fop/cocoon-fop-ng-sample</module>
+        <module>cocoon-fop/cocoon-fop-sample</module>                
         <module>cocoon-html</module>
         <module>cocoon-itext</module>
         <module>cocoon-javaflow</module>