stephan 2004/03/11 07:41:43
Modified: tools/src blocks-build.xsl
Log:
Apply all xconf file in one shoot.
Revision Changes Path
1.51 +5 -7 cocoon-2.1/tools/src/blocks-build.xsl
Index: blocks-build.xsl
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/src/blocks-build.xsl,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- blocks-build.xsl 10 Mar 2004 09:44:34 -0000 1.50
+++ blocks-build.xsl 11 Mar 2004 15:41:43 -0000 1.51
@@ -241,16 +241,14 @@
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/*.xmap"
unless="unless.exclude.block.{$block-name}"/>
- <include name="{$block-name}/conf/*.xpipe"
unless="unless.exclude.block.{$block-name}"/>
</xsl:for-each>
</xpatch>
- <!-- This is much slower, but preserves the dependencies -->
- <xsl:for-each select="$cocoon-blocks">
- <xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
- <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf"
srcdir="${{blocks}}" addcomments="true">
+ <xpatch file="${{build.webapp}}/WEB-INF/cocoon.xconf"
srcdir="${{blocks}}" addcomments="true">
+ <xsl:for-each select="$cocoon-blocks">
+ <xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
<include name="{$block-name}/conf/*.xconf"
unless="unless.exclude.block.{$block-name}"/>
- </xpatch>
- </xsl:for-each>
+ </xsl:for-each>
+ </xpatch>
<xpatch file="${{build.webapp}}/WEB-INF/logkit.xconf"
srcdir="${{blocks}}">
<xsl:for-each select="$cocoon-blocks">
<xsl:variable name="block-name"
select="substring-after(@name,'cocoon-block-')"/>
