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/04/02 21:07:50 UTC
cvs commit: cocoon-2.1 blocks.properties
joerg 2004/04/02 11:07:50
Modified: tools/targets compile-build.xml samples-build.xml
validate-build.xml init-build.xml webapp-build.xml
docs-build.xml
tools/src blocks-build.xsl gump2blocks.properties.xsl
. blocks.properties
Log:
completely backwards compatible version of using include.block.blockname syntax in blocks.properties;
replaced unless.exclude.* with internal.exclude.*
Revision Changes Path
1.10 +2 -2 cocoon-2.1/tools/targets/compile-build.xml
Index: compile-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/compile-build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- compile-build.xml 16 Mar 2004 14:27:35 -0000 1.9
+++ compile-build.xml 2 Apr 2004 19:07:49 -0000 1.10
@@ -62,7 +62,7 @@
<!-- compiles deprecated code -->
<target name="compile-deprecated" depends="prepare"
- unless="unless.exclude.deprecated">
+ unless="internal.exclude.deprecated">
<mkdir dir="${build.deprecated}"/>
<xpatch file="${build.dest}/org/apache/cocoon/cocoon.roles"
@@ -126,7 +126,7 @@
<!-- package deprecated code -->
<target name="package-deprecated" depends="compile-deprecated"
- unless="unless.exclude.deprecated">
+ unless="internal.exclude.deprecated">
<jar jarfile="${build}/${name}-deprecated.jar" index="true">
<fileset dir="${build.deprecated}"/>
</jar>
1.5 +2 -2 cocoon-2.1/tools/targets/samples-build.xml
Index: samples-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/samples-build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- samples-build.xml 1 Apr 2004 19:05:41 -0000 1.4
+++ samples-build.xml 2 Apr 2004 19:07:49 -0000 1.5
@@ -21,7 +21,7 @@
Samples Targets
</description>
- <target name="samples" depends="prepare" unless="unless.exclude.webapp.samples">
+ <target name="samples" depends="prepare" unless="internal.exclude.webapp.samples">
<mkdir dir="${build.samples}"/>
<javac srcdir="${samples}"
@@ -71,7 +71,7 @@
includes="**/*.xwelcome"/>
</target>
- <target name="block-samples" depends="prepare" unless="unless.exclude.webapp.samples">
+ <target name="block-samples" depends="prepare" unless="internal.exclude.webapp.samples">
<ant antfile="${build.temp}/blocks-build.xml"
inheritAll="true"
inheritRefs="false"
1.6 +3 -3 cocoon-2.1/tools/targets/validate-build.xml
Index: validate-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/validate-build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- validate-build.xml 8 Mar 2004 06:07:15 -0000 1.5
+++ validate-build.xml 2 Apr 2004 19:07:49 -0000 1.6
@@ -21,7 +21,7 @@
</description>
<!-- Check if all the JAR files are properly declared in lib/jars.xml -->
- <target name="validate-jars" depends="prepare" unless="unless.exclude.validate.jars">
+ <target name="validate-jars" depends="prepare" unless="internal.exclude.validate.jars">
<path id="all.jars">
<fileset dir="${lib}">
<include name="**/*.jar"/>
@@ -79,7 +79,7 @@
This needs to be done at the end of the build, because the cocoon.xconf
and cocoon.roles are automatically constructed.
-->
- <target name="validate-config" depends="prepare" unless="unless.exclude.validate.config">
+ <target name="validate-config" depends="prepare" unless="internal.exclude.validate.config">
<echo message="Validating some important configuration files"/>
<echo message="Validating cocoon.xconf using a very basic RELAX NG grammar ..."/>
@@ -89,7 +89,7 @@
</target>
<!-- Validation of xdocs -->
- <target name="validate-xdocs" depends="prepare-docs" unless="unless.exclude.validate.xdocs">
+ <target name="validate-xdocs" depends="prepare-docs" unless="internal.exclude.validate.xdocs">
<!--
<echo message="Conducting validation of core XML documentation."/>
-->
1.13 +9 -9 cocoon-2.1/tools/targets/init-build.xml
Index: init-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/init-build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- init-build.xml 17 Mar 2004 19:15:08 -0000 1.12
+++ init-build.xml 2 Apr 2004 19:07:49 -0000 1.13
@@ -62,34 +62,34 @@
<!-- Get the block properties from an external file -->
<property file="blocks.properties"/>
- <!-- Use unless.exclude.XXX shadow props used in the
+ <!-- Use internal.exclude.XXX shadow props used in the
unless target attributes -->
- <condition property="unless.exclude.webapp.documentation">
+ <condition property="internal.exclude.webapp.documentation">
<istrue value="${exclude.webapp.documentation}"/>
</condition>
- <condition property="unless.exclude.webapp.javadocs">
+ <condition property="internal.exclude.webapp.javadocs">
<or>
<istrue value="${exclude.javadocs}"/>
<istrue value="${exclude.webapp.javadocs}"/>
</or>
</condition>
- <condition property="unless.exclude.webapp.samples">
+ <condition property="internal.exclude.webapp.samples">
<istrue value="${exclude.webapp.samples}"/>
</condition>
- <condition property="unless.exclude.deprecated">
+ <condition property="internal.exclude.deprecated">
<istrue value="${exclude.deprecated}"/>
</condition>
- <condition property="unless.exclude.javadocs">
+ <condition property="internal.exclude.javadocs">
<istrue value="${exclude.javadocs}"/>
</condition>
- <condition property="unless.exclude.validate.jars">
+ <condition property="internal.exclude.validate.jars">
<istrue value="${exclude.validate.jars}"/>
</condition>
- <condition property="unless.exclude.validate.config">
+ <condition property="internal.exclude.validate.config">
<istrue value="${exclude.validate.config}"/>
</condition>
- <condition property="unless.exclude.validate.xdocs">
+ <condition property="internal.exclude.validate.xdocs">
<or>
<istrue value="${exclude.validate.xdocs}"/>
<istrue value="${exclude.documentation}"/>
1.14 +4 -4 cocoon-2.1/tools/targets/webapp-build.xml
Index: webapp-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/webapp-build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- webapp-build.xml 16 Mar 2004 14:27:35 -0000 1.13
+++ webapp-build.xml 2 Apr 2004 19:07:49 -0000 1.14
@@ -90,9 +90,9 @@
target="patch"/>
</target>
- <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples" unless="unless.exclude.webapp.samples"/>
+ <target name="prepare-webapp-samples" depends="prepare-webapp, samples, block-samples" unless="internal.exclude.webapp.samples"/>
- <target name="prepare-webapp-deprecated" depends="prepare-webapp" unless="unless.exclude.deprecated">
+ <target name="prepare-webapp-deprecated" depends="prepare-webapp" unless="internal.exclude.deprecated">
<copy file="${build}/${name}-deprecated.jar" tofile="${build.webapp.lib}/${name}-${version}-deprecated.jar"/>
<xpatch file="${build.webapp}/WEB-INF/cocoon.xconf"
srcdir="${deprecated.conf}"
@@ -100,7 +100,7 @@
addComments="true"/>
</target>
- <target name="prepare-webapp-javadocs" depends="javadocs" unless="unless.exclude.webapp.javadocs">
+ <target name="prepare-webapp-javadocs" depends="javadocs" unless="internal.exclude.webapp.javadocs">
<mkdir dir="${build.webapp.javadocs}"/>
<copy todir="${build.webapp.javadocs}" filtering="off">
@@ -113,7 +113,7 @@
includes="**/*.xwelcome"/>
</target>
- <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars" unless="unless.exclude.webapp.documentation">
+ <target name="prepare-webapp-docs" depends="validate-xdocs,validate-jars" unless="internal.exclude.webapp.documentation">
<mkdir dir="${build.webapp.docs}"/>
<copy todir="${build.webapp.docs}" filtering="on">
1.8 +1 -1 cocoon-2.1/tools/targets/docs-build.xml
Index: docs-build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/tools/targets/docs-build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- docs-build.xml 8 Mar 2004 10:06:58 -0000 1.7
+++ docs-build.xml 2 Apr 2004 19:07:49 -0000 1.8
@@ -173,7 +173,7 @@
<srcfiles dir= "${java}" includes="**/*.java,**/package.html"/>
<srcfiles dir= "${deprecated.src}" includes="**/*.java,**/package.html"/>
</uptodate>
- <istrue value="${unless.exclude.javadocs}"/>
+ <istrue value="${internal.exclude.javadocs}"/>
</or>
</condition>
</target>
1.63 +18 -13 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- blocks-build.xsl 1 Apr 2004 19:05:41 -0000 1.62
+++ blocks-build.xsl 2 Apr 2004 19:07:50 -0000 1.63
@@ -66,7 +66,12 @@
<target name="init">
<xsl:for-each select="module/project[starts-with(@name, 'cocoon-block-')]">
<xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/>
- <condition property="unless.exclude.block.{$block-name}">
+ <condition property="exclude.block.{$block-name}">
+ <not>
+ <istrue value="${{include.block.{$block-name}}}"/>
+ </not>
+ </condition>
+ <condition property="internal.exclude.block.{$block-name}">
<istrue value="${{exclude.block.{$block-name}}}"/>
</condition>
</xsl:for-each>
@@ -171,7 +176,7 @@
<srcfiles dir="${{blocks}}/{substring-after(@name,'cocoon-block-')}/java" includes="**/*.java,**/package.html"/>
</xsl:for-each>
</uptodate>
- <istrue value="${{unless.exclude.javadocs}}"/>
+ <istrue value="${{internal.exclude.javadocs}}"/>
</or>
</condition>
</target>
@@ -255,13 +260,13 @@
<xsl:variable name="block-name" select="substring-after(@name,'cocoon-block-')"/>
<xsl:variable name="cocoon-block-dependencies" select="depend[starts-with(@project,'cocoon-block-')]"/>
- <target name="{@name}-excluded" if="unless.exclude.block.{$block-name}">
+ <target name="{@name}-excluded" if="internal.exclude.block.{$block-name}">
<echo message="NOTICE: Block '{$block-name}' is excluded from the build."/>
</target>
- <target name="{@name}" unless="unless.exclude.block.{$block-name}"/>
+ <target name="{@name}" unless="internal.exclude.block.{$block-name}"/>
- <target name="{@name}-compile" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-compile" unless="internal.exclude.block.{$block-name}">
<xsl:attribute name="depends">
<xsl:if test="depend">
<xsl:value-of select="$block-name"/><xsl:text>-prepare,</xsl:text>
@@ -383,7 +388,7 @@
</javac>
</target>
- <target name="{@name}-patch" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-patch" unless="internal.exclude.block.{$block-name}">
<xsl:attribute name="depends">
<xsl:value-of select="$block-name"/><xsl:text>-prepare</xsl:text>
<xsl:if test="depend">
@@ -411,7 +416,7 @@
</target>
- <target name="{@name}-roles" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-roles" unless="internal.exclude.block.{$block-name}">
<xsl:if test="depend">
<xsl:attribute name="depends"><xsl:value-of select="@name"/><xsl:for-each select="depend[contains(@project,'cocoon-block-')]"><xsl:text>,</xsl:text><xsl:value-of select="@project"/>-roles</xsl:for-each></xsl:attribute>
</xsl:if>
@@ -421,7 +426,7 @@
</xpatch>
</target>
- <target name="{@name}-patch-samples" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-patch-samples" unless="internal.exclude.block.{$block-name}">
<xpatch file="${{build.webapp}}/samples/sitemap.xmap" srcdir="${{blocks}}">
<include name="{$block-name}/conf/*.samplesxpipe"/>
</xpatch>
@@ -430,7 +435,7 @@
</xpatch>
</target>
- <target name="{@name}-samples" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-samples" unless="internal.exclude.block.{$block-name}">
<xsl:if test="depend">
<xsl:attribute name="depends">
<xsl:value-of select="@name"/>
@@ -458,7 +463,7 @@
</if>
</target>
- <target name="{@name}-lib" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-lib" unless="internal.exclude.block.{$block-name}">
<xsl:if test="depend">
<xsl:attribute name="depends">
<xsl:value-of select="@name"/>
@@ -496,7 +501,7 @@
</target>
- <target name="{$block-name}-prepare" unless="unless.exclude.block.{$block-name}">
+ <target name="{$block-name}-prepare" unless="internal.exclude.block.{$block-name}">
<xsl:if test="depend">
<xsl:attribute name="depends">
<xsl:value-of select="@name"/>
@@ -523,7 +528,7 @@
</path>
</target>
- <target name="{@name}-tests" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-tests" unless="internal.exclude.block.{$block-name}">
<xsl:attribute name="depends">
<xsl:value-of select="@name"/><xsl:text>-compile</xsl:text>
<xsl:if test="depend">
@@ -583,7 +588,7 @@
</then>
</if>
</target>
- <target name="{@name}-prepare-anteater-tests" unless="unless.exclude.block.{$block-name}">
+ <target name="{@name}-prepare-anteater-tests" unless="internal.exclude.block.{$block-name}">
<!-- Test if this block has Anteater tests -->
<if>
1.7 +9 -8 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gump2blocks.properties.xsl 25 Mar 2004 02:22:05 -0000 1.6
+++ gump2blocks.properties.xsl 2 Apr 2004 19:07:50 -0000 1.7
@@ -47,12 +47,12 @@
# Cocoon Blocks #
#------------------------------------------------------------------------------#
-# Remove blocks from your cocoon distribution by uncommenting the
-# corresponding exclude property.
+# Remove blocks from your cocoon distribution by setting the corresponding
+# include property to true or false.
# NOTE: Don't modify this file directly but make a copy named
-# 'local.blocks.properties' and modify that. The build system will override
-# these properties with the ones in the 'local.blocks.properties' file.
+# 'local.blocks.properties' and modify that. The build system will first load
+# 'local.blocks.properties' and properties are immutable in Ant.
# NOTE: "[dependency]" indicates blocks that are required by other blocks.
# Disabling batik, for example, will result in a RuntimeException when using
@@ -129,11 +129,12 @@
<xsl:with-param name="text" select="'is needed by'"/>
</xsl:call-template>
- <!-- TODO: make this configurable externally (dependent on @status or @name) -->
- <xsl:if test="not(@status='deprecated' or @exclude='true')">#</xsl:if>
- <xsl:text>exclude.block.</xsl:text>
+ <xsl:text>include.block.</xsl:text>
<xsl:value-of select="substring-after(@name, 'cocoon-block-')"/>
- <xsl:text>=true </xsl:text>
+ <xsl:text>=</xsl:text>
+ <!-- TODO: make this configurable externally (dependent on @status or @name) -->
+ <xsl:value-of select="not(@status='deprecated' or @exclude='true')"/>
+ <xsl:text> </xsl:text>
</xsl:template>
<xsl:template name="dependency">
1.72 +55 -55 cocoon-2.1/blocks.properties
Index: blocks.properties
===================================================================
RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- blocks.properties 29 Mar 2004 18:51:32 -0000 1.71
+++ blocks.properties 2 Apr 2004 19:07:50 -0000 1.72
@@ -18,12 +18,12 @@
# Cocoon Blocks #
#------------------------------------------------------------------------------#
-# Remove blocks from your cocoon distribution by uncommenting the
-# corresponding exclude property.
+# Remove blocks from your cocoon distribution by setting the corresponding
+# include property to true or false.
# NOTE: Don't modify this file directly but make a copy named
-# 'local.blocks.properties' and modify that. The build system will override
-# these properties with the ones in the 'local.blocks.properties' file.
+# 'local.blocks.properties' and modify that. The build system will first load
+# 'local.blocks.properties' and properties are immutable in Ant.
# NOTE: "[dependency]" indicates blocks that are required by other blocks.
# Disabling batik, for example, will result in a RuntimeException when using
@@ -45,47 +45,47 @@
#-----[dependency]: "authentication-fw" depends on "session-fw".
#-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw".
-#exclude.block.authentication-fw=true
+include.block.authentication-fw=true
#-----[dependency]: "batik" is needed by "fop", "scratchpad".
-#exclude.block.batik=true
-#exclude.block.bsf=true
+include.block.batik=true
+include.block.bsf=true
#-----[dependency]: "chaperon" depends on "xsp" (for samples).
-#exclude.block.chaperon=true
+include.block.chaperon=true
#-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", "petstore", "repository", "xmldb".
-#exclude.block.databases=true
+include.block.databases=true
#-----[dependency]: "fop" depends on "batik".
-#exclude.block.fop=true
+include.block.fop=true
#-----[dependency]: "hsqldb" depends on "databases".
#-----[dependency]: "hsqldb" is needed by "jms", "petstore".
-#exclude.block.hsqldb=true
+include.block.hsqldb=true
#-----[dependency]: "html" is needed by "portal".
-#exclude.block.html=true
-#exclude.block.itext=true
-#exclude.block.jfor=true
-#exclude.block.jsp=true
+include.block.html=true
+include.block.itext=true
+include.block.jfor=true
+include.block.jsp=true
#-----[dependency]: "linkrewriter" depends on "xsp".
-#exclude.block.linkrewriter=true
-#exclude.block.lucene=true
-#exclude.block.naming=true
-#exclude.block.paranoid=true
-#exclude.block.php=true
-#exclude.block.poi=true
+include.block.linkrewriter=true
+include.block.lucene=true
+include.block.naming=true
+include.block.paranoid=true
+include.block.php=true
+include.block.poi=true
#-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
-#exclude.block.portal-fw=true
-#exclude.block.profiler=true
+include.block.portal-fw=true
+include.block.profiler=true
#-----[dependency]: "python" depends on "xsp".
-#exclude.block.python=true
+include.block.python=true
#-----[dependency]: "session-fw" depends on "xsp".
#-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-fw".
-#exclude.block.session-fw=true
-#exclude.block.swf=true
+include.block.session-fw=true
+include.block.swf=true
#-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
-#exclude.block.velocity=true
-#exclude.block.web3=true
+include.block.velocity=true
+include.block.web3=true
#-----[dependency]: "xmldb" depends on "databases".
-#exclude.block.xmldb=true
+include.block.xmldb=true
#-----[dependency]: "xsp" is needed by "chaperon", "eventcache", "forms", "linkrewriter", "python", "scratchpad", "session-fw", "woody".
-#exclude.block.xsp=true
+include.block.xsp=true
# Unstable blocks --------------------------------------------------------------
@@ -98,50 +98,50 @@
# stable.
#-----[dependency]: "apples" depends on "forms" (for samples).
-#exclude.block.apples=true
+include.block.apples=true
#-----[dependency]: "asciiart" is needed by "mail".
-#exclude.block.asciiart=true
-#exclude.block.axis=true
+include.block.asciiart=true
+include.block.axis=true
#-----[dependency]: "cron" is needed by "scratchpad".
-#exclude.block.cron=true
-#exclude.block.deli=true
+include.block.cron=true
+include.block.deli=true
#-----[dependency]: "eventcache" depends on "xsp" (for samples).
#-----[dependency]: "eventcache" is needed by "jms", "repository".
-#exclude.block.eventcache=true
+include.block.eventcache=true
#-----[dependency]: "forms" depends on "xsp" (for samples).
#-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore".
-#exclude.block.forms=true
+include.block.forms=true
#-----[dependency]: "javaflow" depends on "forms", "ojb".
-#exclude.block.javaflow=true
+include.block.javaflow=true
#-----[dependency]: "jms" depends on "databases" (for samples), "eventcache", "hsqldb".
#-----[dependency]: "jms" is needed by "slide".
-#exclude.block.jms=true
-#exclude.block.linotype=true
+include.block.jms=true
+include.block.linotype=true
#-----[dependency]: "mail" depends on "asciiart", "scratchpad".
-#exclude.block.mail=true
-#exclude.block.midi=true
+include.block.mail=true
+include.block.midi=true
#-----[dependency]: "ojb" depends on "databases", "forms" (for samples).
#-----[dependency]: "ojb" is needed by "javaflow".
-#exclude.block.ojb=true
+include.block.ojb=true
#-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity".
-#exclude.block.petstore=true
+include.block.petstore=true
#-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".
-#exclude.block.portal=true
-#exclude.block.proxy=true
-#exclude.block.qdox=true
+include.block.portal=true
+include.block.proxy=true
+include.block.qdox=true
#-----[dependency]: "repository" depends on "databases", "eventcache".
#-----[dependency]: "repository" is needed by "slide", "webdav".
-#exclude.block.repository=true
+include.block.repository=true
#-----[dependency]: "scratchpad" depends on "batik" (for samples), "cron", "velocity", "xsp".
#-----[dependency]: "scratchpad" is needed by "mail".
-#exclude.block.scratchpad=true
+include.block.scratchpad=true
#-----[dependency]: "slide" depends on "jms", "repository".
-#exclude.block.slide=true
-#exclude.block.slop=true
-#exclude.block.stx=true
-#exclude.block.taglib=true
+include.block.slide=true
+include.block.slop=true
+include.block.stx=true
+include.block.taglib=true
#-----[dependency]: "webdav" depends on "repository".
-#exclude.block.webdav=true
+include.block.webdav=true
# Deprecated blocks ------------------------------------------------------------
@@ -151,4 +151,4 @@
# blocks.properties.
#-----[dependency]: "woody" depends on "xsp" (for samples).
-exclude.block.woody=true
+include.block.woody=false