cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jjohns...@apache.org
Subject svn commit: r545016 - in /cocoon/trunk: blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml blocks/pom.xml core/cocoon-webapp/pom.xml pom.xml
Date Thu, 07 Jun 2007 01:21:06 GMT
Author: jjohnston
Date: Wed Jun  6 18:21:05 2007
New Revision: 545016

URL: http://svn.apache.org/viewvc?view=rev&rev=545016
Log:
Enable the FOP 0.9x block in the build now that the appropriate artifacts are in the central
repository

Modified:
    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/pom.xml
    cocoon/trunk/core/cocoon-webapp/pom.xml
    cocoon/trunk/pom.xml

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=545016&r1=545015&r2=545016
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-impl/pom.xml Wed Jun  6 18:21:05 2007
@@ -33,7 +33,7 @@
   </parent>
   <artifactId>cocoon-fop-ng-impl</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <name>Cocoon FOP 0.92 Block Implementation</name>
+  <name>Cocoon FOP 0.9x Block Implementation</name>
   
   <dependencies>
     <dependency>

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=545016&r1=545015&r2=545016
==============================================================================
--- cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml (original)
+++ cocoon/trunk/blocks/cocoon-fop/cocoon-fop-ng-sample/pom.xml Wed Jun  6 18:21:05 2007
@@ -33,7 +33,7 @@
   </parent>
   <artifactId>cocoon-fop-ng-sample</artifactId>
   <version>1.0.0-SNAPSHOT</version>  
-  <name>Cocoon FOP 0.92 Block Samples</name>
+  <name>Cocoon FOP 0.9x Block Samples</name>
 
   <dependencies>
     <dependency>

Modified: cocoon/trunk/blocks/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/pom.xml?view=diff&rev=545016&r1=545015&r2=545016
==============================================================================
--- cocoon/trunk/blocks/pom.xml (original)
+++ cocoon/trunk/blocks/pom.xml Wed Jun  6 18:21:05 2007
@@ -143,9 +143,8 @@
         <module>cocoon-faces</module>
         <module>cocoon-fop/cocoon-fop-impl</module>
         <module>cocoon-fop/cocoon-fop-sample</module>  
-        <!-- Doesn't work because the FOP project hasn't released the necessary artifacts
             
-        <module>cocoon-fop/cocoon-fop-ng-impl</module>        
-        <module>cocoon-fop/cocoon-fop-ng-sample</module-->        
+        <module>cocoon-fop/cocoon-fop-ng-impl</module>
+        <module>cocoon-fop/cocoon-fop-ng-sample</module>
         <module>cocoon-html/cocoon-html-impl</module>
         <module>cocoon-html/cocoon-html-sample</module>        
         <module>cocoon-imageop</module>  

Modified: cocoon/trunk/core/cocoon-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/pom.xml?view=diff&rev=545016&r1=545015&r2=545016
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/pom.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/pom.xml Wed Jun  6 18:21:05 2007
@@ -163,7 +163,8 @@
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-fop-sample</artifactId>
         </dependency>
-        <!-- Does not build yet
+        <!-- Disabled because classloading conflicts prevent it from running
+             at the same time as the "legacy" FOP block.
         <dependency>
           <groupId>org.apache.cocoon</groupId>
           <artifactId>cocoon-fop-ng-sample</artifactId>

Modified: cocoon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/pom.xml?view=diff&rev=545016&r1=545015&r2=545016
==============================================================================
--- cocoon/trunk/pom.xml (original)
+++ cocoon/trunk/pom.xml Wed Jun  6 18:21:05 2007
@@ -2453,7 +2453,7 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <!-- TODO: Next two have same artifactId but different groupId as well as version
?? -->
+      <!-- FOP 0.20.5 dependency for legacy cocoon-fop-impl block -->
       <dependency>
         <groupId>fop</groupId>
         <artifactId>fop</artifactId>
@@ -2477,6 +2477,7 @@
           </exclusion>
         </exclusions>
       </dependency>
+      <!-- FOP 0.9x dependency for cocoon-fop-ng-impl block -->
       <dependency>
         <groupId>org.apache.xmlgraphics</groupId>
         <artifactId>fop</artifactId>



Mime
View raw message