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 cocoon.xconf sitemap.xmap
Date Sun, 05 Jan 2003 06:19:36 GMT
jefft       2003/01/04 22:19:36

  Modified:    src/resources/conf Tag: LINKMAP_BRANCH cocoon.xconf
                        sitemap.xmap
  Log:
  synch with head
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.8.2.2   +41 -21    xml-forrest/src/resources/conf/cocoon.xconf
  
  Index: cocoon.xconf
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/cocoon.xconf,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- cocoon.xconf	26 Dec 2002 14:18:28 -0000	1.8.2.1
  +++ cocoon.xconf	5 Jan 2003 06:19:36 -0000	1.8.2.2
  @@ -451,21 +451,20 @@
         <component-instance name="date"           	class="org.apache.cocoon.components.modules.input.DateInputModule"/>
         <component-instance name="nullinput"      	class="org.apache.cocoon.components.modules.input.NullInputModule"/>
         <component-instance name="xmlmeta"        	class="org.apache.cocoon.components.modules.input.XMLMetaModule"/>
  -      <component-instance name="mapmeta"    	    class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
  -      <component-instance name="defaults"      	class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  -		    <values>
  -         <skin>@skin@</skin>
  -         <base-url>/forrest</base-url>
  -		   </values>
  -     </component-instance>
  -	  
  -      <component-instance logger="core.modules.input" name="forrest"   	class="org.apache.cocoon.components.modules.input.ChainMetaModule">
  -	     <input-module name="request-param"/>
  -	     <input-module name="request-attr"/>
  -	     <input-module name="session-attr"/>
  -	     <input-module name="defaults"/>
  -	  </component-instance>
  +      <component-instance name="mapmeta"          class="org.apache.cocoon.components.modules.input.MapMetaModule"/>
  +      <component-instance name="defaults"       class="org.apache.cocoon.components.modules.input.DefaultsMetaModule">
  +        <values>
  +          <skin>@skin@</skin>
  +          <base-url>/forrest</base-url>
  +        </values>
  +      </component-instance>
   
  +      <component-instance logger="core.modules.input" name="forrest"    class="org.apache.cocoon.components.modules.input.ChainMetaModule">
  +        <input-module name="request-param"/>
  +        <input-module name="request-attr"/>
  +        <input-module name="session-attr"/>
  +        <input-module name="defaults"/>
  +      </component-instance>
   
         <!-- For the site: scheme -->
         <component-instance
  @@ -475,14 +474,35 @@
           <!-- Shouldn't this be the default? -->
           <reloadable>true</reloadable>
         </component-instance>
  -       <component-instance
  -         class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  -         logger="core.modules.mapper" name="site">
  -         <input-module name="linkmap"/>
  -         <prefix>/site/</prefix>
  -         <suffix>/@href</suffix>
  -       </component-instance>
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="site">
  +        <input-module name="linkmap"/>
  +        <prefix>/site/</prefix>
  +        <suffix>/@href</suffix>
  +      </component-instance>
   
  +      <!--
  +      For backwards-compat: interpret {context:context} as
  +      {request:contextPath}
  +      -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="context">
  +        <input-module name="request"/>
  +        <suffix>Path</suffix>
  +      </component-instance>
  +
  +      <!--
  +      For backwards-compat: interpret {context:context} as
  +      {request:contextPath}
  +      -->
  +      <component-instance
  +        class="org.apache.cocoon.components.modules.input.SimpleMappingMetaModule"
  +        logger="core.modules.mapper" name="context">
  +        <input-module name="request"/>
  +        <suffix>Path</suffix>
  +      </component-instance>
   
      </input-modules>
   
  
  
  
  1.45.2.2  +47 -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.45.2.1
  retrieving revision 1.45.2.2
  diff -u -r1.45.2.1 -r1.45.2.2
  --- sitemap.xmap	26 Dec 2002 14:18:28 -0000	1.45.2.1
  +++ sitemap.xmap	5 Jan 2003 06:19:36 -0000	1.45.2.2
  @@ -441,9 +441,54 @@
       <!-- if the file is present verbatim as content, give that to the user... -->
       <map:act type="resource-exists">
        <map:parameter name="url" value="content/{1}"/>
  -     <map:read src="content/{../1}"/>
  +
  +     <map:match pattern="**.html">
  +       <!--
  +        Use this instead if you don't want JTidy to clean up your HTML
  +        <map:read src="content/{0}" mime-type="text/html"/>
  +        -->
  +        <map:generate type="html" src="content/{1}.html"/>      
  +        <map:serialize type="html"/>
  +      </map:match>
  +
  +      <map:match pattern="**.xml">
  +        <map:generate type="file" src="content/{1}.xml"/>      
  +        <map:serialize type="xml"/>
  +      </map:match>
  +
  +      <map:match pattern="skin/**.css">
  +        <map:read src="content/{1}.css" mime-type="text/css"/>
  +      </map:match>
  +      
  +      <map:match pattern="**.js">
  +        <map:read src="content/{1}.js" mime-type="application/javascript"/>
  +      </map:match>
  +      
  +      <map:match pattern="**.gif">
  +        <map:read src="content/{1}.gif" mime-type="image/gif"/>
  +      </map:match>
  +
  +      <map:match pattern="**.png">
  +        <map:read src="content/{1}.png" mime-type="image/png"/>
  +      </map:match>
  +      
  +      <map:match pattern="**.jpg">
  +        <map:read src="content/{1}.jpg" mime-type="image/jpeg"/>
  +      </map:match>
  +
  +      <map:match pattern="**.jpeg">
  +        <map:read src="content/{1}.jpeg" mime-type="image/jpeg"/>
  +      </map:match> 
  +           
  +      <map:match pattern="**.pdf">
  +        <map:read src="content/{1}.pdf" mime-type="application/pdf"/>
  +      </map:match>
  +      
  +      <map:match pattern="**">
  +        <map:read src="content/{1}" mime-type="application/unknown"/>
  +      </map:match>
       </map:act>
  -   
  +      
      <!-- ... otherwise try to generate it using these rules.  -->
     
     <map:match pattern="apachestats">
  
  
  

Mime
View raw message