svn commit: r959845 - /gump/metadata/project/forrest.xml

[cr...@apache.org]

Author: crossley
Date: Fri Jul  2 04:04:07 2010
New Revision: 959845

URL: http://svn.apache.org/viewvc?rev=959845&view=rev
Log:
Forrest core is ready, so starting gumping "forrest-test".

Modified:
    gump/metadata/project/forrest.xml

Modified: gump/metadata/project/forrest.xml
URL: http://svn.apache.org/viewvc/gump/metadata/project/forrest.xml?rev=959845&r1=959844&r2=959845&view=diff
==============================================================================
--- gump/metadata/project/forrest.xml (original)
+++ gump/metadata/project/forrest.xml Fri Jul  2 04:04:07 2010
@@ -72,16 +72,14 @@
     <nag from="Gump &lt;dev@forrest.apache.org&gt;" to="crossley@apache.org"/>
   </project>
 
-<!-- Disabled until Forrest uses Ivy. See FOR-966.
-  The Cocoon "Blocks" listed below, refer to the old Cocoon-2.1 gump descriptor
-  which is not now used by Gump but is still a central part of the Cocoon-2.1
-  build system:
-  http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/gump.xml
--->
-<!--
   <project name="forrest-test">
     <ant basedir="main" target="test"/>
-    <depend project="forrest"/>
+    <depend project="forrest" inherit="all"/>
+<!-- FIXME: Gradually adding stuff as Gump tells us to. -->
+
+<!-- Old stuff from previous gump descriptors. Keeping it until sorted.
+  The block jars are now provided by the cocoon21 package.
+  See FOR-1201, FOR-966
     <depend project="ant"/>
     <depend project="ant-contrib" inherit="runtime"/>
     <depend project="jing"/>  
@@ -97,9 +95,31 @@
     <depend project="cocoon-block-fop" inherit="runtime"/>
     <depend project="cocoon-block-html" inherit="runtime"/>
     <depend project="cocoon-block-linkrewriter" inherit="runtime"/>
-    <nag from="Gump &lt;dev@forrest.apache.org&gt;" to="dev@forrest.apache.org"/>
-  </project>
 -->
+<!-- The following were coming via the old Cocoon-2.1 gump descriptor.
+  http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/gump.xml
+  Now that Cocoon-2.1 has a minimal package, we need to specifically define.
+  Gathering a list of things that might be needed ...
+FIXME: chaperon
+FIXME: jing (now at googlecode)
+    <depend project="jtidy"/>
+    <depend project="castor"/>
+    <depend project="commons-cli"/>
+    <depend project="commons-httpclient"/>
+    <depend project="commons-io"/>
+    <depend project="commons-jci"/>
+    <depend project="commons-jexl"/>
+    <depend project="commons-jxpath"/>
+    <depend project="commons-lang-2.x"/>
+    <depend project="concurrent"/>
+    <depend project="jakarta-turbine-jcs"/>
+    <depend project="xml-resolver"/>
+    <depend project="logging-log4j-12"/>
+    <depend project="xml-batik"/>
+-->
+
+    <nag from="Gump &lt;dev@forrest.apache.org&gt;" to="crossley@forrest.apache.org"/>
+  </project>
 
   <project name="forrest-forrestbar">
     <ant basedir="tools/forrestbar" target="forrestbar">