forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf faq.xmap forrest.xmap sitemap.xmap
Date Fri, 21 Mar 2003 11:22:18 GMT
jefft       2003/03/21 03:22:17

  Modified:    src/resources/conf faq.xmap forrest.xmap sitemap.xmap
  Log:
  Start complicating a nice clean sitemap. As someone said, "for every problem
  there is a solution that is simple, neat, and wrong."
   - Add direct {format}2html matchers for *.ehtml and faqs.
   - Switch back on mini-TOCs
  
  Revision  Changes    Path
  1.3       +40 -0     xml-forrest/src/resources/conf/faq.xmap
  
  Index: faq.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/faq.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- faq.xmap	17 Mar 2003 14:27:57 -0000	1.2
  +++ faq.xmap	21 Mar 2003 11:22:16 -0000	1.3
  @@ -11,10 +11,50 @@
     </map:components>
   
     <map:resources>
  +    <map:resource name="skinit">
  +      <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl">
  +        <map:parameter name="notoc" value="{notoc}"/>
  +        <!-- For backwards-compat with 0.2 - 0.4 skins -->
  +        <map:parameter name="isfaq" value="{notoc}"/>
  +        <map:parameter name="nopdf" value="{nopdf}"/>
  +        <map:parameter name="path" value="{path}"/>
  +        <!-- Can set an alternative project skinconfig here 
  +        <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  +        -->
  +      </map:transform>
  +
  +      <map:serialize/>
  +    </map:resource>
  +
     </map:resources>
   
     <map:pipelines>
  +
       <map:pipeline>
  +
  +    <!-- ============================================================ -->
  +    <!-- INTERMEDIATE FORMATS                                         -->
  +    <!-- ============================================================ -->
  +
  +    <!--Unfortunately we need to override all the document2html stuff too,
  +    since notoc must be set to true. -->
  +      <map:match pattern="**body-faq.xml">
  +        <map:generate src="cocoon:/{1}faq.xml"/>
  +        <map:transform type="xinclude"/>
  +        <map:transform type="linkrewriter" src="cocoon:/{1}linkmap">
  +          <map:parameter name="schemes" value="site ext"/>
  +        </map:transform>
  +        <map:call resource="skinit">
  +          <map:parameter name="type" value="document2html"/>
  +          <map:parameter name="path" value="/{1}faq.xml"/>
  +          <map:parameter name="notoc" value="true"/>
  +        </map:call>
  +      </map:match>
  +
  +
  +      <!-- ============================================================ -->
  +      <!-- SOURCE FORMATS                                               -->
  +      <!-- ============================================================ -->
   
         <map:match pattern="**/faq.xml">
           <map:generate type="file" src="content/xdocs/{1}/faq.xml" />
  
  
  
  1.3       +22 -11    xml-forrest/src/resources/conf/forrest.xmap
  
  Index: forrest.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/forrest.xmap,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.xmap	17 Mar 2003 14:27:57 -0000	1.2
  +++ forrest.xmap	21 Mar 2003 11:22:17 -0000	1.3
  @@ -62,22 +62,19 @@
     <map:pipelines>
       <map:pipeline>
   
  -      <map:match pattern="**.xml">
  +      <!-- ============================================================ -->
  +      <!-- INTERMEDIATE FORMATS                                         -->
  +      <!-- ============================================================ -->
   
  +      <map:match pattern="**body-*.xml">
           <map:act type="resource-exists">
  -          <map:parameter name="url" value="content/xdocs/{1}.ihtml" />
  -          <map:generate src="content/xdocs/{../1}.ihtml" type="html" />
  -          <map:transform src="resources/stylesheets/html2document.xsl" />
  -          <map:transform type="idgen" />
  -          <map:serialize type="xml"/>
  -        </map:act>
  -
  -        <map:act type="resource-exists">
  -          <map:parameter name="url" value="content/xdocs/{1}.ehtml" />
  -          <map:generate src="content/xdocs/{../1}.ehtml" />
  +          <map:parameter name="url" value="content/xdocs/{1}{2}.ehtml" />
  +          <map:generate src="content/xdocs/{../1}{../2}.ehtml" />
             <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
             <map:serialize type="xml" />
           </map:act>
  +      </map:match>
  +
   
           <!--
           <map:act type="resource-exists">
  @@ -93,6 +90,20 @@
             <map:serialize type="xml"/>
           </map:act>
           -->
  +
  +        <!-- ============================================================ -->
  +        <!-- SOURCE FORMATS                                               -->
  +        <!-- ============================================================ -->
  +
  +      <map:match pattern="**.xml">
  +
  +        <map:act type="resource-exists">
  +          <map:parameter name="url" value="content/xdocs/{1}.ihtml" />
  +          <map:generate src="content/xdocs/{../1}.ihtml" type="html" />
  +          <map:transform src="resources/stylesheets/html2document.xsl" />
  +          <map:transform type="idgen" />
  +          <map:serialize type="xml"/>
  +        </map:act>
   
           <map:generate src="content/xdocs/{1}.xml" />
           <map:call resource="transform-to-document">
  
  
  
  1.76      +18 -2     xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- sitemap.xmap	17 Mar 2003 15:19:51 -0000	1.75
  +++ sitemap.xmap	21 Mar 2003 11:22:17 -0000	1.76
  @@ -179,6 +179,23 @@
       <!-- ============================================================ -->
       <map:pipeline internal-only="false">
   
  +      <!-- External matches -->
  +      <!-- (HTML rendered directly from special formats) -->
  +      <map:match pattern="**body-faq**">
  +        <map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
  +      </map:match>
  +
  +      <map:match pattern="**body-*.xml">
  +        <map:act type="resource-exists">
  +          <map:parameter name="url" value="content/xdocs/{1}{2}.ehtml" />
  +          <map:generate src="content/xdocs/{../1}{../2}.ehtml" />
  +          <map:transform src="resources/stylesheets/html2htmlbody.xsl" />
  +          <map:serialize type="xml" />
  +        </map:act>
  +      </map:match>
  +
  +      <!-- Default matches -->
  +      <!-- (HTML rendered from doc-v11 intermediate format -->
         <map:match pattern="**body-*.xml">
           <map:generate src="cocoon:/{1}{2}.xml"/>
           <map:transform type="xinclude"/>
  @@ -188,7 +205,7 @@
           <map:call resource="skinit">
             <map:parameter name="type" value="document2html"/>
             <map:parameter name="path" value="/{1}{2}.xml"/>
  -          <map:parameter name="notoc" value="true"/>
  +          <map:parameter name="notoc" value="false"/>
           </map:call>
         </map:match>
   
  @@ -200,7 +217,6 @@
           <map:call resource="skinit">
             <map:parameter name="type" value="book2menu"/>
             <map:parameter name="path" value="/{1}{2}.xml"/>
  -          <map:parameter name="notoc" value="true"/>
           </map:call>
         </map:match>
   
  
  
  

Mime
View raw message