You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2003/10/16 19:21:38 UTC

cvs commit: xml-forrest/src/resources/conf resources.xmap

nicolaken    2003/10/16 10:21:38

  Modified:    src/resources/conf resources.xmap
  Log:
  Make images in the fixed resources dir work again.
  
  Revision  Changes    Path
  1.7       +138 -126  xml-forrest/src/resources/conf/resources.xmap
  
  Index: resources.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/resources.xmap,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- resources.xmap	16 Oct 2003 15:16:09 -0000	1.6
  +++ resources.xmap	16 Oct 2003 17:21:37 -0000	1.7
  @@ -10,130 +10,142 @@
   
   $Revision$
   ==================================================== -->
  -
   <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
  -  <map:components>
  -    <map:generators default="file"/>
  -    <map:serializers default="html">
  -      <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  -        <parameter name="quality" type="float" value="1.0"/>
  -      </map:serializer>
  -      <map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer"/>
  -    </map:serializers>
  - 
  -    <map:transformers default="xslt"/>
  -    <map:readers default="resource"/>
  -    <map:matchers default="wildcard"/>
  -    <map:selectors default="browser"/>
  -  </map:components>
  -
  -  <map:resources>
  -    <map:resource name="skin-read">
  -      <map:read src="skins/{forrest:skin}/{path}" mime-type="{mime-type}" />
  -    </map:resource>
  -  </map:resources>
  -
  -  <map:pipelines>
  -
  -    <map:pipeline>
  -      <map:match pattern="skin/**.js">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="scripts/{1}.js" />
  -          <map:parameter name="mime-type" value="application/x-javascript" />
  -        </map:call>
  -      </map:match>
  -
  -      <map:match pattern="**/skin/**.js">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="scripts/{2}.js" />
  -          <map:parameter name="mime-type" value="application/x-javascript" />
  -        </map:call>
  -      </map:match>
  -
  -      <map:match pattern="**.js">
  -        <map:read src="resources/scripts/{1}.js" mime-type="application/x-javascript" />
  -      </map:match>
  -
  -      <map:match pattern="skin/**.css">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="css/{1}.css" />
  -          <map:parameter name="mime-type" value="text/css" />
  -        </map:call>
  -      </map:match>
  -
  -      <map:match pattern="**/skin/**.css">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="css/{2}.css" />
  -          <map:parameter name="mime-type" value="text/css" />
  -        </map:call>
  -      </map:match>
  -
  -      <map:match pattern="**.css">
  -        <map:read src="resources/css/{1}.css" mime-type="text/css" />
  -      </map:match>
  -
  -      <map:match pattern="skin/images/**.*">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="images/{1}.{2}" />
  -          <map:parameter name="mime-type" value="image/{2}" />
  -        </map:call>
  -      </map:match>
  -
  -      <!-- DS: handles images local to a contributor directory -->
  -      <map:match pattern="**my-images/**.*">
  -        <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
  -      </map:match>
  -
  -      <map:match pattern="**.png">
  -        <map:select type="exists">
  -          <map:when test="{project:content.xdocs}/{1}.svg">
  -            <map:generate src="{project:content.xdocs}/{1}.svg" />
  -	        <map:transform src="resources/stylesheets/project2text.xsl" />
  -            <map:serialize type="svg2png" />
  -          </map:when>
  -          <map:when test="resources/images/{1}.svg">
  -            <map:generate src="{project:resources.images}/{1}.svg" />
  -	        <map:transform src="resources/stylesheets/project2text.xsl" />
  -            <map:serialize type="svg2png" />
  -          </map:when>
  -          <map:when test="{project:content.xdocs}/{1}.png">
  -            <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
  -          </map:when>
  -          <map:otherwise>
  -            <map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
  -          </map:otherwise>
  -        </map:select>
  -      </map:match>
  -
  -      <map:match pattern="images/**.*">
  -        <map:select type="exists">
  -          <map:when test="{project:content.xdocs}/images/{1}.{2}">
  -            <map:read src="{project:content.xdocs}/images/{1}.{2}" mime-type="image/{2}" />
  -          </map:when>
  -          <map:otherwise>
  -            <map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
  -          </map:otherwise>
  -        </map:select>
  -      </map:match>
  -
  -      <map:match pattern="**/images/**.*">
  -        <map:select type="exists">
  -          <map:when test="{project:content.xdocs}/{1}/images/{2}.{3}">
  -            <map:read src="{project:content.xdocs}/{1}/images/{2}.{3}" mime-type="image/{3}" />
  -          </map:when>
  -          <map:otherwise>
  -           <map:read src="{project:resources.images}/{2}.{3}" mime-type="image/{3}" />
  -          </map:otherwise>
  -        </map:select>
  -      </map:match>
  -
  -      <map:match pattern="**favicon.ico">
  -        <map:call resource="skin-read">
  -          <map:parameter name="path" value="images/favicon.ico" />
  -          <map:parameter name="mime-type" value="image/x-icon" />
  -        </map:call>
  -      </map:match>
  -
  -    </map:pipeline>
  -  </map:pipelines>
  +   <map:components>
  +      <map:generators default="file" />
  +      <map:serializers default="html">
  +         <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
  +            <parameter name="quality" type="float" value="1.0" />
  +         </map:serializer>
  +         <map:serializer mime-type="image/png" name="svg2png" src="org.apache.cocoon.serialization.SVGSerializer" />
  +      </map:serializers>
  +      <map:transformers default="xslt" />
  +      <map:readers default="resource" />
  +      <map:matchers default="wildcard" />
  +      <map:selectors default="browser" />
  +   </map:components>
  +
  +   <map:resources>
  +      <map:resource name="skin-read">
  +         <map:read src="skins/{forrest:skin}/{path}" mime-type="{mime-type}" />
  +      </map:resource>
  +   </map:resources>
  +
  +   <map:pipelines>
  +      <map:pipeline>
  +         <map:match pattern="skin/**.js">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="scripts/{1}.js" />
  +               <map:parameter name="mime-type" value="application/x-javascript" />
  +            </map:call>
  +         </map:match>
  +
  +         <map:match pattern="**/skin/**.js">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="scripts/{2}.js" />
  +               <map:parameter name="mime-type" value="application/x-javascript" />
  +            </map:call>
  +         </map:match>
  +
  +         <map:match pattern="**.js">
  +            <map:read src="resources/scripts/{1}.js" mime-type="application/x-javascript" />
  +         </map:match>
  +
  +         <map:match pattern="skin/**.css">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="css/{1}.css" />
  +               <map:parameter name="mime-type" value="text/css" />
  +            </map:call>
  +         </map:match>
  +
  +         <map:match pattern="**/skin/**.css">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="css/{2}.css" />
  +               <map:parameter name="mime-type" value="text/css" />
  +            </map:call>
  +         </map:match>
  +
  +         <map:match pattern="**.css">
  +            <map:read src="resources/css/{1}.css" mime-type="text/css" />
  +         </map:match>
  +
  +         <map:match pattern="skin/images/**.*">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="images/{1}.{2}" />
  +               <map:parameter name="mime-type" value="image/{2}" />
  +            </map:call>
  +         </map:match>
  +
  +<!-- DS: handles images local to a contributor directory -->
  +         <map:match pattern="**my-images/**.*">
  +            <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
  +         </map:match>
  +
  +         <map:match pattern="images/**.*">
  +            <map:select type="exists">
  +               <map:when test="{project:content.xdocs}/images/{1}.{2}">
  +                  <map:read src="{project:content.xdocs}/images/{1}.{2}" mime-type="image/{2}" />
  +               </map:when>
  +               <map:when test="resources/images/{1}.{2}">
  +                  <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" />
  +               </map:when>
  +               <map:otherwise>
  +                  <map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
  +               </map:otherwise>
  +            </map:select>
  +         </map:match>
  +
  +         <map:match pattern="**/images/**.*">
  +            <map:select type="exists">
  +               <map:when test="{project:content.xdocs}/{1}/images/{2}.{3}">
  +                  <map:read src="{project:content.xdocs}/{1}/images/{2}.{3}" mime-type="image/{3}" />
  +               </map:when>
  +               <map:when test="resources/images/{2}.{3}">
  +                  <map:read src="resources/images/{2}.{3}" mime-type="image/{3}" />
  +               </map:when>
  +               <map:otherwise>
  +                  <map:read src="{project:resources.images}/{2}.{3}" mime-type="image/{3}" />
  +               </map:otherwise>
  +            </map:select>
  +         </map:match>
  +
  +         <map:match pattern="**.png">
  +            <map:select type="exists">
  +               <map:when test="{project:content.xdocs}/{1}.svg">
  +                  <map:generate src="{project:content.xdocs}/{1}.svg" />
  +                  <map:transform src="resources/stylesheets/project2text.xsl" />
  +                  <map:serialize type="svg2png" />
  +               </map:when>
  +               <map:when test="{project:resources.images}/{1}.svg">
  +                  <map:generate src="{project:resources.images}/{1}.svg" />
  +                  <map:transform src="resources/stylesheets/project2text.xsl" />
  +                  <map:serialize type="svg2png" />
  +               </map:when>
  +               <map:when test="resources/images/{1}.svg">
  +                  <map:generate src="resources/images/{1}.svg" />
  +                  <map:transform src="resources/stylesheets/project2text.xsl" />
  +                  <map:serialize type="svg2png" />
  +               </map:when>
  +               <map:when test="{project:content.xdocs}/{1}.png">
  +                  <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
  +               </map:when>
  +               <map:when test="resources/images/{1}.png">
  +                  <map:read src="resources/images/{1}.png" mime-type="image/png" />
  +               </map:when>
  +               <map:otherwise>
  +                  <map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
  +               </map:otherwise>
  +            </map:select>
  +         </map:match>
  +
  +         <map:match pattern="**favicon.ico">
  +            <map:call resource="skin-read">
  +               <map:parameter name="path" value="images/favicon.ico" />
  +
  +               <map:parameter name="mime-type" value="image/x-icon" />
  +            </map:call>
  +         </map:match>
  +      </map:pipeline>
  +   </map:pipelines>
   </map:sitemap>
  +