cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.1 blocks.properties
Date Thu, 08 Apr 2004 09:31:58 GMT
joerg       2004/04/08 02:31:58

  Modified:    tools/src blocks-build.xsl gump2blocks.properties.xsl
               .        blocks.properties
  Log:
  changed the logic a bit for evaluating include and exclude properties of blocks
  
  Revision  Changes    Path
  1.64      +3 -3      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.63
  retrieving revision 1.64
  diff -u -r1.63 -r1.64
  --- blocks-build.xsl	2 Apr 2004 19:07:50 -0000	1.63
  +++ blocks-build.xsl	8 Apr 2004 09:31:57 -0000	1.64
  @@ -66,13 +66,13 @@
         <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="exclude.block.{$block-name}">
  +          <condition property="include.block.{$block-name}">
               <not>
  -              <istrue value="${{include.block.{$block-name}}}"/>
  +              <istrue value="${{exclude.block.{$block-name}}}"/>
               </not>
             </condition>
             <condition property="internal.exclude.block.{$block-name}">
  -            <istrue value="${{exclude.block.{$block-name}}}"/>
  +            <isfalse value="${{include.block.{$block-name}}}"/>
             </condition>
           </xsl:for-each>
         </target>
  
  
  
  1.8       +5 -5      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- gump2blocks.properties.xsl	2 Apr 2004 19:07:50 -0000	1.7
  +++ gump2blocks.properties.xsl	8 Apr 2004 09:31:57 -0000	1.8
  @@ -48,7 +48,8 @@
   #------------------------------------------------------------------------------#
   
   # Remove blocks from your cocoon distribution by setting the corresponding
  -# include property to true or false.
  +# include property to true or false. The blocks are included by default, i.e. if
  +# no property was set.
   
   # NOTE: Don't modify this file directly but make a copy named
   # 'local.blocks.properties' and modify that. The build system will first load
  @@ -129,12 +130,11 @@
           <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>include.block.</xsl:text>
       <xsl:value-of select="substring-after(@name, 'cocoon-block-')"/>
  -    <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>&#10;</xsl:text>
  +    <xsl:text>=false&#10;</xsl:text>
   </xsl:template>
   
   <xsl:template name="dependency">
  
  
  
  1.73      +54 -52    cocoon-2.1/blocks.properties
  
  Index: blocks.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/blocks.properties,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- blocks.properties	2 Apr 2004 19:07:50 -0000	1.72
  +++ blocks.properties	8 Apr 2004 09:31:58 -0000	1.73
  @@ -19,7 +19,8 @@
   #------------------------------------------------------------------------------#
   
   # Remove blocks from your cocoon distribution by setting the corresponding
  -# include property to true or false.
  +# include property to true or false. The blocks are included by default, i.e. if
  +# no property was set.
   
   # NOTE: Don't modify this file directly but make a copy named
   # 'local.blocks.properties' and modify that. The build system will first load
  @@ -45,47 +46,48 @@
   
   #-----[dependency]: "authentication-fw" depends on "session-fw".
   #-----[dependency]: "authentication-fw" is needed by "portal", "portal-fw".
  -include.block.authentication-fw=true
  +#include.block.authentication-fw=false
   #-----[dependency]: "batik" is needed by "fop", "scratchpad".
  -include.block.batik=true
  -include.block.bsf=true
  +#include.block.batik=false
  +#include.block.bsf=false
   #-----[dependency]: "chaperon" depends on "xsp" (for samples).
  -include.block.chaperon=true
  +#include.block.chaperon=false
  +#-----[dependency]: "databases" depends on "xsp".
   #-----[dependency]: "databases" is needed by "hsqldb", "jms", "ojb", "petstore", "repository",
"xmldb".
  -include.block.databases=true
  +#include.block.databases=false
   #-----[dependency]: "fop" depends on "batik".
  -include.block.fop=true
  +#include.block.fop=false
   #-----[dependency]: "hsqldb" depends on "databases".
   #-----[dependency]: "hsqldb" is needed by "jms", "petstore".
  -include.block.hsqldb=true
  +#include.block.hsqldb=false
   #-----[dependency]: "html" is needed by "portal".
  -include.block.html=true
  -include.block.itext=true
  -include.block.jfor=true
  -include.block.jsp=true
  +#include.block.html=false
  +#include.block.itext=false
  +#include.block.jfor=false
  +#include.block.jsp=false
   #-----[dependency]: "linkrewriter" depends on "xsp".
  -include.block.linkrewriter=true
  -include.block.lucene=true
  -include.block.naming=true
  -include.block.paranoid=true
  -include.block.php=true
  -include.block.poi=true
  +#include.block.linkrewriter=false
  +#include.block.lucene=false
  +#include.block.naming=false
  +#include.block.paranoid=false
  +#include.block.php=false
  +#include.block.poi=false
   #-----[dependency]: "portal-fw" depends on "authentication-fw", "session-fw".
  -include.block.portal-fw=true
  -include.block.profiler=true
  +#include.block.portal-fw=false
  +#include.block.profiler=false
   #-----[dependency]: "python" depends on "xsp".
  -include.block.python=true
  +#include.block.python=false
   #-----[dependency]: "session-fw" depends on "xsp".
   #-----[dependency]: "session-fw" is needed by "authentication-fw", "portal", "portal-fw".
  -include.block.session-fw=true
  -include.block.swf=true
  +#include.block.session-fw=false
  +#include.block.swf=false
   #-----[dependency]: "velocity" is needed by "petstore", "scratchpad".
  -include.block.velocity=true
  -include.block.web3=true
  +#include.block.velocity=false
  +#include.block.web3=false
   #-----[dependency]: "xmldb" depends on "databases".
  -include.block.xmldb=true
  -#-----[dependency]: "xsp" is needed by "chaperon", "eventcache", "forms", "linkrewriter",
"python", "scratchpad", "session-fw", "woody".
  -include.block.xsp=true
  +#include.block.xmldb=false
  +#-----[dependency]: "xsp" is needed by "chaperon", "databases", "eventcache", "forms",
"linkrewriter", "python", "scratchpad", "session-fw", "woody".
  +#include.block.xsp=false
   
   # Unstable blocks --------------------------------------------------------------
   
  @@ -98,50 +100,50 @@
   # stable.
   
   #-----[dependency]: "apples" depends on "forms" (for samples).
  -include.block.apples=true
  +#include.block.apples=false
   #-----[dependency]: "asciiart" is needed by "mail".
  -include.block.asciiart=true
  -include.block.axis=true
  +#include.block.asciiart=false
  +#include.block.axis=false
   #-----[dependency]: "cron" is needed by "scratchpad".
  -include.block.cron=true
  -include.block.deli=true
  +#include.block.cron=false
  +#include.block.deli=false
   #-----[dependency]: "eventcache" depends on "xsp" (for samples).
   #-----[dependency]: "eventcache" is needed by "jms", "repository".
  -include.block.eventcache=true
  +#include.block.eventcache=false
   #-----[dependency]: "forms" depends on "xsp" (for samples).
   #-----[dependency]: "forms" is needed by "apples", "javaflow", "ojb", "petstore".
  -include.block.forms=true
  +#include.block.forms=false
   #-----[dependency]: "javaflow" depends on "forms", "ojb".
  -include.block.javaflow=true
  +#include.block.javaflow=false
   #-----[dependency]: "jms" depends on "databases" (for samples), "eventcache", "hsqldb".
   #-----[dependency]: "jms" is needed by "slide".
  -include.block.jms=true
  -include.block.linotype=true
  +#include.block.jms=false
  +#include.block.linotype=false
   #-----[dependency]: "mail" depends on "asciiart", "scratchpad".
  -include.block.mail=true
  -include.block.midi=true
  +#include.block.mail=false
  +#include.block.midi=false
   #-----[dependency]: "ojb" depends on "databases", "forms" (for samples).
   #-----[dependency]: "ojb" is needed by "javaflow".
  -include.block.ojb=true
  +#include.block.ojb=false
   #-----[dependency]: "petstore" depends on "databases", "forms", "hsqldb", "velocity".
  -include.block.petstore=true
  +#include.block.petstore=false
   #-----[dependency]: "portal" depends on "authentication-fw", "html", "session-fw".
  -include.block.portal=true
  -include.block.proxy=true
  -include.block.qdox=true
  +#include.block.portal=false
  +#include.block.proxy=false
  +#include.block.qdox=false
   #-----[dependency]: "repository" depends on "databases", "eventcache".
   #-----[dependency]: "repository" is needed by "slide", "webdav".
  -include.block.repository=true
  +#include.block.repository=false
   #-----[dependency]: "scratchpad" depends on "batik" (for samples), "cron", "velocity",
"xsp".
   #-----[dependency]: "scratchpad" is needed by "mail".
  -include.block.scratchpad=true
  +#include.block.scratchpad=false
   #-----[dependency]: "slide" depends on "jms", "repository".
  -include.block.slide=true
  -include.block.slop=true
  -include.block.stx=true
  -include.block.taglib=true
  +#include.block.slide=false
  +#include.block.slop=false
  +#include.block.stx=false
  +#include.block.taglib=false
   #-----[dependency]: "webdav" depends on "repository".
  -include.block.webdav=true
  +#include.block.webdav=false
   
   # Deprecated blocks ------------------------------------------------------------
   
  
  
  

Mime
View raw message