You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2004/03/01 21:39:18 UTC
cvs commit: cocoon-2.1/tools/src gump2blocks.properties.xsl
joerg 2004/03/01 12:39:18
Modified: . blocks.properties gump.xml
tools/src gump2blocks.properties.xsl
Log:
gump descriptor seems to accept more or less arbitrary markup, so I added @excluded="true" for default exclude of a particular block; handling added to gump2blocks.properties.xsl; blocks.properties generated
Revision Changes Path
1.58 +1 -1 cocoon-2.1/blocks.properties
Index: blocks.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- blocks.properties 29 Feb 2004 17:34:48 -0000 1.57
+++ blocks.properties 1 Mar 2004 20:39:18 -0000 1.58
@@ -78,6 +78,7 @@
#exclude.block.axis=true
#-----[dependency]: "cron" is needed by "scratchpad".
#exclude.block.cron=true
+#-----[dependency]: "deli" is needed by "workflow".
#exclude.block.deli=true
#-----[dependency]: "eventcache" is needed by "jms", "repository", "slide".
#exclude.block.eventcache=true
@@ -113,7 +114,6 @@
#exclude.block.woody=true
#-----[dependency]: "workflow" depends on "deli".
exclude.block.workflow=true
-
# Deprecated blocks ------------------------------------------------------------
1.114 +2 -2 cocoon-2.1/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/gump.xml,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gump.xml 29 Feb 2004 17:34:48 -0000 1.113
+++ gump.xml 1 Mar 2004 20:39:18 -0000 1.114
@@ -1104,7 +1104,7 @@
<nag from="Gump" to="dev@cocoon.apache.org"/>
</project>
- <project name="cocoon-block-workflow" status="unstable">
+ <project name="cocoon-block-workflow" status="unstable" exclude="true">
<package>org.apache.cocoon</package>
<ant target="gump-block">
1.2 +1 -11 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gump2blocks.properties.xsl 18 Nov 2003 18:08:55 -0000 1.1
+++ gump2blocks.properties.xsl 1 Mar 2004 20:39:18 -0000 1.2
@@ -61,16 +61,6 @@
</desc:descs>
<xsl:template match="/module">
- <xsl:message>
-
-There are 2 issues this transformation does not handle at the moment:
-- The order of the @status sections, i.e. stable, unstable, deprecated.
- It depends on the first occurence of a block of one particular section.
-- Default exclude of a specific block. If a block is broken at any time
- and should be excluded, it must be done by hand afterwards.
-So before committing the updated blocks.properties please make a cvs diff
-to see what has really changed.
- </xsl:message>
<xsl:value-of select="document('')/xsl:stylesheet/desc:descs/desc:desc[@name = 'common']"/>
<xsl:apply-templates
select="project[starts-with(@name, 'cocoon-block-')]
@@ -98,7 +88,7 @@
</xsl:call-template>
<!-- TODO: make this configurable externally (dependent on @status or @name) -->
- <xsl:if test="@status != 'deprecated'">#</xsl:if>
+ <xsl:if test="not(@status='deprecated' or @exclude='true')">#</xsl:if>
<xsl:text>exclude.block.</xsl:text>
<xsl:value-of select="substring-after(@name, 'cocoon-block-')"/>
<xsl:text>=true </xsl:text>