svn commit: r407723 - in /cocoon/branches/BRANCH_2_1_X: blocks.properties gump.xml

[an...@apache.org]

Author: antonio
Date: Thu May 18 22:55:25 2006
New Revision: 407723

URL: http://svn.apache.org/viewvc?rev=407723&view=rev
Log:
ojb depends on databases (for samples) and axis depends on xsp (for samples).

Modified:
    cocoon/branches/BRANCH_2_1_X/blocks.properties
    cocoon/branches/BRANCH_2_1_X/gump.xml

Modified: cocoon/branches/BRANCH_2_1_X/blocks.properties
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/blocks.properties?rev=407723&r1=407722&r2=407723&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/blocks.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/blocks.properties Thu May 18 22:55:25 2006
@@ -103,7 +103,7 @@
 #include.block.lucene=false
 #include.block.midi=false
 #include.block.naming=false
-#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb" (for samples).
+#-----[dependency]: "ojb" depends on "databases" (for samples), "forms" (for samples), "hsqldb" (for samples), "xsp" (for samples).
 #-----[dependency]: "ojb" is needed by "javaflow", "portal", "querybean".
 #include.block.ojb=false
 #include.block.paranoid=false
@@ -122,7 +122,7 @@
 #include.block.web3=false
 #-----[dependency]: "xmldb" depends on "databases".
 #include.block.xmldb=false
-#-----[dependency]: "xsp" is needed by "databases", "fop", "itext", "linkrewriter", "python", "session-fw", "woody".
+#-----[dependency]: "xsp" is needed by "axis", "databases", "fop", "itext", "linkrewriter", "ojb", "python", "session-fw", "woody".
 #include.block.xsp=false
 
 # Deprecated blocks ------------------------------------------------------------
@@ -155,6 +155,7 @@
 #include.block.apples=false
 #-----[dependency]: "asciiart" is needed by "mail".
 #include.block.asciiart=false
+#-----[dependency]: "axis" depends on "xsp" (for samples).
 #include.block.axis=false
 #include.block.captcha=false
 #-----[dependency]: "cron" is needed by "jms", "portal".
@@ -165,10 +166,10 @@
 #include.block.eventcache=false
 #-----[dependency]: "faces" depends on "portal", "taglib".
 #include.block.faces=false
-include.block.imageop=false
+#include.block.imageop=false
 #-----[dependency]: "javaflow" depends on "forms", "ojb".
 #include.block.javaflow=false
-include.block.jcr=false
+#include.block.jcr=false
 #-----[dependency]: "jms" depends on "cron", "databases" (for samples), "hsqldb".
 #-----[dependency]: "jms" is needed by "eventcache", "slide".
 #include.block.jms=false

Modified: cocoon/branches/BRANCH_2_1_X/gump.xml
URL: http://svn.apache.org/viewvc/cocoon/branches/BRANCH_2_1_X/gump.xml?rev=407723&r1=407722&r2=407723&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/gump.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/gump.xml Thu May 18 22:55:25 2006
@@ -902,6 +902,8 @@
     <library name="wsdl4j"/>
     <library name="commons-discovery"/>
 
+    <depend project="cocoon-block-xsp" type="samples"/>
+
     <work nested="tools/anttasks"/>
     <home nested="build/cocoon-@@DATE@@"/>
 
@@ -1334,6 +1336,7 @@
     <depend project="cocoon-block-databases" type="samples"/>
     <depend project="cocoon-block-forms" type="samples"/>
     <depend project="cocoon-block-hsqldb" type="samples"/>
+    <depend project="cocoon-block-xsp" type="samples"/>
     <depend project="db-ojb"/>
     <depend project="jdo"/>
     <depend project="antlr"/>