forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r373357 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher: dataModel.xmap internal.xmap locationmap.xml resources.xmap themer.xmap themes.xmap
Date Sun, 29 Jan 2006 21:08:15 GMT
Author: thorsten
Date: Sun Jan 29 13:07:59 2006
New Revision: 373357

URL: http://svn.apache.org/viewcvs?rev=373357&view=rev
Log:
Formating changes

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap Sun Jan 29 13:07:59 2006
@@ -23,7 +23,6 @@
     <map:serializers default="xml" />
   </map:components>
   <map:pipelines>
-
     <!--
       businessHelper
       This is the model producing factory.
@@ -34,8 +33,7 @@
         <map:generate src="cocoon://{1}.xml" />
         <map:transform type="idgen" />
         <map:transform type="xinclude" />
-        <map:transform type="linkrewriter"
-          src="cocoon://linkmap-{1}" />
+        <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
         <map:transform src="{lm:transform.html.broken-links}"/>
         <map:serialize />
       </map:match>
@@ -61,8 +59,7 @@
     <map:pipeline>
       <map:match pattern="**.abstract.xml">
         <map:generate src="cocoon://{1}.xml" />
-        <map:transform
-          src="{lm:dataModel-xml-document-to-abstract.xsl}" />
+        <map:transform src="{lm:dataModel-xml-document-to-abstract.xsl}" />
         <map:serialize />
       </map:match>
     </map:pipeline>
@@ -93,8 +90,7 @@
     <map:pipeline>
       <map:match pattern="**.menu.xml">
         <map:generate src="cocoon://{1}.book.xml" />
-        <map:transform type="linkrewriter"
-          src="cocoon://linkmap-{1}" />
+        <map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
         <map:transform src="{lm:transform.html.broken-links}"/>
         <map:transform src="{lm:dataModel-html-book-to-menu.xsl}">
           <map:parameter name="path" value="{1}.html" />
@@ -104,7 +100,7 @@
     </map:pipeline>
     <map:pipeline>
       <!-- navigation for the current request PART tab-->
-       <map:match pattern="**.tab.xml">
+      <map:match pattern="**.tab.xml">
         <map:select type="exists">
           <map:when test="{project:content.xdocs}tabs.xml">
             <map:generate src="{project:content.xdocs}tabs.xml"/>
@@ -130,45 +126,45 @@
         </map:select>
         <map:transform type="linkrewriter" src="cocoon://linkmap-{1}"/>
         <map:transform src="{lm:dataModel-html-tab-to-menu.xsl}">
-        <!--<map:transform src="{lm:dataModel-html-tab2menu.xsl}">-->
+          <!--<map:transform src="{lm:dataModel-html-tab2menu.xsl}">-->
           <map:parameter name="path" value="{1}{2}.html"/>
         </map:transform>
         <map:serialize />
       </map:match>
     </map:pipeline>
-      <map:pipeline>
+    <map:pipeline>
       <map:match pattern="**.book.xml">
         <map:match pattern="**/*.book.xml">
           <map:select type="exists">
-          <map:when test="{project:content.xdocs}{1}book.xml">
-            <!-- If a hand-created book.xml exists, use it -->
-            <map:parameter name="url" 
-              value="{project:content.xdocs}{1}book.xml" />
-            <map:generate src="{project:content.xdocs}{1}book.xml" />
-          </map:when>
-          <map:otherwise>
-            <!-- If no book.xml, generate it from the linkmap. -->
-            <map:generate src="cocoon:/menulinks-{1}{2}" />
-            <!-- The above generates the subset of the linkmap relevant to our directory. -->
-            <map:transform src="{forrest:stylesheets}/site-to-book.xsl" />
-          </map:otherwise>
-        </map:select>
+            <map:when test="{project:content.xdocs}{1}book.xml">
+              <!-- If a hand-created book.xml exists, use it -->
+              <map:parameter name="url" 
+                value="{project:content.xdocs}{1}book.xml" />
+              <map:generate src="{project:content.xdocs}{1}book.xml" />
+            </map:when>
+            <map:otherwise>
+              <!-- If no book.xml, generate it from the linkmap. -->
+              <map:generate src="cocoon:/menulinks-{1}{2}" />
+              <!-- The above generates the subset of the linkmap relevant to our directory. -->
+              <map:transform src="{forrest:stylesheets}/site-to-book.xsl" />
+            </map:otherwise>
+          </map:select>
         </map:match>
         <map:match pattern="*.book.xml">
           <map:select type="exists">
-          <map:when test="{project:content.xdocs}/book.xml">
-            <!-- If a hand-created book.xml exists, use it -->
-            <map:parameter name="url" 
-              value="{project:content.xdocs}/book.xml" />
-            <map:generate src="{project:content.xdocs}/book.xml" />
-          </map:when>
-          <map:otherwise>
-            <!-- If no book.xml, generate it from the linkmap. -->
-            <map:generate src="cocoon:/menulinks-{1}" />
-            <!-- The above generates the subset of the linkmap relevant to our directory. -->
-            <map:transform src="{forrest:stylesheets}/site-to-book.xsl" />
-          </map:otherwise>
-        </map:select>
+            <map:when test="{project:content.xdocs}/book.xml">
+              <!-- If a hand-created book.xml exists, use it -->
+              <map:parameter name="url" 
+                value="{project:content.xdocs}/book.xml" />
+              <map:generate src="{project:content.xdocs}/book.xml" />
+            </map:when>
+            <map:otherwise>
+              <!-- If no book.xml, generate it from the linkmap. -->
+              <map:generate src="cocoon:/menulinks-{1}" />
+              <!-- The above generates the subset of the linkmap relevant to our directory. -->
+              <map:transform src="{forrest:stylesheets}/site-to-book.xsl" />
+            </map:otherwise>
+          </map:select>
         </map:match>
         <map:select type="config">
           <map:parameter name="value" value="{defaults:i18n}"/>
@@ -196,7 +192,8 @@
             <map:transform 
               src="{forrest:stylesheets}/site-to-site-normalizetabs.xsl" />
             <map:transform src="{forrest:stylesheets}/normalizehrefs.xsl"/>
-            <map:transform src="{forrest:stylesheets}/site-to-site-selectnode.xsl">
+            <map:transform 
+              src="{forrest:stylesheets}/site-to-site-selectnode.xsl">
               <map:parameter name="path" value="{1}{2}.html"/>
             </map:transform>
           </map:when>
@@ -213,4 +210,4 @@
       </map:match>
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
+</map:sitemap>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Sun Jan 29 13:07:59 2006
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- forrest:structurer
   ***********************
   The structuring of the assembled page where all content is in place
@@ -30,64 +29,62 @@
   structure the content from multiple input sources. Far more actually
   because it provides as well logical conditions for presentation formatting logic
 -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:pipes default="caching">
-      <map:pipe name="caching"
-        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
-      <map:pipe name="noncaching"
-        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
+      <map:pipe name="caching" 
+        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" 
+        />
+      <map:pipe name="noncaching" 
+        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" 
+        />
     </map:pipes>
     <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists"
+      <map:selector logger="sitemap.selector.exists" name="exists" 
         src="org.apache.forrest.sourceexists.SourceExistsSelector" />
       <map:selector logger="sitemap.selector.config" name="config" 
         src="org.apache.cocoon.selection.SimpleSelector" />
     </map:selectors>
     <map:generators default="file">
-      <map:generator name="traverse"
-        src="org.apache.cocoon.generation.TraversableGenerator"
-        logger="sitemap.generator.traverse" label="content"
-        pool-max="16" />
-<map:generator label="content" logger="sitemap.generator.xpathdirectory" name="xpathdirectory" src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
-      <map:generator name="directory"
+      <map:generator name="traverse" 
+        src="org.apache.cocoon.generation.TraversableGenerator" 
+        logger="sitemap.generator.traverse" label="content" pool-max="16" />
+      <map:generator label="content" logger="sitemap.generator.xpathdirectory" 
+        name="xpathdirectory" 
+        src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
+      <map:generator name="directory" 
         src="org.apache.cocoon.generation.DirectoryGenerator" />
-      <map:generator name="jx" logger="sitemap.generator.jx"
-        src="org.apache.cocoon.generation.JXTemplateGenerator"
+      <map:generator name="jx" logger="sitemap.generator.jx" 
+        src="org.apache.cocoon.generation.JXTemplateGenerator" 
         label="content,data" pool-max="16" />
     </map:generators>
     <map:transformers default="xslt">
-      <map:transformer logger="sitemap.transformer.jx" name="jx"
-        pool-max="16"
+      <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16" 
         src="org.apache.cocoon.transformation.JXTemplateTransformer" />
-      <map:transformer logger="sitemap.transformer.jpath" name="jpath"
+      <map:transformer logger="sitemap.transformer.jpath" name="jpath" 
         src="org.apache.cocoon.transformation.JPathTransformer" />
-      <map:transformer name="cinclude"
+      <map:transformer name="cinclude" 
         src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="xinclude"
+      <map:transformer name="xinclude" 
         src="org.apache.cocoon.transformation.XIncludeTransformer" />
-      <map:transformer name="dispatcher"
-        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" />
+      <map:transformer name="dispatcher" 
+        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" 
+        />
     </map:transformers>
     <map:serializers default="xml">
-      <map:serializer logger="sitemap.serializer.xhtml"
-        mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64"
-        pool-min="2"
+      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" 
+        name="xhtml" pool-grow="2" pool-max="64" pool-min="2" 
         src="org.apache.cocoon.serialization.XMLSerializer">
-        <doctype-public>
-          -//W3C//DTD XHTML 1.0 Strict//EN
-        </doctype-public>
-        <doctype-system>
-          http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
-        </doctype-system>
+        <doctype-public> -//W3C//DTD XHTML 1.0 Strict//EN </doctype-public>
+        <doctype-system> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd 
+          </doctype-system>
         <encoding>UTF-8</encoding>
       </map:serializer>
-      <map:serializer name="text"
-        src="org.apache.cocoon.serialization.TextSerializer"
+      <map:serializer name="text" 
+        src="org.apache.cocoon.serialization.TextSerializer" 
         mime-type="text/plain" logger="sitemap.serializer.text" />
     </map:serializers>
-      <map:actions>
+    <map:actions>
       <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
     </map:actions>
   </map:components>
@@ -111,7 +108,7 @@
       that the content can be used later on.
       {1} - requested url (striped from extension) -->
     <map:pipeline>
-      <map:match pattern="prepare.structurer.*.**"> 
+      <map:match pattern="prepare.structurer.*.**">
         <map:generate src="{lm:resolve.structurer.{2}}" />
         <map:transform src="{lm:get.structurer.by.requested.format.xsl}">
           <map:parameter name="format" value="{1}" />
@@ -144,7 +141,7 @@
         <map:serialize />
       </map:match>
     </map:pipeline>
-   <map:pipeline>
+    <map:pipeline>
       <!--
         Last processing step. 
         Here we are overriding the default skin generation.
@@ -157,22 +154,23 @@
         </map:call>
         <map:transform type="dispatcher">
           <map:parameter name="type" value="html" />
-          <map:parameter name="hooksTransformer"
-            value="lm://hooks-to-html.xsl" />
+          <map:parameter name="hooksTransformer" value="lm://hooks-to-html.xsl" 
+            />
         </map:transform>
         <map:serialize type="xhtml" />
       </map:match>
-      <map:match pattern="**.dispatcher.css"> 	 
-         <map:generate src="lm://resolve.structurer.{1}" /> 	
-         <map:transform type="dispatcher"> 	 
-           <map:parameter name="type" value="css" /> 	 
-         </map:transform> 	 
-         <map:transform type="pattern" 	 
-           src="{forrest:context}/resources/chaperon/grammars/link.xlex" /> 	 
-         <map:transform 	 
-           src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" /> 	 
-         <map:serialize type="text" mime-type="text/css" /> 	 
-       </map:match>
+      <map:match pattern="**.dispatcher.css">
+        <map:generate src="lm://resolve.structurer.{1}" />
+        <map:transform type="dispatcher">
+          <map:parameter name="type" value="css" />
+        </map:transform>
+        <map:transform type="pattern" 
+          src="{forrest:context}/resources/chaperon/grammars/link.xlex" />
+        <map:transform 
+          src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" 
+          />
+        <map:serialize type="text" mime-type="text/css" />
+      </map:match>
       <map:match pattern="internal.**.*">
         <map:generate src="lm://resolve.structurer.{2}-to-xhtml2" />
         <map:call resource="jx-transformer">
@@ -187,17 +185,17 @@
     </map:pipeline>
     <map:pipeline>
       <!-- businessHelper -->
-      <map:mount uri-prefix="" src="dataModel.xmap" check-reload="yes"
+      <map:mount uri-prefix="" src="dataModel.xmap" check-reload="yes" 
         pass-through="true" />
     </map:pipeline>
-      <!-- linkmap -->
+    <!-- linkmap -->
     <map:pipeline>
-      <map:mount uri-prefix="" src="themer.xmap" check-reload="yes"
-        pass-through="true" /> 
+      <map:mount uri-prefix="" src="themer.xmap" check-reload="yes" 
+        pass-through="true" />
     </map:pipeline>
     <map:pipeline>
-      <map:mount uri-prefix="" src="themes.xmap" check-reload="yes"
-        pass-through="true" /> 
+      <map:mount uri-prefix="" src="themes.xmap" check-reload="yes" 
+        pass-through="true" />
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
+</map:sitemap>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Sun Jan 29 13:07:59 2006
@@ -15,15 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- Default Forrest locationmap for the structurer/themer -->
-
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
-
   <components>
     <matchers default="lm">
-      <matcher 
-        name="lm" 
+      <matcher name="lm" 
         src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
     </matchers>
     <actions default="RecursiveDirectoryTraversalAction">
@@ -31,17 +27,20 @@
         src="org.apache.forrest.structurer.acting.RecursiveDirectoryTraversalAction"/>
     </actions>
     <selectors default="exists">
-          <selector name="exists" logger="sitemap.selector.exists"  
-                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+      <selector name="exists" logger="sitemap.selector.exists" 
+        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </selectors>
   </components>
-  
   <locator>
     <!-- xhtml2 to html core transformation -->
     <match pattern="transform.xhtml2.html.structurer">
       <select>
-        <location src="{project:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" />
+        <location 
+          src="{project:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" 
+          />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/html/xhtml2_to_html.xsl" 
+          />
       </select>
     </match>
     <!-- File specific strucuturer templates have priority before default ones. If no strucuturer template 
@@ -61,16 +60,14 @@
         </act>
         <!-- themes-dir: project-application-based theme-dir-based -->
         <location 
-          src="{lm:themer.project.dir}/{project:theme}{project:theme-ext}" 
-          />
+          src="{lm:themer.project.dir}/{project:theme}{project:theme-ext}" />
         <!-- themer: project-application-based theme-based -->
         <location 
           src="{project:themer}/resources/themes/{project:theme}{project:theme-ext}" 
           />
         <!-- themes-dir: project-application-based default -->
         <location 
-          src="{lm:themer.project.dir}/{defaults:theme}{defaults:theme-ext}" 
-          />
+          src="{lm:themer.project.dir}/{defaults:theme}{defaults:theme-ext}" />
         <!-- themer: project-application-based default -->
         <location 
           src="{project:themer}/resources/themes/{defaults:theme}{defaults:theme-ext}" 
@@ -109,11 +106,12 @@
     <!-- Some input need to be striped by their root element. -->
     <match pattern="root-strip.xsl">
       <select type="exists">
-        <location src="{project:structurer}/resources/stylesheets/root-strip.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" />
+        <location 
+          src="{project:structurer}/resources/stylesheets/root-strip.xsl" />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" />
       </select>
     </match>
-    
     <!-- Next coming from themer -->
     <!-- Project implementation of templates have priority before default ones.
         If no implementation can be found we use the noFt (~ - no forrest:template) implementation.  
@@ -125,60 +123,84 @@
         <!-- project-based default fallback -->
         <location src="{lm:themer.project.dir}/{defaults:theme}/{1}/{2}.ft" />
         <!-- project-application-based theme -->
-        <location src="{project:themer}/resources/themes/{project:theme}/{1}/{2}.ft" />
+        <location 
+          src="{project:themer}/resources/themes/{project:theme}/{1}/{2}.ft" />
         <!--  project-application-based default fallback -->
-        <location src="{project:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" />
+        <location 
+          src="{project:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" />
         <!--  plugin provided contracts -->
         <location src="{lm:resolvePluginContract.{1}.{2}}" />
         <!-- forrest-application-based theme -->
-        <location src="{defaults:themer}/resources/themes/{project:theme}/{1}/{2}.ft" />
+        <location 
+          src="{defaults:themer}/resources/themes/{project:theme}/{1}/{2}.ft" />
         <!--  forrest-application-based default fallback -->
-        <location src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" />
+        <location 
+          src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/{2}.ft" 
+          />
         <!--  forrest-application-based no found -->
-        <location src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/noFt.ft" />
+        <location 
+          src="{defaults:themer}/resources/themes/{defaults:theme}/{1}/noFt.ft" 
+          />
       </select>
     </match>
     <match pattern="dataModel-xml-document-to-**.xsl">
       <select type="exists">
-        <location
-          src="{project:skins-dir}{project:theme}/xslt/xml/document-to-{1}.xsl" />
-        <location
-          src="{project:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" />
-        <location
-          src="{defaults:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" />
+        <location 
+          src="{project:skins-dir}{project:theme}/xslt/xml/document-to-{1}.xsl" 
+          />
+        <location 
+          src="{project:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" 
+          />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/xml/document-to-{1}.xsl" 
+          />
       </select>
     </match>
     <match pattern="dataModel-html-**.xsl">
       <select type="exists">
         <location src="{project:skins-dir}{project:theme}/xslt/html/{1}.xsl" />
-        <location src="{project:structurer}/resources/stylesheets/html/{1}.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/html/{1}.xsl" />
+        <location src="{project:structurer}/resources/stylesheets/html/{1}.xsl" 
+          />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/html/{1}.xsl" />
       </select>
     </match>
-        <!-- contracts have to be striped to their stylesheet for aggregation. -->
+    <!-- contracts have to be striped to their stylesheet for aggregation. -->
     <match pattern="contract-strip-xsl.xsl">
       <select type="exists">
-        <location src="{project:structurer}/resources/stylesheets/contract-strip-xsl.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/contract-strip-xsl.xsl" />
+        <location 
+          src="{project:structurer}/resources/stylesheets/contract-strip-xsl.xsl" 
+          />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/contract-strip-xsl.xsl" 
+          />
       </select>
     </match>
     <match pattern="hooks-to-html.xsl">
       <select type="exists">
-        <location src="{project:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
-        <location src="{defaults:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
+        <location 
+          src="{project:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
+        <location 
+          src="{defaults:themer}/resources/stylesheets/hooksMatcher-html.xsl" />
       </select>
     </match>
-        <!-- contracts (e.g. html) that can be used in the project. -->
+    <!-- contracts (e.g. html) that can be used in the project. -->
     <match pattern="ls.contracts.xsl">
       <select type="exists">
-        <location src="{project:structurer}/resources/stylesheets/ls.contracts.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/ls.contracts.xsl" />
+        <location 
+          src="{project:structurer}/resources/stylesheets/ls.contracts.xsl" />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/ls.contracts.xsl" />
       </select>
     </match>
     <match pattern="ls.contracts-to-document.xsl">
       <select type="exists">
-        <location src="{project:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" />
+        <location 
+          src="{project:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" 
+          />
+        <location 
+          src="{defaults:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" 
+          />
       </select>
     </match>
     <!--Theme dir-->
@@ -189,7 +211,7 @@
         <location src="{project:resources}templates" />
       </select>
     </match>
-        <!-- contracts (e.g. html) that can be used in the project. -->
+    <!-- contracts (e.g. html) that can be used in the project. -->
     <match pattern="themer.contracts.dir">
       <select type="exists">
         <location src="{project:themer}/resources/themes" />
@@ -203,12 +225,22 @@
       -->
     <match pattern="themes/images/**.*">
       <select type="exists">
-        <location src="{lm:themer.project.dir}/{project:theme}/images/{1}.{2}" />
-        <location src="{lm:themer.project.dir}/{defaults:theme}/images/{1}.{2}" />
-        <location src="{project:themer}/resources/themes/{project:theme}/images/{1}.{2}" />
-        <location src="{project:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" />
-        <location src="{defaults:themer}/resources/themes/{project:theme}/images/{1}.{2}" />
-        <location src="{defaults:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" />
+        <location src="{lm:themer.project.dir}/{project:theme}/images/{1}.{2}" 
+          />
+        <location src="{lm:themer.project.dir}/{defaults:theme}/images/{1}.{2}" 
+          />
+        <location 
+          src="{project:themer}/resources/themes/{project:theme}/images/{1}.{2}" 
+          />
+        <location 
+          src="{project:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" 
+          />
+        <location 
+          src="{defaults:themer}/resources/themes/{project:theme}/images/{1}.{2}" 
+          />
+        <location 
+          src="{defaults:themer}/resources/themes/{defaults:theme}/images/{1}.{2}" 
+          />
       </select>
     </match>
     <!-- generic match for theme resources like css and js. -->
@@ -220,11 +252,18 @@
       <select type="exists">
         <location src="{lm:themer.project.dir}/{project:theme}/{2}/{1}.{2}" />
         <location src="{lm:themer.project.dir}/{defaults:theme}/{2}/{1}.{2}" />
-        <location src="{project:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />
-        <location src="{project:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" />
-        <location src="{defaults:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />
-        <location src="{defaults:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" />
+        <location 
+          src="{project:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" />
+        <location 
+          src="{project:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" 
+          />
+        <location 
+          src="{defaults:themer}/resources/themes/{project:theme}/{2}/{1}.{2}" 
+          />
+        <location 
+          src="{defaults:themer}/resources/themes/{defaults:theme}/{2}/{1}.{2}" 
+          />
       </select>
     </match>
   </locator>
-</locationmap>
+</locationmap>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources.xmap Sun Jan 29 13:07:59 2006
@@ -27,276 +27,277 @@
 $Revision: 1.13 $
 ==================================================== -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-   <map:components>
-      <map:generators default="file" >
-        <map:generator name="asciiart-svg"
-                       src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
-        <map:generator name="text" 
-                       src="org.apache.cocoon.generation.TextGenerator">
-    <parameter name="localizable" value="true"/>
-   </map:generator>
-      </map:generators>               
-      <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" >
-            <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
-            <!-- <parameter name="gamma" type="float" value="0.48"/> -->
-            <parameter name="gamma" type="float" value="0"/>
-         </map:serializer>                
-         <map:serializer name="text"   mime-type="text/plain"  src="org.apache.cocoon.serialization.TextSerializer"/>
-      </map:serializers>
-      <map:transformers default="xslt">
-       <map:transformer name="pattern" 
-                        src="org.apache.cocoon.transformation.PatternTransformer">
+  <map:components>
+    <map:generators default="file" >
+      <map:generator name="asciiart-svg" 
+        src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
+      <map:generator name="text" 
+        src="org.apache.cocoon.generation.TextGenerator">
+        <parameter name="localizable" value="true"/>
+      </map:generator>
+    </map:generators>
+    <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" >
+        <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+        <!-- <parameter name="gamma" type="float" value="0.48"/> -->
+        <parameter name="gamma" type="float" value="0"/>
+      </map:serializer>
+      <map:serializer name="text" mime-type="text/plain" 
+        src="org.apache.cocoon.serialization.TextSerializer"/>
+    </map:serializers>
+    <map:transformers default="xslt">
+      <map:transformer name="pattern" 
+        src="org.apache.cocoon.transformation.PatternTransformer">
         <parameter name="groups" value="true"/>
-       </map:transformer>
-      </map:transformers>
-      
-      <map:readers default="resource" />
-      <map:matchers default="wildcard" />
-   </map:components>
-
-   <map:resources>
-      <map:resource name="skin-read">
-            <map:select type="exists">
-              <!-- First location: project skin dir -->
-               <map:when test="{project:skins-dir}{path}/{name}.css">
-		         <map:call resource="read-linked-text">
-		           <map:parameter name="path" value="{project:skins-dir}{path}/{name}.css" />
-		         </map:call>
-               </map:when>
-               <map:when test="{project:skins-dir}{path}/{name}.{ext}">
-                  <map:read src="{project:skins-dir}{path}/{name}.{ext}" mime-type="{mime-type}" />
-               </map:when>
-               <map:when test="{project:skins-dir}{path}/{name}.css.xslt">
-                  <map:call resource="pipe-text-resource">
-                    <map:parameter name="path" value="{project:skins-dir}{path}/{name}.css.xslt" />
-                    <map:parameter name="mime-type" value="text/css" />
-                  </map:call>
-               </map:when>
-               <map:when test="{project:skins-dir}{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-resource">
-                    <map:parameter name="path" value="{project:skins-dir}{path}/{name}.svg.xslt" />
-                  </map:call>
-               </map:when>
-
-               <!-- Second location: skin dir -->
-
-               <map:when test="resources/skin/{path}/{project:theme}/{name}.css">
-		         <map:call resource="read-linked-text">
-		           <map:parameter name="path" value="resources/skin/{path}/{project:theme}/{name}.css" />
-		         </map:call>
-               </map:when>
-               <map:when test="resources/skin/{path}/{project:theme}/{name}.{ext}">
-                  <map:read src="resources/skin/{path}/{project:theme}/{name}.{ext}" mime-type="{mime-type}" />
-               </map:when>
-               <map:when test="resources/skin/{path}/{project:theme}/{name}.css.xslt">
-                  <map:call resource="pipe-text-resource">
-                    <map:parameter name="path" value="resources/skin/{path}/{project:theme}/{name}.css.xslt" />
-                    <map:parameter name="mime-type" value="text/css" />
-                  </map:call>
-               </map:when>
-               <map:when test="resources/skin/{path}/{project:theme}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-resource">
-                    <map:parameter name="path" value="resources/skin/{path}/{project:theme}/{name}.svg.xslt" />
-                  </map:call>
-               </map:when>
-               
-              <!-- Third location: leather skin dir -->
-
-               <map:when test="resources/skin/{path}/{name}.css">
-		         <map:call resource="read-linked-text">
-		           <map:parameter name="path" value="resources/skin/{path}/{name}.css" />
-		         </map:call>
-               </map:when>
-               <map:when test="resources/skin/{path}/{name}.{ext}">
-                  <map:read src="resources/skin/{path}/{name}.{ext}" mime-type="{mime-type}" />
-               </map:when>
-               <map:when test="resources/skin/{path}/{name}.css.xslt">
-                  <map:call resource="pipe-text-resource">
-                    <map:parameter name="path" value="resources/skin/{path}/{name}.css.xslt" />
-                    <map:parameter name="mime-type" value="text/css" />
-                  </map:call>
-               </map:when>
-               <map:when test="resources/skin/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-resource">
-                    <map:parameter name="path" value="resources/skin/{path}/{name}.svg.xslt" />
-                  </map:call>
-               </map:when>
-               
-              <!-- Fourth location: forrest common skin dir -->
-               <map:when test="{forrest:context}/skins/common/{path}/{name}.css">
-		         <map:call resource="read-linked-text">
-		           <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css" />
-		         </map:call>
-               </map:when>
-               <map:when test="{forrest:context}/skins/common/{path}/{name}.{ext}">
-                  <map:read src="{forrest:context}/skins/common/{path}/{name}.{ext}" mime-type="{mime-type}" />
-               </map:when>
-               <map:when test="{forrest:context}/skins/common/{path}/{name}.css.xslt">
-                  <map:call resource="pipe-text-resource">
-                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css.xslt" />
-                    <map:parameter name="mime-type" value="text/css" />
-                  </map:call>
-               </map:when>
-               <map:when test="{forrest:context}/skins/common/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-resource">
-                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
-                  </map:call>
-               </map:when>
-               <map:otherwise>
-                   <!-- this should always fail; it is used so the error has the correct filename and extension -->
-                  <map:read src=".../{path}/{name}.{ext}" mime-type="{mime-type}" />
-               </map:otherwise>
-            </map:select>
-      </map:resource>
-
-       <map:resource name="read-svg2png-corner-resource">
-            <map:select type="exists">
-               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-corner-resource">
-                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
-                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
-                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
-                    <map:parameter name="size" value="{size}"/>   
-                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
-                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
-                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
-                  </map:call>
-               </map:when>
-               <map:when test="resources/skin/{path}/{name}.svg.xslt">
-                  <map:call resource="pipe-transformed-svg2png-corner-resource">
-                    <map:parameter name="path" value="resources/skin/{path}/{name}.svg.xslt" />
-                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
-                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
-                    <map:parameter name="size" value="{size}"/>   
-                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
-                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
-                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
-                  </map:call>
-               </map:when>
-               <map:otherwise>
-                  <map:call resource="pipe-svg2png-corner-resource">
-                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
-                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
-                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
-                    <map:parameter name="size" value="{size}"/>   
-                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
-                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
-                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
-                  </map:call>
-               </map:otherwise>
-            </map:select>
-      </map:resource>
-      
-      <map:resource name="pipe-text-resource">
-        <map:call resource="generate-transformed-resource">
-           <map:parameter name="path" value="{path}" />
-         </map:call>
-         <map:serialize type="text" mime-type="{mime-type}"/>
-      </map:resource>
-
-      <map:resource name="pipe-aggregate-svg2png-resource">
-         <map:call resource="generate-aggregate-resource">
-           <map:parameter name="path" value="{path}" />
-         </map:call>
-         <map:call resource="transform-project2text"/>
-         <map:transform src="{forrest:stylesheets}/extract-svg.xsl"/>
-         <map:serialize type="svg2png" />
-      </map:resource>
-
-      <map:resource name="pipe-transformed-svg2png-resource">
-         <map:call resource="generate-transformed-resource">
-           <map:parameter name="path" value="{path}" />
-         </map:call>
-         <map:call resource="transform-project2text"/>
-         <map:serialize type="svg2png" />
-      </map:resource>
-
-      <map:resource name="pipe-svg2png-corner-resource">
-        <map:generate src="cocoon://skinconf.xml" />
-        <map:transform src="{path}">
-            <map:parameter name="orientation-tb" 
-                         value="{orientation-tb}"/>
-            <map:parameter name="orientation-lr" 
-                         value="{orientation-lr}"/>
-            <map:parameter name="size" 
-                         value="{size}"/>
-            <map:parameter name="bg-color-name" 
-                         value="{bg-color-name}"/>
+      </map:transformer>
+    </map:transformers>
+    <map:readers default="resource" />
+    <map:matchers default="wildcard" />
+  </map:components>
+  <map:resources>
+    <map:resource name="skin-read">
+      <map:select type="exists">
+        <!-- First location: project skin dir -->
+        <map:when test="{project:skins-dir}{path}/{name}.css">
+          <map:call resource="read-linked-text">
+            <map:parameter name="path" 
+              value="{project:skins-dir}{path}/{name}.css" />
+          </map:call>
+        </map:when>
+        <map:when test="{project:skins-dir}{path}/{name}.{ext}">
+          <map:read src="{project:skins-dir}{path}/{name}.{ext}" 
+            mime-type="{mime-type}" />
+        </map:when>
+        <map:when test="{project:skins-dir}{path}/{name}.css.xslt">
+          <map:call resource="pipe-text-resource">
+            <map:parameter name="path" 
+              value="{project:skins-dir}{path}/{name}.css.xslt" />
+            <map:parameter name="mime-type" value="text/css" />
+          </map:call>
+        </map:when>
+        <map:when test="{project:skins-dir}{path}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-resource">
+            <map:parameter name="path" 
+              value="{project:skins-dir}{path}/{name}.svg.xslt" />
+          </map:call>
+        </map:when>
+        <!-- Second location: skin dir -->
+        <map:when test="resources/skin/{path}/{project:theme}/{name}.css">
+          <map:call resource="read-linked-text">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{project:theme}/{name}.css" />
+          </map:call>
+        </map:when>
+        <map:when test="resources/skin/{path}/{project:theme}/{name}.{ext}">
+          <map:read src="resources/skin/{path}/{project:theme}/{name}.{ext}" 
+            mime-type="{mime-type}" />
+        </map:when>
+        <map:when test="resources/skin/{path}/{project:theme}/{name}.css.xslt">
+          <map:call resource="pipe-text-resource">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{project:theme}/{name}.css.xslt" />
+            <map:parameter name="mime-type" value="text/css" />
+          </map:call>
+        </map:when>
+        <map:when test="resources/skin/{path}/{project:theme}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-resource">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{project:theme}/{name}.svg.xslt" />
+          </map:call>
+        </map:when>
+        <!-- Third location: leather skin dir -->
+        <map:when test="resources/skin/{path}/{name}.css">
+          <map:call resource="read-linked-text">
+            <map:parameter name="path" value="resources/skin/{path}/{name}.css" 
+              />
+          </map:call>
+        </map:when>
+        <map:when test="resources/skin/{path}/{name}.{ext}">
+          <map:read src="resources/skin/{path}/{name}.{ext}" 
+            mime-type="{mime-type}" />
+        </map:when>
+        <map:when test="resources/skin/{path}/{name}.css.xslt">
+          <map:call resource="pipe-text-resource">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{name}.css.xslt" />
+            <map:parameter name="mime-type" value="text/css" />
+          </map:call>
+        </map:when>
+        <map:when test="resources/skin/{path}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-resource">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{name}.svg.xslt" />
+          </map:call>
+        </map:when>
+        <!-- Fourth location: forrest common skin dir -->
+        <map:when test="{forrest:context}/skins/common/{path}/{name}.css">
+          <map:call resource="read-linked-text">
+            <map:parameter name="path" 
+              value="{forrest:context}/skins/common/{path}/{name}.css" />
+          </map:call>
+        </map:when>
+        <map:when test="{forrest:context}/skins/common/{path}/{name}.{ext}">
+          <map:read src="{forrest:context}/skins/common/{path}/{name}.{ext}" 
+            mime-type="{mime-type}" />
+        </map:when>
+        <map:when test="{forrest:context}/skins/common/{path}/{name}.css.xslt">
+          <map:call resource="pipe-text-resource">
+            <map:parameter name="path" 
+              value="{forrest:context}/skins/common/{path}/{name}.css.xslt" />
+            <map:parameter name="mime-type" value="text/css" />
+          </map:call>
+        </map:when>
+        <map:when test="{forrest:context}/skins/common/{path}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-resource">
+            <map:parameter name="path" 
+              value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+          </map:call>
+        </map:when>
+        <map:otherwise>
+          <!-- this should always fail; it is used so the error has the correct filename and extension -->
+          <map:read src=".../{path}/{name}.{ext}" mime-type="{mime-type}" />
+        </map:otherwise>
+      </map:select>
+    </map:resource>
+    <map:resource name="read-svg2png-corner-resource">
+      <map:select type="exists">
+        <map:when 
+          test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-corner-resource">
+            <map:parameter name="path" 
+              value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" 
+              />
+            <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+            <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+            <map:parameter name="size" value="{size}"/>
+            <map:parameter name="bg-color-name" value="{bg-color-name}"/>
             <map:parameter name="stroke-color-name" 
-                         value="{stroke-color-name}"/>
-            <map:parameter name="fg-color-name" 
-                         value="{fg-color-name}"/>            
-        </map:transform>
-        <map:call resource="transform-project2text"/>
-        <map:serialize type="svg2png" />
-      </map:resource>
-      
-      <map:resource name="generate-aggregate-resource">
-        <map:aggregate element="resource">
-          <map:part src="cocoon://skinconf.xml" />
-          <map:part src="{path}"/>
-        </map:aggregate>
-      </map:resource>
-      
-      <map:resource name="generate-transformed-resource">
-        <map:generate src="cocoon://skinconf.xml" />
-        <map:transform src="{path}"/>
-      </map:resource>
-      
-      <map:resource name="transform-project2text">
-         <map:transform src="{forrest:stylesheets}/project2text.xsl"/>
-      </map:resource>
-      
-      <map:resource name="read-linked-text">
-        <map:generate type="text" src="{path}" />
-        <map:transform type="pattern" src="{forrest:context}/resources/chaperon/grammars/link.xlex"/>
-        <map:transform src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl"/>                  
-        <map:serialize type="text" mime-type="text/css"/>
-      </map:resource>
-
-   </map:resources>
-   
-   <map:pipelines>
-       <map:pipeline>
-         <map:match pattern="**skin/**.js">
-            <map:call resource="skin-read">
-               <map:parameter name="path" value="scripts" />
-               <map:parameter name="name" value="{2}" />
-               <map:parameter name="ext" value="js" />
-               <map:parameter name="mime-type" value="application/x-javascript" />
-            </map:call>
-         </map:match>
-
-         <map:match pattern="**skin/**.css">
-            <map:call resource="skin-read">
-               <map:parameter name="path" value="css" />
-               <map:parameter name="name" value="{2}" />
-               <map:parameter name="ext" value="css" />
-               <map:parameter name="mime-type" value="text/css" />
-            </map:call>
-         </map:match>
-
-         <!-- special case corner generator pipeline -->
-         <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
-            <map:call resource="read-svg2png-corner-resource">
-               <map:parameter name="path" value="images/{1}" />
-               <map:parameter name="name" value="{2}c" />
-               <map:parameter name="orientation-tb" value="{3}"/>
-               <map:parameter name="orientation-lr" value="{4}"/>
-               <map:parameter name="size" value="{5}"/>    
-               <map:parameter name="bg-color-name" value="{6}"/>
-               <map:parameter name="stroke-color-name" value="{7}"/>
-               <map:parameter name="fg-color-name" value="{8}"/>    
-            </map:call>
-         </map:match>
-         <!-- special case corner generator pipeline -->
-         <!--<map:match pattern="themes/images**/*c-*-*-*-1*-2*-3*.png">
+              value="{stroke-color-name}"/>
+            <map:parameter name="fg-color-name" value="{fg-color-name}"/>
+          </map:call>
+        </map:when>
+        <map:when test="resources/skin/{path}/{name}.svg.xslt">
+          <map:call resource="pipe-transformed-svg2png-corner-resource">
+            <map:parameter name="path" 
+              value="resources/skin/{path}/{name}.svg.xslt" />
+            <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+            <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+            <map:parameter name="size" value="{size}"/>
+            <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+            <map:parameter name="stroke-color-name" 
+              value="{stroke-color-name}"/>
+            <map:parameter name="fg-color-name" value="{fg-color-name}"/>
+          </map:call>
+        </map:when>
+        <map:otherwise>
+          <map:call resource="pipe-svg2png-corner-resource">
+            <map:parameter name="path" 
+              value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+            <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+            <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+            <map:parameter name="size" value="{size}"/>
+            <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+            <map:parameter name="stroke-color-name" 
+              value="{stroke-color-name}"/>
+            <map:parameter name="fg-color-name" value="{fg-color-name}"/>
+          </map:call>
+        </map:otherwise>
+      </map:select>
+    </map:resource>
+    <map:resource name="pipe-text-resource">
+      <map:call resource="generate-transformed-resource">
+        <map:parameter name="path" value="{path}" />
+      </map:call>
+      <map:serialize type="text" mime-type="{mime-type}"/>
+    </map:resource>
+    <map:resource name="pipe-aggregate-svg2png-resource">
+      <map:call resource="generate-aggregate-resource">
+        <map:parameter name="path" value="{path}" />
+      </map:call>
+      <map:call resource="transform-project2text"/>
+      <map:transform src="{forrest:stylesheets}/extract-svg.xsl"/>
+      <map:serialize type="svg2png" />
+    </map:resource>
+    <map:resource name="pipe-transformed-svg2png-resource">
+      <map:call resource="generate-transformed-resource">
+        <map:parameter name="path" value="{path}" />
+      </map:call>
+      <map:call resource="transform-project2text"/>
+      <map:serialize type="svg2png" />
+    </map:resource>
+    <map:resource name="pipe-svg2png-corner-resource">
+      <map:generate src="cocoon://skinconf.xml" />
+      <map:transform src="{path}">
+        <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+        <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+        <map:parameter name="size" value="{size}"/>
+        <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+        <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+        <map:parameter name="fg-color-name" value="{fg-color-name}"/>
+      </map:transform>
+      <map:call resource="transform-project2text"/>
+      <map:serialize type="svg2png" />
+    </map:resource>
+    <map:resource name="generate-aggregate-resource">
+      <map:aggregate element="resource">
+        <map:part src="cocoon://skinconf.xml" />
+        <map:part src="{path}"/>
+      </map:aggregate>
+    </map:resource>
+    <map:resource name="generate-transformed-resource">
+      <map:generate src="cocoon://skinconf.xml" />
+      <map:transform src="{path}"/>
+    </map:resource>
+    <map:resource name="transform-project2text">
+      <map:transform src="{forrest:stylesheets}/project2text.xsl"/>
+    </map:resource>
+    <map:resource name="read-linked-text">
+      <map:generate type="text" src="{path}" />
+      <map:transform type="pattern" 
+        src="{forrest:context}/resources/chaperon/grammars/link.xlex"/>
+      <map:transform 
+        src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl"/>
+      <map:serialize type="text" mime-type="text/css"/>
+    </map:resource>
+  </map:resources>
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="**skin/**.js">
+        <map:call resource="skin-read">
+          <map:parameter name="path" value="scripts" />
+          <map:parameter name="name" value="{2}" />
+          <map:parameter name="ext" value="js" />
+          <map:parameter name="mime-type" value="application/x-javascript" />
+        </map:call>
+      </map:match>
+      <map:match pattern="**skin/**.css">
+        <map:call resource="skin-read">
+          <map:parameter name="path" value="css" />
+          <map:parameter name="name" value="{2}" />
+          <map:parameter name="ext" value="css" />
+          <map:parameter name="mime-type" value="text/css" />
+        </map:call>
+      </map:match>
+      <!-- special case corner generator pipeline -->
+      <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
+        <map:call resource="read-svg2png-corner-resource">
+          <map:parameter name="path" value="images/{1}" />
+          <map:parameter name="name" value="{2}c" />
+          <map:parameter name="orientation-tb" value="{3}"/>
+          <map:parameter name="orientation-lr" value="{4}"/>
+          <map:parameter name="size" value="{5}"/>
+          <map:parameter name="bg-color-name" value="{6}"/>
+          <map:parameter name="stroke-color-name" value="{7}"/>
+          <map:parameter name="fg-color-name" value="{8}"/>
+        </map:call>
+      </map:match>
+      <!-- special case corner generator pipeline -->
+      <!--<map:match pattern="themes/images**/*c-*-*-*-1*-2*-3*.png">
             <map:call resource="read-svg2png-corner-resource">
                <map:parameter name="path" value="images/{1}" />
                <map:parameter name="name" value="{2}c" />
@@ -308,132 +309,138 @@
                <map:parameter name="fg-color-name" value="{8}"/>    
             </map:call>
          </map:match>-->
-         <!-- special case corner generator pipeline -->
-         
-         <map:match pattern="skin/images**/*.*">
-            <map:call resource="skin-read">
-               <map:parameter name="path" value="images/{1}" />
-               <map:parameter name="name" value="{2}" />
-               <map:parameter name="ext" value="{3}" />
-               <map:parameter name="mime-type" value="image/{3}" />
+      <!-- special case corner generator pipeline -->
+      <map:match pattern="skin/images**/*.*">
+        <map:call resource="skin-read">
+          <map:parameter name="path" value="images/{1}" />
+          <map:parameter name="name" value="{2}" />
+          <map:parameter name="ext" value="{3}" />
+          <map:parameter name="mime-type" value="image/{3}" />
+        </map:call>
+      </map:match>
+      <!-- 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/**.png">
+        <map:select type="exists">
+          <map:when test="{project:content.xdocs}/images/{1}.svg">
+            <map:call resource="pipe-aggregate-svg2png-resource">
+              <map:parameter name="path" 
+                value="{project:content.xdocs}/images/{1}.svg" />
             </map:call>
-         </map:match>
-
-         <!-- 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/**.png">
-            <map:select type="exists">
-               <map:when test="{project:content.xdocs}/images/{1}.svg">
-                  <map:call resource="pipe-aggregate-svg2png-resource">
-                    <map:parameter name="path" value="{project:content.xdocs}/images/{1}.svg" />
-                  </map:call>
-               </map:when>
-               <map:when test="{project:resources.images}/{1}.svg">
-                  <map:call resource="pipe-aggregate-svg2png-resource">
-                    <map:parameter name="path" value="{project:resources.images}/{1}.svg" />
-                  </map:call>
-               </map:when>
-               <map:when test="resources/images/{1}.svg">
-                  <map:call resource="pipe-aggregate-svg2png-resource">
-                    <map:parameter name="path" value="resources/images/{1}.svg" />
-                  </map:call>
-               </map:when>
-               <map:when test="{project:content.xdocs}/images/{1}.png">
-                  <map:read src="{project:content.xdocs}/images/{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:when test="{project:resources.images}/{1}.png">
-                  <map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
-               </map:when>
-               <map:otherwise>
-                 <!-- needed for compatibility for the standard resources/images that are now
+          </map:when>
+          <map:when test="{project:resources.images}/{1}.svg">
+            <map:call resource="pipe-aggregate-svg2png-resource">
+              <map:parameter name="path" 
+                value="{project:resources.images}/{1}.svg" />
+            </map:call>
+          </map:when>
+          <map:when test="resources/images/{1}.svg">
+            <map:call resource="pipe-aggregate-svg2png-resource">
+              <map:parameter name="path" value="resources/images/{1}.svg" />
+            </map:call>
+          </map:when>
+          <map:when test="{project:content.xdocs}/images/{1}.png">
+            <map:read src="{project:content.xdocs}/images/{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:when test="{project:resources.images}/{1}.png">
+            <map:read src="{project:resources.images}/{1}.png" 
+              mime-type="image/png" />
+          </map:when>
+          <map:otherwise>
+            <!-- needed for compatibility for the standard resources/images that are now
                       in the common skin -->
-                 <map:call resource="skin-read">
-                   <map:parameter name="path" value="images" />
-                   <map:parameter name="name" value="{1}" />
-                   <map:parameter name="ext" value="png" />
-                   <map:parameter name="mime-type" value="image/png" />
-                 </map:call>
-               </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:when test="resources/images/{1}.{2}">
-                  <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" />
-               </map:when>
-               <map:when test="{project:resources.images}/{1}.{2}">
-                  <map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
-               </map:when>
-               <map:otherwise>
-                 <!-- needed for compatibility for the standard resources/images that are now
+            <map:call resource="skin-read">
+              <map:parameter name="path" value="images" />
+              <map:parameter name="name" value="{1}" />
+              <map:parameter name="ext" value="png" />
+              <map:parameter name="mime-type" value="image/png" />
+            </map:call>
+          </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:when test="resources/images/{1}.{2}">
+            <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" />
+          </map:when>
+          <map:when test="{project:resources.images}/{1}.{2}">
+            <map:read src="{project:resources.images}/{1}.{2}" 
+              mime-type="image/{2}" />
+          </map:when>
+          <map:otherwise>
+            <!-- needed for compatibility for the standard resources/images that are now
                       in the common skin -->
-                 <map:call resource="skin-read">
-                   <map:parameter name="path" value="images" />
-                   <map:parameter name="name" value="{1}" />
-                   <map:parameter name="ext" value="{2}" />
-                   <map:parameter name="mime-type" value="image/{2}" />
-                 </map:call>
-               </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:call resource="pipe-aggregate-svg2png-resource">
-                    <map:parameter name="path" value="{project:content.xdocs}/{1}.svg" />
-                  </map:call>
-               </map:when>
-               <map:when test="{project:content.xdocs}/{1}.aart">
-                  <map:generate type="asciiart-svg" src="{project:content.xdocs}/{1}.aart" />
-                  <map:call resource="transform-project2text"/>
-                  <map:serialize type="svg2png" />
-               </map:when>
-               <map:otherwise>
-                  <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
-               </map:otherwise>
-            </map:select>
-         </map:match>
-
-         <map:match pattern="**.ico">
-            <map:select type="exists">
-               <map:when test="{project:content.xdocs}/{1}.ico">
-                  <map:read src="{project:content.xdocs}/{1}.ico" mime-type="image/x-icon" />
-               </map:when>
-               <map:otherwise>
-                 <map:call resource="skin-read">
-                   <map:parameter name="path" value="images" />
-                   <map:parameter name="name" value="{1}" />
-                   <map:parameter name="ext" value="ico" />
-                   <map:parameter name="mime-type" value="image/x-icon" />
-                 </map:call>
-               </map:otherwise>
-            </map:select>
-         </map:match>
-      </map:pipeline>
-   </map:pipelines>
-</map:sitemap>
+            <map:call resource="skin-read">
+              <map:parameter name="path" value="images" />
+              <map:parameter name="name" value="{1}" />
+              <map:parameter name="ext" value="{2}" />
+              <map:parameter name="mime-type" value="image/{2}" />
+            </map:call>
+          </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:call resource="pipe-aggregate-svg2png-resource">
+              <map:parameter name="path" 
+                value="{project:content.xdocs}/{1}.svg" />
+            </map:call>
+          </map:when>
+          <map:when test="{project:content.xdocs}/{1}.aart">
+            <map:generate type="asciiart-svg" 
+              src="{project:content.xdocs}/{1}.aart" />
+            <map:call resource="transform-project2text"/>
+            <map:serialize type="svg2png" />
+          </map:when>
+          <map:otherwise>
+            <map:read src="{project:content.xdocs}/{1}.png" 
+              mime-type="image/png" />
+          </map:otherwise>
+        </map:select>
+      </map:match>
+      <map:match pattern="**.ico">
+        <map:select type="exists">
+          <map:when test="{project:content.xdocs}/{1}.ico">
+            <map:read src="{project:content.xdocs}/{1}.ico" 
+              mime-type="image/x-icon" />
+          </map:when>
+          <map:otherwise>
+            <map:call resource="skin-read">
+              <map:parameter name="path" value="images" />
+              <map:parameter name="name" value="{1}" />
+              <map:parameter name="ext" value="ico" />
+              <map:parameter name="mime-type" value="image/x-icon" />
+            </map:call>
+          </map:otherwise>
+        </map:select>
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themer.xmap Sun Jan 29 13:07:59 2006
@@ -15,7 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
 <!-- forrest:structurer
   ***********************
   The structuring of the assembled page where all content is in place
@@ -30,7 +29,6 @@
   structure the content from multiple input sources. Far more actually
   because it provides as well logical conditions for presentation formatting logic
 -->
-
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:pipes default="caching" />
@@ -64,8 +62,7 @@
       list the default contracts-->
     <map:pipeline>
       <map:match pattern="ls.contracts.source.xml">
-        <map:generate src="{lm:themer.contracts.dir}"
-          type="xpathdirectory">
+        <map:generate src="{lm:themer.contracts.dir}" type="xpathdirectory">
           <map:parameter name="xpath" value="/*" />
           <map:parameter name="xmlFiles" value="\.ft$" />
           <map:parameter name="exclude" value="[\w]*.svn" />
@@ -75,8 +72,7 @@
         <map:serialize />
       </map:match>
       <map:match pattern="ls.contracts.project.source.xml">
-        <map:generate src="{lm:themer.project.dir}"
-          type="xpathdirectory">
+        <map:generate src="{lm:themer.project.dir}" type="xpathdirectory">
           <map:parameter name="xpath" value="/*" />
           <map:parameter name="xmlFiles" value="\.ft$" />
           <map:parameter name="exclude" value="[\w]*.svn" />
@@ -127,4 +123,4 @@
       </map:match>
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
+</map:sitemap>
\ No newline at end of file

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap?rev=373357&r1=373356&r2=373357&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/themes.xmap Sun Jan 29 13:07:59 2006
@@ -18,64 +18,62 @@
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:pipes default="caching">
-      <map:pipe name="caching"
-        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
-      <map:pipe name="noncaching"
-        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
+      <map:pipe name="caching" 
+        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" 
+        />
+      <map:pipe name="noncaching" 
+        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" 
+        />
     </map:pipes>
     <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists"
+      <map:selector logger="sitemap.selector.exists" name="exists" 
         src="org.apache.forrest.sourceexists.SourceExistsSelector" />
     </map:selectors>
     <map:generators default="file">
-      <map:generator name="html"
+      <map:generator name="html" 
         src="org.apache.cocoon.generation.HTMLGenerator">
         <jtidy-config>jtidy.properties</jtidy-config>
       </map:generator>
-      <map:generator name="text"
+      <map:generator name="text" 
         src="org.apache.cocoon.generation.TextGenerator">
         <parameter name="localizable" value="true" />
       </map:generator>
-      <map:generator name="directory"
+      <map:generator name="directory" 
         src="org.apache.cocoon.generation.DirectoryGenerator" />
       <!--<map:generator name="structurerXsl"
         src="org.apache.forrest.structurer.generation.StructurerXSLGenerator" />
       -->
     </map:generators>
     <map:transformers default="xslt">
-      <map:transformer name="cinclude"
+      <map:transformer name="cinclude" 
         src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="dispatcher"
-        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" />
-      <map:transformer name="i18n"
+      <map:transformer name="dispatcher" 
+        src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer" 
+        />
+      <map:transformer name="i18n" 
         src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="contracts">
-          <catalogue id="other" name="OtherMessages"
-            location="messages" />
-          <catalogue id="contracts" name="ContractsMessages"
+          <catalogue id="other" name="OtherMessages" location="messages" />
+          <catalogue id="contracts" name="ContractsMessages" 
             location="messages" />
         </catalogues>
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
     </map:transformers>
     <map:serializers default="xml">
-      <map:serializer logger="sitemap.serializer.xhtml"
-        mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64"
-        pool-min="2"
+      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" 
+        name="xhtml" pool-grow="2" pool-max="64" pool-min="2" 
         src="org.apache.cocoon.serialization.XMLSerializer">
-        <doctype-public>
-          -//W3C//DTD XHTML 1.0 Strict//EN
-        </doctype-public>
-        <doctype-system>
-          http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
-        </doctype-system>
+        <doctype-public> -//W3C//DTD XHTML 1.0 Strict//EN </doctype-public>
+        <doctype-system> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd 
+          </doctype-system>
         <encoding>UTF-8</encoding>
         <indent>yes</indent>
       </map:serializer>
-      <map:serializer name="txt"
-        src="org.apache.cocoon.serialization.TextSerializer"
+      <map:serializer name="txt" 
+        src="org.apache.cocoon.serialization.TextSerializer" 
         mime-type="text/plain" logger="sitemap.serializer.text" />
-      <map:serializer mime-type="image/png" name="svg2png"
+      <map:serializer mime-type="image/png" name="svg2png" 
         src="org.apache.cocoon.serialization.SVGSerializer">
         <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
         <!-- <parameter name="gamma" type="float" value="0.48"/> -->
@@ -86,10 +84,11 @@
   <map:resources>
     <map:resource name="read-linked-text">
       <map:generate type="text" src="{path}" />
-      <map:transform type="pattern"
+      <map:transform type="pattern" 
         src="{forrest:context}/resources/chaperon/grammars/link.xlex" />
-      <map:transform
-        src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" />
+      <map:transform 
+        src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl" 
+        />
       <map:serialize type="text" mime-type="text/css" />
     </map:resource>
   </map:resources>
@@ -103,30 +102,25 @@
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-
     <map:pipeline>
       <!--
         Last processing step. 
         Here we are overriding the default skin generation.
       -->
-
       <map:match pattern="themes/**.css">
         <map:call resource="read-linked-text">
           <map:parameter name="path" value="{lm:themes/{1}.css}" />
         </map:call>
         <!-- <map:read mime-type="text/css" src="{lm:themes/{1}.css}" /> -->
       </map:match>
-
       <map:match pattern="themes/**.js">
-        <map:read mime-type="application/x-javascript"
-          src="{lm:themes/{1}.js}" />
+        <map:read mime-type="application/x-javascript" src="{lm:themes/{1}.js}" 
+          />
       </map:match>
-
-      <map:match
+      <map:match 
         pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg">
         <map:generate src="status.xml" />
-        <map:transform
-          src="resources/stylesheets/round-corner-hex.svg.xslt">
+        <map:transform src="resources/stylesheets/round-corner-hex.svg.xslt">
           <map:parameter name="orientation-tb" value="{2}" />
           <map:parameter name="orientation-lr" value="{3}" />
           <map:parameter name="size" value="{4}" />
@@ -136,21 +130,21 @@
         </map:transform>
         <map:serialize type="xml" />
       </map:match>
-      <map:match
+      <map:match 
         pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.svg-to-png">
-        <map:generate
-          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg" />
+        <map:generate 
+          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg" 
+          />
         <map:serialize type="svg2png" />
       </map:match>
-      <map:match
+      <map:match 
         pattern="themes/images**/roundcorner-*-*-*-bg*-stroke*-fg*.png">
-        <map:read
-          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg-to-png"
+        <map:read 
+          src="cocoon:/themes/images{1}/roundcorner-{2}-{3}-{4}-bg{5}-stroke{6}-fg{7}.svg-to-png" 
           mime-type="image/png" />
       </map:match>
       <map:match pattern="themes/images/**.*">
-        <map:match type="regexp"
-          pattern="(.*\.)(jpg|JPG|Jpg|jpeg|Jpeg|JPEG)$">
+        <map:match type="regexp" pattern="(.*\.)(jpg|JPG|Jpg|jpeg|Jpeg|JPEG)$">
           <map:read src="{lm:{1}{2}}" mime-type="image/jpeg" />
         </map:match>
         <map:match type="regexp" pattern="(.*)(gif|GIF|Gif)$">
@@ -161,25 +155,21 @@
         </map:match>
       </map:match>
       <map:match pattern="**.js">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.css">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <!--       <map:match pattern="**images**">
         <map:mount uri-prefix="" src="resources.xmap"
         check-reload="yes" />
         </map:match>-->
       <map:match pattern="**.png">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
       <map:match pattern="**.ico">
-        <map:mount uri-prefix="" src="resources.xmap"
-          check-reload="yes" />
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
       </map:match>
     </map:pipeline>
   </map:pipelines>
-</map:sitemap>
+</map:sitemap>
\ No newline at end of file



Mime
View raw message