forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kpiroum...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf cocoon.xconf sitemap.xmap
Date Mon, 16 Sep 2002 23:34:25 GMT
kpiroumian    2002/09/16 16:34:25

  Modified:    src/resources/conf cocoon.xconf sitemap.xmap
  Log:
  Change sitemap to use Cocoon input module for skin selection instead of Ant filter tokens.
  Replace RequestParamAction by RequestContextPathModule input module.
  (WARN: Update to the latest Cocoon 2.1 - 17 Sep 2002 - is requried)
  
  Revision  Changes    Path
  1.4       +3 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- cocoon.xconf	25 Jul 2002 20:30:19 -0000	1.3
  +++ cocoon.xconf	16 Sep 2002 23:34:25 -0000	1.4
  @@ -440,6 +440,7 @@
       <component-instance class="org.apache.cocoon.components.modules.input.RequestParameterModule"
name="request"/>
       <component-instance class="org.apache.cocoon.components.modules.input.RequestAttributeModule"
name="attribute"/>
       <component-instance class="org.apache.cocoon.components.modules.input.RequestURIModule"
name="URI"/>
  +    <component-instance class="org.apache.cocoon.components.modules.input.RequestContextPathModule"
name="context"/>
       <component-instance class="org.apache.cocoon.components.modules.input.HeaderAttributeModule"
name="header"/>
       <component-instance class="org.apache.cocoon.components.modules.input.SessionAttributeModule"
name="session"/>
       <component-instance class="org.apache.cocoon.components.modules.input.StringConstantModule"
name="constant"/>
  @@ -451,8 +452,8 @@
         <component-instance class="org.apache.cocoon.components.modules.input.DefaultsMetaModule"
name="defaults">
        <input-module name="request"/>
        <values>
  -      <skin>defaultSkin</skin>
  -      <base-url>http://localhost:8080/cocoon</base-url>
  +      <skin>forrest-site</skin>
  +      <base-url>/forrest</base-url>
        </values>
       </component-instance>
      </input-modules>
  
  
  
  1.17      +9 -11     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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sitemap.xmap	10 Sep 2002 08:04:50 -0000	1.16
  +++ sitemap.xmap	16 Sep 2002 23:34:25 -0000	1.17
  @@ -77,9 +77,9 @@
   
     </map:selectors>
   -->
  -  <map:actions>
  +  <!--map:actions>
       <map:action logger="sitemap.action.request" name="request" src="org.apache.cocoon.acting.RequestParamAction"/>
  -  </map:actions>
  +  </map:actions-->
   
   
       <!--
  @@ -111,7 +111,7 @@
   
    <map:resources>
     <map:resource name="skinit">
  -   <map:transform src="skins/@skin@/xslt/html/{type}.xsl">
  +   <map:transform src="skins/{defaults:skin}/xslt/html/{type}.xsl">
        <map:parameter name="isfaq" value="{isfaq}"/>
        <map:parameter name="resource" value="{resource}"/>
      </map:transform>
  @@ -127,7 +127,7 @@
     </map:resource>
   
     <map:resource name="skin-read">
  -    <map:read src="skins/@skin@/{path}" mime-type="{mime-type}"/>
  +    <map:read src="skins/{defaults:skin}/{path}" mime-type="{mime-type}"/>
     </map:resource>
   
    </map:resources>
  @@ -309,7 +309,7 @@
        </map:generate>
        <map:transform src="library/xslt/dtdx2flat.xsl"/>
        <map:transform src="library/xslt/flat2document.xsl"/>
  -     <map:transform src="skins/@skin@/xslt/fo/document2fo.xsl"/>
  +     <map:transform src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
       <map:serialize type="fo2pdf"/>
      </map:match>
   
  @@ -319,28 +319,26 @@
        </map:generate>
        <map:transform src="library/xslt/dtdx2flat.xsl"/>
        <map:transform src="library/xslt/flat2document.xsl"/>
  -    <map:transform src="skins/@skin@/xslt/fo/document2fo.xsl"/>
  +    <map:transform src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
       <map:serialize type="fo2pdf"/>
      </map:match>
   
      <map:match pattern="*.pdf">
       <map:generate src="content/xdocs/{1}.xml"/>
  -    <map:transform src="skins/@skin@/xslt/fo/document2fo.xsl"/>
  +    <map:transform src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
       <map:serialize type="fo2pdf"/>
      </map:match>
   
      <map:match pattern="**/*.pdf">
       <map:generate src="{1}/{2}.xml"/>
  -    <map:transform src="skins/@skin@/xslt/fo/document2fo.xsl"/>
  +    <map:transform src="skins/{defaults:skin}/xslt/fo/document2fo.xsl"/>
       <map:serialize type="fo2pdf"/>
      </map:match>
   
      <!-- ================  Directory redirects   =========================== -->
      <!-- Redirect any request for a directory to the directory's index.html file  -->
      <map:match pattern="**/">
  -     <map:act type="request">
  -       <map:redirect-to uri="{context}/{../1}/index.html"/>
  -     </map:act>
  +     <map:redirect-to uri="{request:context}/{1}/index.html"/>
      </map:match>
   
      <!-- ================  Libre   =========================== -->
  
  
  

Mime
View raw message