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 sitemap.xmap
Date Fri, 23 Jan 2004 09:55:26 GMT
nicolaken    2004/01/23 01:55:26

  Modified:    src/core/context forrest.xmap sitemap.xmap
  Log:
  Update chaperon
  
  Revision  Changes    Path
  1.7       +75 -29    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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- forrest.xmap	21 Jan 2004 10:44:38 -0000	1.6
  +++ forrest.xmap	23 Jan 2004 09:55:26 -0000	1.7
  @@ -24,21 +24,42 @@
         <map:generator name="html"      src="org.apache.cocoon.generation.HTMLGenerator">
           <jtidy-config>WEB-INF/jtidy.properties</jtidy-config>
         </map:generator>
  -      <map:generator name="text2xml" src="org.apache.cocoon.generation.TextGenerator"
/>
  +      <map:generator name="text2xml" logger="sitemap.generator.textgenerator"
  +                     src="org.apache.cocoon.generation.TextGenerator">
  +       <parameter name="localizable" value="true"/>
  +      </map:generator>
  +      <map:generator name="exception"
  +                  src="org.apache.cocoon.generation.ParseExceptionGenerator"/>
  +                  
       </map:generators>
       <map:serializers default="html"/>
       <map:matchers default="wildcard"/>
   
       <map:transformers default="xslt">
  -      <map:transformer name="lexer" src="org.apache.cocoon.transformation.LexicalTransformer"
logger="sitemap.transformer.lexer"/>
  -      <map:transformer name="parser" src="org.apache.cocoon.transformation.ParserTransformer"
logger="sitemap.transformer.parser">
  -        <parameter name="flatten" value="true"/>
  -        <parameter name="ignoring" value="true"/>
  -      </map:transformer>
  +	   <map:transformer name="pattern" 
  +	                    src="org.apache.cocoon.transformation.PatternTransformer" 
  +	                    logger="sitemap.transformer.pattern">
  +	    <parameter name="groups" value="true"/>
  +	   </map:transformer>
  +	   <map:transformer name="lexer" 
  +	                    src="org.apache.cocoon.transformation.LexicalTransformer" 
  +	                    logger="sitemap.transformer.lexer">
  +	    <parameter name="localizable" value="true"/>
  +	   </map:transformer>
  +	   <map:transformer name="parser" 
  +	                    src="org.apache.cocoon.transformation.ParserTransformer" 
  +	                    logger="sitemap.transformer.parser">
  +	    <parameter name="flatten" value="true"/>
  +	    <parameter name="recovery" value="true"/>
  +	    <parameter name="localizable" value="true"/>
  +	   </map:transformer>
  +	
  +	   <map:transformer name="extparser"
  +	                    src="org.apache.cocoon.transformation.ExtendedParserTransformer"
  +	                    logger="sitemap.transformer.extendedparser">
  +	   </map:transformer>
       </map:transformers>
   
  -
  -
       <map:actions>
         <map:action logger="sitemap.action.sourcetype" name="sourcetype" src="org.apache.cocoon.acting.sourcetype.SourceTypeAction">
           <sourcetype name="document-v10">
  @@ -89,7 +110,12 @@
         </map:action>
       </map:actions>
       <map:selectors default="parameter">
  -      <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector"
/>
  +	  <map:selector logger="sitemap.selector.parameter" name="parameter" src="org.apache.cocoon.selection.ParameterSelector"
/>
  +   <map:selector logger="sitemap.selector.exception" name="exception"
  +                 src="org.apache.cocoon.selection.ExceptionSelector">
  +     <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
  +     <exception class="java.lang.Throwable" unroll="true"/>
  +   </map:selector>
       </map:selectors>
     </map:components>
   
  @@ -197,9 +223,15 @@
             <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="cocoon:/wiki.xlex"/>
                 <map:transform type="parser"  src="cocoon:/wiki.xgrm"/>
  -              <map:transform src="{forrest:home}/context/resources/chaperon/stylesheets/wiki2xdoc.xsl">
  +<!--
  +    <map:transform                src="{forrest:home}/context/resources/chaperon/stylesheets/error4wiki.xsl"/>
  +    <map:transform type="lexer"   src="{forrest:home}/context/resources/chaperon/grammars/error.xlex"/>
  +    <map:transform                src="{forrest:home}/context/resources/chaperon/stylesheets/error2page.xsl"/>
  +-->
  +                <map:transform type="xsltc" src="{forrest:home}/context/resources/chaperon/stylesheets/wiki2xdoc.xsl">
                   <map:parameter name="name" value="{2}" />
                 </map:transform>
                 <map:serialize type="xml-document"/>
  @@ -241,8 +273,9 @@
           </map:select>
   
         </map:match>
  +      
     </map:pipeline>
  -  
  +
     <map:pipeline type="caching" internal-only="true">
   
         <map:match pattern="*.xlex">
  @@ -251,14 +284,14 @@
               <map:read src="resources/chaperon/grammars/{1}.xlex"/>
             </map:when>
             <map:otherwise>
  -        <map:generate  type="text2xml"   src="resources/chaperon/grammars/{1}.grm"/>
  -        <map:transform type="lexer"  src="resources/chaperon/grammars/grm.xlex"/>
  -        <map:transform type="parser" src="resources/chaperon/grammars/grm.xgrm"/>
  -        <map:transform               src="resources/chaperon/stylesheets/text4regex.xsl"/>
  -        <map:transform type="lexer"  src="resources/chaperon/grammars/regex.xlex"/>
  -        <map:transform type="parser" src="resources/chaperon/grammars/regex.xgrm"/>
  -        <map:transform               src="resources/chaperon/stylesheets/grm2xlex.xsl"/>
  -        <map:serialize type="xml"/>
  +    <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>
  @@ -269,19 +302,32 @@
               <map:read src="resources/chaperon/grammars/{1}.xgrm"/>
             </map:when>
             <map:otherwise>
  -        <map:generate  type="text2xml"   src="resources/chaperon/grammars/{1}.grm"/>
  -        <map:transform type="lexer"  src="resources/chaperon/grammars/grm.xlex"/>
  -        <map:transform type="parser" src="resources/chaperon/grammars/grm.xgrm"/>
  -        <map:transform               src="resources/chaperon/stylesheets/text4regex.xsl"/>
  -        <map:transform type="lexer"  src="resources/chaperon/grammars/regex.xlex"/>
  -        <map:transform type="parser" src="resources/chaperon/grammars/regex.xgrm"/>
  -        <map:transform               src="resources/chaperon/stylesheets/grm2xgrm.xsl"/>
  -        <map:serialize type="xml"/>
  +    <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:match pattern="*.xegrm">
  +        <map:select type="exists">
  +          <map:when test="{forrest:home}/context/resources/chaperon/grammars/{1}.xegrm">
  +            <map:read src="{forrest:home}/context/resources/chaperon/grammars/{1}.xegrm"/>
  +          </map:when>
  +          <map:otherwise>
  +    <map:generate  type="text2xml"   src="{forrest:home}/context/resources/chaperon/grammars/{1}.egrm"/>
  +    <map:transform type="extparser" src="{forrest:home}/context/resources/chaperon/grammars/egrm.xegrm"/>
  +    <map:transform               src="{forrest:home}/context/resources/chaperon/stylesheets/egrm2xegrm.xsl"/>
  +    <map:serialize type="xml"/>
  +          </map:otherwise>
  +        </map:select>
  +      </map:match>
       </map:pipeline>
  -    
  +
     </map:pipelines>
   </map:sitemap>
  
  
  
  1.10      +38 -6     xml-forrest/src/core/context/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/sitemap.xmap,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sitemap.xmap	19 Jan 2004 18:08:24 -0000	1.9
  +++ sitemap.xmap	23 Jan 2004 09:55:26 -0000	1.10
  @@ -12,12 +12,16 @@
     <map:components>
       <map:generators default="file">
         <map:generator name="file"      src="org.apache.cocoon.generation.FileGenerator"
/>
  +      <map:generator name="exception"
  +                  src="org.apache.cocoon.generation.ParseExceptionGenerator"/>
         <!--
         <map:generator name="html"      src="org.apache.cocoon.generation.HTMLGenerator">
           <jtidy-config>jtidy.properties</jtidy-config>
         </map:generator>
         <map:generator name="directory" src="org.apache.cocoon.generation.DirectoryGenerator"
/>
         -->
  +      <map:generator name="notifier" src="org.apache.cocoon.sitemap.NotifyingGenerator"
/>
  +                  
       </map:generators>
   
       <map:transformers default="xslt">
  @@ -59,11 +63,34 @@
           <!--<transformer-factory>com.icl.saxon.TransformerFactoryImpl</transformer-factory>-->
           <!--<transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>-->
         </map:transformer>
  -
  +      
  +      <map:transformer name="xsltc" src="org.apache.cocoon.transformation.TraxTransformer"
logger="sitemap.transformer.xslt" pool-max="32" pool-min="8" pool-grow="2">
  +        <use-request-parameters>false</use-request-parameters>
  +        <use-browser-capabilities-db>false</use-browser-capabilities-db>
  +        <use-deli>false</use-deli>
  +        <transformer-factory>org.apache.xalan.xsltc.trax.TransformerFactoryImpl</transformer-factory>
  +      </map:transformer>
  +      
         <map:transformer name="xinclude" src="org.apache.cocoon.transformation.XIncludeTransformer"
logger="sitemap.transformer.xinclude" pool-grow="2" pool-max="16" pool-min="2" />
   
         <map:transformer name="cinclude" pool-grow="2" pool-max="16" pool-min="2" src="org.apache.cocoon.transformation.CIncludeTransformer"
logger="sitemap.transformer.cinclude"/>
  -
  +   <map:transformer name="pattern" 
  +                    src="org.apache.cocoon.transformation.PatternTransformer" 
  +                    logger="sitemap.transformer.pattern">
  +    <parameter name="groups" value="true"/>
  +   </map:transformer>
  +   <map:transformer name="lexer" 
  +                    src="org.apache.cocoon.transformation.LexicalTransformer" 
  +                    logger="sitemap.transformer.lexer">
  +    <parameter name="localizable" value="true"/>
  +   </map:transformer>
  +   <map:transformer name="parser" 
  +                    src="org.apache.cocoon.transformation.ParserTransformer" 
  +                    logger="sitemap.transformer.parser">
  +    <parameter name="flatten" value="true"/>
  +    <parameter name="recovery" value="true"/>
  +    <parameter name="localizable" value="true"/>
  +   </map:transformer>
       </map:transformers>
   
       <map:readers default="resource">
  @@ -108,6 +135,11 @@
   
       <map:selectors>
         <map:selector logger="sitemap.selector.exists" name="exists" src="org.apache.cocoon.selection.SourceExistsSelector"
/>
  +   <map:selector logger="sitemap.selector.exception" name="exception"
  +                 src="org.apache.cocoon.selection.ExceptionSelector">
  +     <exception name="syntax" class="net.sourceforge.chaperon.process.ParseException"/>
  +     <exception class="java.lang.Throwable" unroll="true"/>
  +   </map:selector>	 	
       </map:selectors>
   
       <map:pipes default="caching">
  @@ -427,7 +459,7 @@
         </map:match>
        <map:match pattern="**.ico">
           <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
  -      </map:match>     
  +      </map:match> 
       </map:pipeline>
   
   
  @@ -445,6 +477,6 @@
         </map:match>
       </map:pipeline>
   
  -
  -  </map:pipelines>
  +  
  +     </map:pipelines>
   </map:sitemap>
  
  
  

Mime
View raw message