You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2007/02/05 19:54:23 UTC
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
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>