forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core/context forrest.xmap
Date Fri, 28 Nov 2003 11:06:27 GMT
nicolaken    2003/11/28 03:06:27

  Modified:    src/core/context forrest.xmap
  Log:
        <action dev="NKB" type="update" context="core"  >
          Updated and separated in their directory all the resources
          needed by Chaperon, and make the pipeline generate the
          xml grammar versions if unavailable.
          This fixes some wiki rendering bugs and makes sections
          follow the correct level nesting.
        </action>
  
  Revision  Changes    Path
  1.4       +34 -26    xml-forrest/src/core/context/forrest.xmap
  
  Index: forrest.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/forrest.xmap,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- forrest.xmap	26 Nov 2003 09:15:31 -0000	1.3
  +++ forrest.xmap	28 Nov 2003 11:06:27 -0000	1.4
  @@ -197,14 +197,9 @@
             <map:when test="{project:content.xdocs}{1}.cwiki">
               <map:match type="regexp" pattern="^(.*?)([^/]*).xml$">
                 <map:generate type="text2xml" src="{project:content.xdocs}{1}{2}.cwiki"
/>
  -              <map:transform type="lexer"   src="{forrest:home}/context/resources/grammars/wiki.xlex"/>
  -              <map:transform type="parser"  src="{forrest:home}/context/resources/grammars/wiki.xgrm"/>
  -              <!--  Dynamically generated equivalents.  Matchers need to be added to
  -              the root sitemap for this to work.
                 <map:transform type="lexer"   src="cocoon:/wiki.xlex"/>
                 <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
  -              -->
  -              <map:transform src="{forrest:stylesheets}/wiki2document.xsl">
  +              <map:transform src="{forrest:home}/context/resources/chaperon/stylesheets/wiki2xdoc.xsl">
                   <map:parameter name="name" value="{2}" />
                 </map:transform>
                 <map:serialize type="xml-document"/>
  @@ -232,34 +227,47 @@
           </map:select>
   
         </map:match>
  +  </map:pipeline>
  +  
  +  <map:pipeline type="caching" internal-only="true">
   
  -
  -      <!--
  -      These pipelines dynamically generate the wiki.{xlex,xgrm} files used in
  -      the *.cwiki pipeline.  They are not used by default to avoid the overhead.
         <map:match pattern="*.xlex">
  -        <map:generate type="text2xml" src="{forrest:home}/context/resources/grammars/{1}.grm"/>
  -        <map:transform type="lexer"  src="{forrest:home}/context/resources/grammars/grm.xlex"/>
  -        <map:transform type="parser" src="{forrest:home}/context/esources/grammars/grm.xgrm"/>
  -        <map:transform               src="{forrest:home}/context/resources/grammars/text4regex.xsl"/>
  -        <map:transform type="lexer"  src="{forrest:home}/context/resources/grammars/regex.xlex"/>
  -        <map:transform type="parser" src="{forrest:home}/context/resources/grammars/regex.xgrm"/>
  -        <map:transform               src="{forrest:home}/context/resources/grammars/grm2xlex.xsl"/>
  +        <map:select type="exists">
  +          <map:when test="{forrest:home}/context/resources/chaperon/grammars/{1}.xlex">
  +            <map:read src="{forrest:home}/context/resources/chaperon/grammars/{1}.xlex"/>
  +          </map:when>
  +          <map:otherwise>
  +        <map:generate  type="text2xml"   src="{forrest:home}/context/resources/chaperon/grammars/{1}.grm"/>
  +        <map:transform type="lexer"  src="{forrest:home}/context/resources/chaperon/grammars/grm.xlex"/>
  +        <map:transform type="parser" src="{forrest:home}/context/resources/chaperon/grammars/grm.xgrm"/>
  +        <map:transform               src="{forrest:home}/context/resources/chaperon/stylesheets/text4regex.xsl"/>
  +        <map:transform type="lexer"  src="{forrest:home}/context/resources/chaperon/grammars/regex.xlex"/>
  +        <map:transform type="parser" src="{forrest:home}/context/resources/chaperon/grammars/regex.xgrm"/>
  +        <map:transform               src="{forrest:home}/context/resources/chaperon/stylesheets/grm2xlex.xsl"/>
           <map:serialize type="xml"/>
  +          </map:otherwise>
  +        </map:select>
         </map:match>
   
         <map:match pattern="*.xgrm">
  -        <map:generate type="text2xml"  src="{forrest:home}/context/resources/grammars/{1}.grm"/>
  -        <map:transform type="lexer"  src="{forrest:home}/context/resources/grammars/grm.xlex"/>
  -        <map:transform type="parser" src="{forrest:home}/context/resources/grammars/grm.xgrm"/>
  -        <map:transform               src="{forrest:home}/context/resources/grammars/text4regex.xsl"/>
  -        <map:transform type="lexer"  src="{forrest:home}/context/resources/grammars/regex.xlex"/>
  -        <map:transform type="parser" src="{forrest:home}/context/resources/grammars/regex.xgrm"/>
  -        <map:transform               src="{forrest:home}/context/resources/grammars/grm2xgrm.xsl"/>
  +        <map:select type="exists">
  +          <map:when test="{forrest:home}/context/resources/chaperon/grammars/{1}.xgrm">
  +            <map:read src="{forrest:home}/context/resources/chaperon/grammars/{1}.xgrm"/>
  +          </map:when>
  +          <map:otherwise>
  +        <map:generate  type="text2xml"   src="{forrest:home}/context/resources/chaperon/grammars/{1}.grm"/>
  +        <map:transform type="lexer"  src="{forrest:home}/context/resources/chaperon/grammars/grm.xlex"/>
  +        <map:transform type="parser" src="{forrest:home}/context/resources/chaperon/grammars/grm.xgrm"/>
  +        <map:transform               src="{forrest:home}/context/resources/chaperon/stylesheets/text4regex.xsl"/>
  +        <map:transform type="lexer"  src="{forrest:home}/context/resources/chaperon/grammars/regex.xlex"/>
  +        <map:transform type="parser" src="{forrest:home}/context/resources/chaperon/grammars/regex.xgrm"/>
  +        <map:transform               src="{forrest:home}/context/resources/chaperon/stylesheets/grm2xgrm.xsl"/>
           <map:serialize type="xml"/>
  +          </map:otherwise>
  +        </map:select>
         </map:match>
  -      -->
   
       </map:pipeline>
  +    
     </map:pipelines>
   </map:sitemap>
  
  
  

Mime
View raw message