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 2006/04/01 14:24:19 UTC
svn commit: r390656 - in /cocoon/trunk: blocks/ blocks/cocoon-fop/
blocks/cocoon-fop/cocoon-fop-impl/
blocks/cocoon-fop/cocoon-fop-impl/src/main/resources/META-INF/legacy/xconf/
blocks/cocoon-fop/cocoon-fop-sample/ core/cocoon-webapp/
Author: reinhard
Date: Sat Apr 1 04:24:16 2006
New Revision: 390656
URL: http://svn.apache.org/viewcvs?rev=390656&view=rev
Log:
integrate FOP-block into Maven build; add it to webapp (though there is no usable example in it as all pipelines refers to external resources)
Removed:
cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/src/main/resources/META-INF/legacy/xconf/
Modified:
cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/ (props changed)
cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/ (props changed)
cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
cocoon/trunk/blocks/cocoon-fop/pom.xml
cocoon/trunk/blocks/pom.xml
cocoon/trunk/core/cocoon-webapp/pom.xml
Propchange: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 1 04:24:16 2006
@@ -0,0 +1,5 @@
+
+target
+.classpath
+.project
+.wtpmodules
Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml?rev=390656&r1=390655&r2=390656&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-impl/pom.xml Sat Apr 1 04:24:16 2006
@@ -15,22 +15,27 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
- |
+ | @version $Id$
+-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:fo="http://www.w3.org/1999/XSL/Format" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.cocoon</groupId>
+
<artifactId>cocoon-fop-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
+
<packaging>jar</packaging>
- <name>fop Block Implementation</name>
- <description/>
+ <name>FOP Block Implementation</name>
+
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
@@ -41,6 +46,11 @@
<groupId>fop</groupId>
<artifactId>fop</artifactId>
<version>0.20.5</version>
+ </dependency>
+ <dependency>
+ <groupId>batik</groupId>
+ <artifactId>batik-1.5-fop</artifactId>
+ <version>0.20-5</version>
</dependency>
</dependencies>
</project>
Propchange: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 1 04:24:16 2006
@@ -0,0 +1,5 @@
+
+target
+.classpath
+.project
+.wtpmodules
Modified: cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml?rev=390656&r1=390655&r2=390656&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-sample/pom.xml Sat Apr 1 04:24:16 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -27,22 +27,21 @@
<parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
</parent>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop-sample</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>fop Block Samples</name>
- <description></description>
+ <name>FOP Block Samples</name>
<dependencies>
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop-impl</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: cocoon/trunk/blocks/cocoon-fop/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/cocoon-fop/pom.xml?rev=390656&r1=390655&r2=390656&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/pom.xml Sat Apr 1 04:24:16 2006
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!--+
- | @version $Id:$
+ | @version $Id$
+-->
<project
xmlns="http://maven.apache.org/POM/4.0.0"
@@ -24,24 +24,24 @@
<parent>
<groupId>org.apache.cocoon</groupId>
- <artifactId>cocoon-blocks</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>cocoon-blocks-modules</artifactId>
+ <version>1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-fop</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>fop Block</name>
+ <name>FOP Block</name>
<description></description>
<modules>
- <module>cocoon-fop-impl</module>
<module>cocoon-fop-sample</module>
+ <module>cocoon-fop-impl</module>
</modules>
</project>
Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/blocks/pom.xml?rev=390656&r1=390655&r2=390656&view=diff
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Sat Apr 1 04:24:16 2006
@@ -38,8 +38,8 @@
<name>Cocoon Blocks [modules]</name>
<modules>
- <!--module>cocoon-apples</module-->
- <!--module>cocoon-asciiart</module>
+ <!--module>cocoon-apples</module
+ <module>cocoon-asciiart</module>
<module>cocoon-axis</module>
<module>cocoon-batik</module>
<module>cocoon-bsf</module>
@@ -48,9 +48,9 @@
<module>cocoon-core-samples-main</module>
<module>cocoon-deli</module>
<module>cocoon-eventcache</module>
- <module>cocoon-faces</module>
+ <module>cocoon-faces</module-->
<module>cocoon-fop</module>
- <module>cocoon-hsqldb</module>
+ <!--module>cocoon-hsqldb</module>
<module>cocoon-html</module>
<module>cocoon-itext</module>
<module>cocoon-javaflow</module>
Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/core/cocoon-webapp/pom.xml?rev=390656&r1=390655&r2=390656&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Sat Apr 1 04:24:16 2006
@@ -85,12 +85,17 @@
<!--dependency> cocoon-session-fw-sample doesn't work because of old-style xconf/roles-files
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-session-fw-sample</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency-->
<dependency>
<groupId>org.apache.cocoon</groupId>
<artifactId>cocoon-deployer-plugin-demo</artifactId>
<version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cocoon</groupId>
+ <artifactId>cocoon-fop-sample</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>