cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cross...@apache.org
Subject cvs commit: cocoon-2.1/src/documentation/stylesheets statuschanges2document.xsl statustodo2document.xsl
Date Sun, 06 Apr 2003 04:13:23 GMT
crossley    2003/04/05 20:13:23

  Modified:    src/documentation sitemap-localdocs.xmap
               src/targets docs-build.xml validate-build.xml
                        webapp-build.xml
  Added:       src/documentation/stylesheets statuschanges2document.xsl
                        statustodo2document.xsl
  Removed:     .        changes.xml todo.xml
  Log:
  Use status.xml instead of changes.xml and todo.xml
  
  Revision  Changes    Path
  1.2       +6 -5      cocoon-2.1/src/documentation/sitemap-localdocs.xmap
  
  Index: sitemap-localdocs.xmap
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/documentation/sitemap-localdocs.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap-localdocs.xmap	26 Mar 2003 13:28:00 -0000	1.1
  +++ sitemap-localdocs.xmap	6 Apr 2003 04:13:22 -0000	1.2
  @@ -98,8 +98,8 @@
   
      <!-- the main ToDo doc -->
      <map:match pattern="body-todo.xml">
  -     <map:generate type="file-nolabel" src="xdocs/todo.xml"/>
  -     <map:transform src="stylesheets/todo2document.xsl" label="content"/>
  +     <map:generate type="file-nolabel" src="xdocs/status.xml"/>
  +     <map:transform src="stylesheets/statustodo2document.xsl" label="content"/>
        <map:transform src="stylesheets/document2html.xsl"/>
        <map:serialize/>
      </map:match>
  @@ -114,8 +114,9 @@
   
      <!-- the main Changes doc -->
      <map:match pattern="body-changes.xml">
  -     <map:generate type="file-nolabel" src="xdocs/changes.xml"/>
  -     <map:transform src="stylesheets/changes2document.xsl" label="content"/>
  +     <map:generate type="file-nolabel" src="xdocs/status.xml"/>
  +     <map:transform src="stylesheets/statuschanges2document.xsl"
  +       label="content"/>
        <map:transform src="stylesheets/document2html.xsl"/>
        <map:serialize/>
      </map:match>
  
  
  
  1.11      +9 -4      cocoon-2.1/src/targets/docs-build.xml
  
  Index: docs-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/docs-build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- docs-build.xml	2 Apr 2003 15:04:30 -0000	1.10
  +++ docs-build.xml	6 Apr 2003 04:13:22 -0000	1.11
  @@ -24,6 +24,11 @@
           <exclude name="images/**"/>
         </fileset>
       </copy>
  +
  +    <!-- Add some other documents -->
  +    <copy file="status.xml"
  +      tofile="${build.context}/xdocs/status.xml" filtering="on"/>
  +
       <!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
       overwrite it with the old Cocoon-specific sitemap here -->
       <move file="${build.context}/sitemap-localdocs.xmap"
  @@ -47,7 +52,7 @@
     <!-- Set a variable if the generated docs are already up-to-date. -->
     <target name="docs_check" depends="prepare-docs">
       <uptodate property="docs.notrequired" targetfile="${build.docs}/index.html" >
  -      <srcfiles dir="." includes="changes.xml,todo.xml"/>
  +      <srcfiles dir="." includes="status.xml"/>
         <srcfiles dir="${build}" includes="jars.xml"/>
         <srcfiles dir="${documentation}/xdocs" includes="**/*.xml"/>
       </uptodate>
  @@ -58,7 +63,7 @@
       <echo message="-------------------------------------------------------------"/>
       <echo message="Not rebuilding docs, as they are up-to-date:"/>
       <echo message="  ${build.docs}/index.html is more recent than"/>
  -    <echo message="  todo.xml, changes.xml, ${documentation}/xdocs/*.xml"/>
  +    <echo message="  status.xml, ${documentation}/xdocs/*.xml"/>
       <echo message="-------------------------------------------------------------"/>
     </target>
   
  @@ -110,7 +115,7 @@
     <!-- Set a variable if the generated printer docs are already up-to-date. -->
     <target name="printer-docs_check" depends="prepare">
       <uptodate property="printer-docs.notrequired" targetfile="${build.docs.printer}/index.html"
>
  -      <srcfiles dir="." includes="changes.xml,todo.xml"/>
  +      <srcfiles dir="." includes="status.xml"/>
         <srcfiles dir="${docs}" includes="**/*.xml"/>
       </uptodate>
     </target>
  @@ -120,7 +125,7 @@
       <echo message="-------------------------------------------------------------"/>
       <echo message="Not rebuilding printer docs, as they are up-to-date:"/>
       <echo message="  ${build.docs.printer}/index.html is more recent than"/>
  -    <echo message="  todo.xml, changes.xml, ${docs}/*.xml"/>
  +    <echo message="  status.xml, ${docs}/*.xml"/>
       <echo message="-------------------------------------------------------------"/>
     </target>
   
  
  
  
  1.8       +2 -2      cocoon-2.1/src/targets/validate-build.xml
  
  Index: validate-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/validate-build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- validate-build.xml	28 Mar 2003 02:11:36 -0000	1.7
  +++ validate-build.xml	6 Apr 2003 04:13:22 -0000	1.8
  @@ -57,7 +57,7 @@
     <target name="validate-config" depends="prepare" unless="exclude.validate.config">
       <echo message="Validating configuration files"/>
   
  -    <echo message="Validating cocoon.xconf using RELAX NG ..."/>
  +    <echo message="Validating cocoon.xconf using a very basic RELAX NG grammar ..."/>
       <jing rngfile="${build.webapp}/WEB-INF/entities/any.rng">
         <fileset dir="${build.webapp}/WEB-INF" includes="cocoon.xconf"/>
       </jing>
  @@ -76,7 +76,7 @@
       <xmlvalidate failonerror="true" lenient="no" warn="yes">
         <!-- FIXME: we can use xmlcatalog with Ant-1.6 -->
         <fileset dir="${build.context}/xdocs" includes="**/*.xml"
  -               excludes="drafts/*.xml,dictionary.xml,catalog-test.xml,ctwig/sample/**/*.xml,tabs.xml"/>
  +               excludes="status.xml,drafts/*.xml,dictionary.xml,catalog-test.xml,ctwig/sample/**/*.xml,tabs.xml"/>
       </xmlvalidate>
   
       <echo message="Validating the documentation sitemap.xmap using RELAX NG ..."/>
  
  
  
  1.14      +5 -0      cocoon-2.1/src/targets/webapp-build.xml
  
  Index: webapp-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/targets/webapp-build.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- webapp-build.xml	4 Apr 2003 16:00:18 -0000	1.13
  +++ webapp-build.xml	6 Apr 2003 04:13:22 -0000	1.14
  @@ -118,6 +118,11 @@
         	<exclude name="*.xwelcome"/>
         </fileset>
       </copy>
  +
  +    <!-- Add some other documents -->
  +    <copy file="status.xml"
  +      tofile="${build.webapp.docs}/xdocs/status.xml" filtering="on"/>
  +
       <!-- Forrest needs its own file at src/documentation/sitemap.xmap, so we
       overwrite it with the old Cocoon-specific sitemap here -->
       <copy file="${documentation}/sitemap-localdocs.xmap"
  
  
  
  1.1                  cocoon-2.1/src/documentation/stylesheets/statuschanges2document.xsl
  
  Index: statuschanges2document.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      version="1.0">
  
   <xsl:import href="copyover.xsl"/>
  
   <xsl:param name="name"/>
  
   <xsl:variable name="bugzilla">http://nagoya.apache.org/bugzilla/show_bug.cgi?id=</xsl:variable>
  
   <xsl:template match="/">
    <xsl:apply-templates select="//changes"/>
   </xsl:template>
  
   <xsl:template match="changes">
    <document>
     <header>
      <title>History of Changes</title>
     </header>
     <body>
      <xsl:apply-templates/>
     </body>
    </document>
   </xsl:template>
  
   <xsl:template match="release">
    <s2 title="{$name} {@version} ({@date})">
     <sl>
      <xsl:apply-templates/>
     </sl>
    </s2>
   </xsl:template>
  
   <xsl:template match="action">
    <li>
     <icon src="images/{@type}.jpg" alt="{@type}"/>
     <xsl:apply-templates/>
     <xsl:text>(</xsl:text><xsl:value-of select="@dev"/><xsl:text>)</xsl:text>
  
     <xsl:if test="@due-to and @due-to!=''">
      <xsl:text> Thanks to </xsl:text>
      <xsl:choose>
       <xsl:when test="@due-to-email and @due-to-email!=''">
        <link href="mailto:{@due-to-email}">
         <xsl:value-of select="@due-to"/>
        </link>
       </xsl:when>
       <xsl:otherwise>
        <xsl:value-of select="@due-to"/>
       </xsl:otherwise>
      </xsl:choose>
      <xsl:text>.</xsl:text>
     </xsl:if>
  
     <xsl:if test="@fixes-bug">
      <xsl:text> Fixes </xsl:text>
      <link href="{$bugzilla}{@fixes-bug}">
       <xsl:text>bug </xsl:text><xsl:value-of select="@fixes-bug"/>
      </link>
      <xsl:text>.</xsl:text>
     </xsl:if>
    </li>
   </xsl:template>
  
   <xsl:template match="developers|todo">
    <!-- ignore -->
   </xsl:template>
  
  </xsl:stylesheet>
  
  
  
  1.1                  cocoon-2.1/src/documentation/stylesheets/statustodo2document.xsl
  
  Index: statustodo2document.xsl
  ===================================================================
  <?xml version="1.0"?>
  
  <xsl:stylesheet
      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
      version="1.0">
  
   <xsl:import href="copyover.xsl"/>
  
   <xsl:template match="/">
    <xsl:apply-templates select="//todo"/>
   </xsl:template>
   
   <xsl:template match="todo">
    <document>
     <header>
      <title>Things to do</title>
     </header>
     <body>
      <xsl:apply-templates/>
     </body>
    </document>
   </xsl:template>
  
   <xsl:template match="actions">
    <s2 title="{@priority}">
     <sl>
      <xsl:for-each select="action">
       <li>
        <strong><xsl:text>[</xsl:text><xsl:value-of select="@context"/><xsl:text>]</xsl:text></strong><xsl:text>
</xsl:text>
        <xsl:apply-templates/>
       </li>
      </xsl:for-each>
     </sl>
    </s2>
   </xsl:template>
  
   <xsl:template match="developers|changes">
    <!-- ignore -->
   </xsl:template>
   
  </xsl:stylesheet>
  
  
  

Mime
View raw message