cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: xml-cocoon2/tools/src blocks-build.xsl
Date Sat, 22 Feb 2003 16:00:19 GMT
stefano     2003/02/22 08:00:15

  Modified:    tools/src blocks-build.xsl
  Log:
  now blocks add stuff from their /WEB-INF directory into the webapp folder.
  
  fixed also the run of the xconf tool.
  
  Revision  Changes    Path
  1.21      +19 -4     xml-cocoon2/tools/src/blocks-build.xsl
  
  Index: blocks-build.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/tools/src/blocks-build.xsl,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- blocks-build.xsl	21 Feb 2003 13:27:03 -0000	1.20
  +++ blocks-build.xsl	22 Feb 2003 16:00:15 -0000	1.21
  @@ -87,6 +87,7 @@
               <xsl:attribute name="depends"><xsl:value-of select="@name"/><xsl:for-each
select="depend[not(@version or contains(@project,'cocoon'))]"><xsl:text>,</xsl:text><xsl:value-of
select="@project"/>-patch</xsl:for-each></xsl:attribute>
            </xsl:if>
   
  +         <antcall target="{$block-name}-patches"/>
         </target>
         
         <target name="{@name}-samples" unless="exclude.block.{$block-name}">
  @@ -110,7 +111,13 @@
                <xsl:attribute name="file">${blocks}/<xsl:value-of select="$block-name"/>/lib/</xsl:attribute>
            </available>
   
  +         <!-- Test if this block has global WEB-INF files -->
  +         <available property="{$block-name}.has.webinf" type="dir">
  +             <xsl:attribute name="file">${blocks}/<xsl:value-of select="$block-name"/>/WEB-INF/</xsl:attribute>
  +         </available>
  +
            <antcall target="{$block-name}-lib"/>
  +         <antcall target="{$block-name}-webinf"/>
         </target>
   
         <target name="{$block-name}-prepare">
  @@ -203,17 +210,25 @@
         </target>
   
         <target name="{$block-name}-lib" if="{$block-name}.has.lib">
  -         <copy filtering="on" todir="{string('${build.webapp.lib}')}">
  +         <copy filtering="off" todir="{string('${build.webapp.lib}')}">
               <fileset dir="{string('${blocks}')}/{$block-name}/lib">
                  <include name="*.jar"/>
               </fileset>
            </copy>
         </target>
   
  +      <target name="{$block-name}-webinf" if="{$block-name}.has.webinf">
  +         <copy filtering="on" todir="{string('${build.webapp.webinf}')}">
  +            <fileset dir="{string('${blocks}')}/{$block-name}/WEB-INF/">
  +               <include name="**"/>
  +            </fileset>
  +         </copy>
  +      </target>
  +
         <target name="{$block-name}-patches" depends="{$block-name}-prepare">
  -         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xmap"
configuration="${build.webapp}/sitemap.xmap"/>
  -         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xpipe"
configuration="${build.webapp}/sitemap.xmap"/>
  -         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xconf"
configuration="${build.webapp}/WEB-INF/cocoon.xconf"/>
  +         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xmap"
configuration="{string('${build.webapp}')}/sitemap.xmap"/>
  +         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xpipe"
configuration="{string('${build.webapp}')}/sitemap.xmap"/>
  +         <xpatch directory="{string('${build.blocks}')}/{$block-name}/conf" extension="xconf"
configuration="{string('${build.webapp}')}/WEB-INF/cocoon.xconf"/>
         </target>
         
         <target name="{$block-name}-samples" if="{$block-name}.has.samples">
  
  
  

Mime
View raw message