joerg 2004/03/24 18:22:05
Modified: . blocks.properties gump.xml
tools/src gump2blocks.properties.xsl
Log:
dependency type
Revision Changes Path
1.69 +15 -8 cocoon-2.1/blocks.properties
Index: blocks.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- blocks.properties 24 Mar 2004 19:48:57 -0000 1.68
+++ blocks.properties 25 Mar 2004 02:22:04 -0000 1.69
@@ -27,7 +27,9 @@
# NOTE: "[dependency]" indicates blocks that are required by other blocks.
# Disabling batik, for example, will result in a RuntimeException when using
-# fop. On the other hand some dependencies come only from the block samples.
+# fop. Dependencies only needed for the block's samples are marked
explicitely.
+# This latter information was introduced only short time ago, so do not
expect
+# it to be complete.
# NOTE: (to Cocoon committers): blocks.properties is generated from gump.xml
# using "build generate-blocks.properties". Any changes to blocks definitions
@@ -80,7 +82,7 @@
#exclude.block.web3=true
#-----[dependency]: "xmldb" depends on "databases".
#exclude.block.xmldb=true
-#-----[dependency]: "xsp" is needed by "python", "scratchpad", "session-fw",
and by some "forms" samples.
+#-----[dependency]: "xsp" is needed by "forms", "python", "scratchpad",
"session-fw", "woody".
#exclude.block.xsp=true
# Unstable blocks
--------------------------------------------------------------
@@ -93,7 +95,7 @@
# its development as things might change over time before they are marked
# stable.
-#-----[dependency]: "apples" depends on "forms".
+#-----[dependency]: "apples" depends on "forms" (for samples).
#exclude.block.apples=true
#-----[dependency]: "asciiart" is needed by "mail".
#exclude.block.asciiart=true
@@ -103,16 +105,17 @@
#exclude.block.deli=true
#-----[dependency]: "eventcache" is needed by "jms", "repository", "slide".
#exclude.block.eventcache=true
-#-----[dependency]: "forms" is needed by "apples", "petstore", and might
need "xsp" for some samples.
+#-----[dependency]: "forms" depends on "xsp" (for samples).
+#-----[dependency]: "forms" is needed by "apples", "ojb", "petstore".
#exclude.block.forms=true
#-----[dependency]: "jms" depends on "databases", "eventcache", "hsqldb".
#-----[dependency]: "jms" is needed by "slide".
#exclude.block.jms=true
#exclude.block.linotype=true
-#-----[dependency]: "mail" depends on "asciiart".
+#-----[dependency]: "mail" depends on "asciiart", "scratchpad".
#exclude.block.mail=true
#exclude.block.midi=true
-#-----[dependency]: "ojb" depends on "databases".
+#-----[dependency]: "ojb" depends on "databases", "forms" (for samples).
#exclude.block.ojb=true
#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb",
"velocity".
#exclude.block.petstore=true
@@ -123,7 +126,8 @@
#-----[dependency]: "repository" depends on "databases", "eventcache".
#-----[dependency]: "repository" is needed by "slide", "webdav".
#exclude.block.repository=true
-#-----[dependency]: "scratchpad" depends on "batik", "cron", "velocity",
"xsp".
+#-----[dependency]: "scratchpad" depends on "batik" (for samples), "cron",
"velocity", "xsp".
+#-----[dependency]: "scratchpad" is needed by "mail".
#exclude.block.scratchpad=true
#-----[dependency]: "slide" depends on "eventcache", "jms", "repository".
#exclude.block.slide=true
@@ -136,6 +140,9 @@
# Deprecated blocks
------------------------------------------------------------
# Although some of these blocks may have been stable, they are now deprecated
-# in favour of other blocks and therefore are excluded by default from the
build
+# in favour of other blocks and therefore are excluded by default from the
build.
+# For including one of them you have to set the exclude property into
comment in
+# blocks.properties.
+#-----[dependency]: "woody" depends on "xsp" (for samples).
exclude.block.woody=true
1.131 +7 -5 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/gump.xml,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- gump.xml 23 Mar 2004 20:03:20 -0000 1.130
+++ gump.xml 25 Mar 2004 02:22:05 -0000 1.131
@@ -145,7 +145,7 @@
<depend project="jakarta-servletapi-4"/>
<depend project="cocoon-block-velocity"/>
<depend project="cocoon-block-cron"/>
- <depend project="cocoon-block-batik"/>
+ <depend project="cocoon-block-batik" type="samples"/>
<depend project="cocoon-block-xsp"/>
<work nested="tools/anttasks"/>
@@ -756,6 +756,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="xreporter-expression"/>
<depend project="jakarta-oro"/>
+ <depend project="cocoon-block-xsp" type="samples"/>
<work nested="build/cocoon-@@DATE@@/blocks/forms/test"/>
<work nested="tools/anttasks"/>
@@ -777,6 +778,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="xreporter-expression"/>
<depend project="jakarta-oro"/>
+ <depend project="cocoon-block-xsp" type="samples"/>
<work nested="build/cocoon-@@DATE@@/blocks/woody/test"/>
<work nested="tools/anttasks"/>
@@ -941,8 +943,7 @@
</ant>
<depend project="cocoon" inherit="all"/>
- <!-- following dependency is only for samples -->
- <depend project="cocoon-block-forms" />
+ <depend project="cocoon-block-forms" type="samples"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
@@ -1007,7 +1008,7 @@
<nag from="Gump" to="[email protected]"/>
</project>
- <project name="cocoon-block-ojb" status="unstable">
+ <project name="cocoon-block-ojb" status="unstable">
<package>org.apache.cocoon</package>
<ant target="gump-block">
@@ -1017,6 +1018,7 @@
<depend project="cocoon" inherit="all"/>
<depend project="cocoon-block-databases"/>
+ <depend project="cocoon-block-forms" type="samples"/>
<work nested="tools/anttasks"/>
<home nested="build/cocoon-@@DATE@@"/>
1.6 +7 -2 cocoon-2.1/tools/src/gump2blocks.properties.xsl
Index: gump2blocks.properties.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/gump2blocks.properties.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gump2blocks.properties.xsl 11 Mar 2004 14:12:08 -0000 1.5
+++ gump2blocks.properties.xsl 25 Mar 2004 02:22:05 -0000 1.6
@@ -56,7 +56,9 @@
# NOTE: "[dependency]" indicates blocks that are required by other blocks.
# Disabling batik, for example, will result in a RuntimeException when using
-# fop. On the other hand some dependencies come only from the block samples.
+# fop. Dependencies only needed for the block's samples are marked
explicitely.
+# This latter information was introduced only short time ago, so do not
expect
+# it to be complete.
# NOTE: (to Cocoon committers): blocks.properties is generated from gump.xml
# using "build generate-blocks.properties". Any changes to blocks definitions
@@ -91,7 +93,9 @@
# Deprecated blocks
------------------------------------------------------------
# Although some of these blocks may have been stable, they are now deprecated
-# in favour of other blocks and therefore are excluded by default from the
build
+# in favour of other blocks and therefore are excluded by default from the
build.
+# For including one of them you have to set the exclude property into
comment in
+# blocks.properties.
</desc:desc>
@@ -150,6 +154,7 @@
<xsl:text> "</xsl:text>
<xsl:value-of select="substring-after(concat(@name, @project),
'cocoon-block-')"/>
<xsl:text>"</xsl:text>
+ <xsl:if test="@type='samples'"> (for samples)</xsl:if>
<xsl:choose>
<xsl:when test="position() = last()">. </xsl:when>
<xsl:otherwise>,</xsl:otherwise>
