Author: crossley
Date: Tue Jul 30 07:51:38 2013
New Revision: 1508333
URL: http://svn.apache.org/r1508333
Log:
Start switching to use our own packaged stuff, so Gump can stop handling them.
Use our cocoon-2.1*.jar
Modified:
gump/metadata/project/forrest.xml
Modified: gump/metadata/project/forrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/forrest.xml?rev=1508333&r1=1508332&r2=1508333&view=diff
==============================================================================
--- gump/metadata/project/forrest.xml (original)
+++ gump/metadata/project/forrest.xml Tue Jul 30 07:51:38 2013
@@ -40,7 +40,6 @@
<!-- Packaged stuff: -->
<depend project="avalon-framework-api" runtime="true"/>
<depend project="avalon-framework-impl" runtime="true"/>
- <depend project="cocoon21" inherit="all" runtime="true"/>
<depend project="packaged-excalibur" runtime="true"/>
<depend project="excalibur-legacy" ids="i18n io naming" runtime="true"/>
<depend project="nekopull" runtime="true"/>
@@ -48,12 +47,24 @@
<depend project="ant" runtime="true"/>
<depend project="ant-contrib" inherit="runtime" runtime="true"/>
<depend project="commons-lang" runtime="true"/>
-
<depend project="xml-apis" runtime="true"/>
<depend project="xml-xerces" runtime="true"/>
<depend project="xalan" runtime="true"/>
+<!-- Our own packaged stuff that Gump does not provide: -->
+ <work nested="lib/core/cocoon-2.1.12-dev.jar"/>
+ <work nested="lib/core/cocoon-asciiart-block.jar"/>
+ <work nested="lib/core/cocoon-auth-block.jar"/>
+ <work nested="lib/core/cocoon-batik-block.jar"/>
+ <work nested="lib/core/cocoon-chaperon-block.jar"/>
+ <work nested="lib/core/cocoon-fop-block.jar"/>
+ <work nested="lib/core/cocoon-html-block.jar"/>
+ <work nested="lib/core/cocoon-linkrewriter-block.jar"/>
+ <work nested="lib/core/cocoon-lucene-block.jar"/>
+ <work nested="lib/core/cocoon-profiler-block.jar"/>
+ <work nested="lib/core/cocoon-template-block.jar"/>
+ <work nested="lib/core/cocoon-validation-block.jar"/>
+ <work nested="lib/core/cocoon-xsp-block.jar"/>
-<!-- FIXME: Gump does not build Ehcache yet. -->
<work nested="lib/core/ehcache-core-2.2.0.jar"/>
<work nested="lib/core/slf4j-log4j12-1.5.11.jar"/>
@@ -86,6 +97,20 @@
<ant basedir="main" target="test-basic"/>
<depend project="forrest-core" inherit="runtime"/>
<depend project="commons-jxpath"/>
+<!-- Our own packaged stuff that Gump does not provide: -->
+ <work nested="lib/core/cocoon-2.1.12-dev.jar"/>
+ <work nested="lib/core/cocoon-asciiart-block.jar"/>
+ <work nested="lib/core/cocoon-auth-block.jar"/>
+ <work nested="lib/core/cocoon-batik-block.jar"/>
+ <work nested="lib/core/cocoon-chaperon-block.jar"/>
+ <work nested="lib/core/cocoon-fop-block.jar"/>
+ <work nested="lib/core/cocoon-html-block.jar"/>
+ <work nested="lib/core/cocoon-linkrewriter-block.jar"/>
+ <work nested="lib/core/cocoon-lucene-block.jar"/>
+ <work nested="lib/core/cocoon-profiler-block.jar"/>
+ <work nested="lib/core/cocoon-template-block.jar"/>
+ <work nested="lib/core/cocoon-validation-block.jar"/>
+ <work nested="lib/core/cocoon-xsp-block.jar"/>
<!-- FIXME: Use some of our packaged supporting products until upgraded. -->
<work nested="tools/jetty/jetty-6.1.26.jar"/>
@@ -123,6 +148,20 @@
<depend project="forrest-test-deploy-plugins"/>
<depend project="commons-jxpath"/>
<depend project="jtidy-svn"/>
+<!-- Our own packaged stuff that Gump does not provide: -->
+ <work nested="lib/core/cocoon-2.1.12-dev.jar"/>
+ <work nested="lib/core/cocoon-asciiart-block.jar"/>
+ <work nested="lib/core/cocoon-auth-block.jar"/>
+ <work nested="lib/core/cocoon-batik-block.jar"/>
+ <work nested="lib/core/cocoon-chaperon-block.jar"/>
+ <work nested="lib/core/cocoon-fop-block.jar"/>
+ <work nested="lib/core/cocoon-html-block.jar"/>
+ <work nested="lib/core/cocoon-linkrewriter-block.jar"/>
+ <work nested="lib/core/cocoon-lucene-block.jar"/>
+ <work nested="lib/core/cocoon-profiler-block.jar"/>
+ <work nested="lib/core/cocoon-template-block.jar"/>
+ <work nested="lib/core/cocoon-validation-block.jar"/>
+ <work nested="lib/core/cocoon-xsp-block.jar"/>
<!-- FIXME: Use some of our packaged supporting products until upgraded. -->
<work nested="tools/jetty/jetty-6.1.26.jar"/>
|