Author: crossley
Date: Fri Dec 9 05:04:31 2005
New Revision: 355478
URL: http://svn.apache.org/viewcvs?rev=355478&view=rev
Log:
Exclude fop jar. Cocoon's seems to cause us problems.
Exclude resolver jar. We have a newer version.
Modified:
forrest/trunk/etc/cocoon_upgrade/build.xml
Modified: forrest/trunk/etc/cocoon_upgrade/build.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/etc/cocoon_upgrade/build.xml?rev=355478&r1=355477&r2=355478&view=diff
==============================================================================
--- forrest/trunk/etc/cocoon_upgrade/build.xml (original)
+++ forrest/trunk/etc/cocoon_upgrade/build.xml Fri Dec 9 05:04:31 2005
@@ -57,6 +57,10 @@
We have a workaround so use Cocoon's jar.
<exclude name="commons-jxpath-*.jar"/>
-->
+ <!-- Exclude some that we don't need -->
+ <exclude name="commons-javaflow-*.jar"/>
+ <!-- We have newer xml-commons-resolver -->
+ <exclude name="xml-commons-resolver-*.jar"/>
<!-- servlet.jar goes under tools/jetty -->
<exclude name="servlet-*.jar"/>
</fileset>
@@ -67,12 +71,14 @@
<!-- ===============================================================
Some optional libraries are core to forrest
FIXME: jing-*.jar comes from iso-relax.sf.net so maybe we need to
- have a copy-extermal-libs target
+ have a copy-external-libs target
=============================================================== -->
<copy todir="${forrest.home}/lib/core">
<fileset dir="${cocoon.home}/lib/optional">
<include name="batik-all-*.jar"/>
+<!-- FIXME: Cocoon's FOP causes trouble FOR- ###################
<include name="fop-*.jar"/>
+-->
<include name="lucene-*.jar"/>
<include name="jtidy-*.jar"/>
<include name="nekopull-*.jar"/>
