cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: xml-cocoon2 module.xml
Date Wed, 02 Oct 2002 08:10:34 GMT
cziegeler    2002/10/02 01:10:34

  Modified:    src/webapp/samples/docs/samples samples.xml
               tools/src blocks-build.xsl
               src/webapp/samples samples.xml
               .        module.xml
  Log:
  The build script now automatically tests blocks for samples.
  
  Revision  Changes    Path
  1.3       +3 -3      xml-cocoon2/src/webapp/samples/docs/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/docs/samples/samples.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- samples.xml	2 Jul 2002 14:22:12 -0000	1.2
  +++ samples.xml	2 Oct 2002 08:10:33 -0000	1.3
  @@ -57,11 +57,11 @@
       More ways of implementing dynamic content.
      </sample>
   
  -   <sample name="Authentication Framework" href="authentication/login">
  +   <sample name="Authentication Framework" href="authentication-fw/login">
       This is a demo of the authentication framework integrated into Cocoon.
      </sample>
   
  -   <sample name="Portal Framework" href="portal/sunspotdemoportal">
  +   <sample name="Portal Framework" href="portal-fw/sunspotdemoportal">
       This is a demo of the portal framework integrated into Cocoon.
      </sample>
   
  
  
  
  1.7       +7 -5      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- blocks-build.xsl	27 Sep 2002 12:56:28 -0000	1.6
  +++ blocks-build.xsl	2 Oct 2002 08:10:33 -0000	1.7
  @@ -24,12 +24,12 @@
         </target>
   
   <!-- Copy the samples -->
  -      <target name="-single-project-samples" if="currentblock.samplename">
  +      <target name="-single-project-samples" if="currentblock.has.sample">
            <property name="currentblock.dir">
               <xsl:attribute name="value">${blocks.dir}/${currentblock.name}</xsl:attribute>
            </property>
            <copy filtering="on">
  -            <xsl:attribute name="todir">${build.war}/samples/${currentblock.samplename}</xsl:attribute>
  +            <xsl:attribute name="todir">${build.war}/samples/${currentblock.name}</xsl:attribute>
   
               <fileset>
                  <xsl:attribute name="dir">${currentblock.dir}/samples</xsl:attribute>
  @@ -183,11 +183,13 @@
               </xsl:attribute>
            </xsl:if>
   
  +         <!-- Test if this block has a sample -->
  +         <available property="currentblock.has.sample">
  +             <xsl:attribute name="file">${blocks.dir}/<xsl:value-of select="$block-name"/>/samples/sitemap.xmap</xsl:attribute>
  +         </available>
  +         
            <antcall target="-single-project">
               <param name="currentblock.name" value="{$block-name}" />
  -            <xsl:if test="sample/@name">
  -                <param name="currentblock.samplename" value="{sample/@name}"/>
  -            </xsl:if>
            </antcall>
         </target>
      </xsl:template>
  
  
  
  1.31      +3 -3      xml-cocoon2/src/webapp/samples/samples.xml
  
  Index: samples.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/samples/samples.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- samples.xml	21 Sep 2002 17:36:00 -0000	1.30
  +++ samples.xml	2 Oct 2002 08:10:34 -0000	1.31
  @@ -156,10 +156,10 @@
       <sample name="Dynamic Content" href="sample-dynamic">
       More ways of implementing dynamic content.
      </sample>
  -    <sample name="Authentication Framework" href="authentication/login">
  +    <sample name="Authentication Framework" href="authentication-fw/login">
       This is a demo of the authentication framework integrated into Cocoon.
      </sample>
  -    <sample name="Portal Framework" href="portal/sunspotdemoportal">
  +    <sample name="Portal Framework" href="portal-fw/sunspotdemoportal">
       This is a demo of the portal framework integrated into Cocoon.
      </sample>
       <sample name="Sources" href="sub/">
  
  
  
  1.9       +0 -2      xml-cocoon2/module.xml
  
  Index: module.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/module.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- module.xml	27 Sep 2002 12:11:17 -0000	1.8
  +++ module.xml	2 Oct 2002 08:10:34 -0000	1.9
  @@ -215,7 +215,6 @@
       <home nested="build/cocoon"/>
       
       <jar name="authentication-fw-block.jar"/>
  -    <sample name="authentication"/>
     </project>
   
     <project name="portal-fw-block">
  @@ -233,6 +232,5 @@
       <home nested="build/cocoon"/>
       
       <jar name="portal-fw-block.jar"/>
  -    <sample name="portal"/>
     </project>
   </module>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message