forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [2/14] - in /forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher: ./ resources/stylesheets/ resources/stylesheets/fo/ resources/stylesheets/helper/ resources/stylesheets/html/ resources/styleshe...
Date Thu, 27 Aug 2009 12:07:47 GMT
Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -19,108 +19,89 @@
 <locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
   <components>
     <matchers default="lm">
-      <matcher name="lm" 
-                src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+      <matcher name="lm"
+      src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher" />
     </matchers>
     <actions default="RecursiveDirectoryTraversalAction">
-      <action name="RecursiveDirectoryTraversalAction" 
-                src="org.apache.forrest.dispatcher.acting.RecursiveDirectoryTraversalAction"/>
-      <action name="resourceTypeAction" 
-                src="org.apache.forrest.dispatcher.acting.ResourceTypeAction"/>
-      <action logger="sitemap.action.sourcetype" name="sourcetype" 
-                src="org.apache.forrest.sourcetype.SourceTypeAction">
+      <action name="RecursiveDirectoryTraversalAction"
+      src="org.apache.forrest.dispatcher.acting.RecursiveDirectoryTraversalAction" />
+      <action name="resourceTypeAction"
+      src="org.apache.forrest.dispatcher.acting.ResourceTypeAction" />
+      <action logger="sitemap.action.sourcetype" name="sourcetype"
+      src="org.apache.forrest.sourcetype.SourceTypeAction">
         <sourcetype name="document-v10">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Documentation V1.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Documentation V1.0//EN" />
         </sourcetype>
         <sourcetype name="howto-v10">
-          <document-declaration 
-                        public-id="-//APACHE//DTD How-to V1.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD How-to V1.0//EN" />
         </sourcetype>
         <sourcetype name="todo-v10">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Todo V1.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Todo V1.0//EN" />
         </sourcetype>
         <sourcetype name="changes-v10">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Changes V1.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Changes V1.0//EN" />
         </sourcetype>
         <sourcetype name="document-v11">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Documentation V1.1//EN" />
+          <document-declaration public-id="-//APACHE//DTD Documentation V1.1//EN" />
         </sourcetype>
         <sourcetype name="howto-v11">
-          <document-declaration 
-                        public-id="-//APACHE//DTD How-to V1.1//EN" />
+          <document-declaration public-id="-//APACHE//DTD How-to V1.1//EN" />
         </sourcetype>
         <sourcetype name="todo-v11">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Todo V1.1//EN" />
+          <document-declaration public-id="-//APACHE//DTD Todo V1.1//EN" />
         </sourcetype>
         <sourcetype name="changes-v11">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Changes V1.1//EN" />
+          <document-declaration public-id="-//APACHE//DTD Changes V1.1//EN" />
         </sourcetype>
         <sourcetype name="todo-v12">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Todo V1.2//EN" />
+          <document-declaration public-id="-//APACHE//DTD Todo V1.2//EN" />
         </sourcetype>
         <sourcetype name="changes-v12">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Changes V1.2//EN" />
+          <document-declaration public-id="-//APACHE//DTD Changes V1.2//EN" />
         </sourcetype>
         <sourcetype name="howto-v12">
-          <document-declaration 
-                        public-id="-//APACHE//DTD How-to V1.2//EN" />
+          <document-declaration public-id="-//APACHE//DTD How-to V1.2//EN" />
         </sourcetype>
         <sourcetype name="todo-v13">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Todo V1.3//EN" />
+          <document-declaration public-id="-//APACHE//DTD Todo V1.3//EN" />
         </sourcetype>
         <sourcetype name="changes-v13">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Changes V1.3//EN" />
+          <document-declaration public-id="-//APACHE//DTD Changes V1.3//EN" />
         </sourcetype>
         <sourcetype name="howto-v13">
-          <document-declaration 
-                        public-id="-//APACHE//DTD How-to V1.3//EN" />
+          <document-declaration public-id="-//APACHE//DTD How-to V1.3//EN" />
         </sourcetype>
         <sourcetype name="document-v20a">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Documentation V2.0a//EN" />
+          <document-declaration public-id="-//APACHE//DTD Documentation V2.0a//EN" />
         </sourcetype>
         <sourcetype name="document-v20">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Documentation V2.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Documentation V2.0//EN" />
         </sourcetype>
         <sourcetype name="todo-v20">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Todo V2.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Todo V2.0//EN" />
         </sourcetype>
         <sourcetype name="changes-v20">
-          <document-declaration 
-                        public-id="-//APACHE//DTD Changes V2.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD Changes V2.0//EN" />
         </sourcetype>
         <sourcetype name="howto-v20">
-          <document-declaration 
-                        public-id="-//APACHE//DTD How-to V2.0//EN" />
+          <document-declaration public-id="-//APACHE//DTD How-to V2.0//EN" />
         </sourcetype>
       </action>
     </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>
     <!--+
         | Configuration of general location
         +-->
-     <!--+
+    <!--+
          | resources home
          +-->
     <match pattern="resources.home">
-      <location src="{properties:resources}"/>
+      <location src="{properties:resources}" />
     </match>
     <!--+
         |  Base location of the project themes
@@ -138,7 +119,7 @@
         | Base location for plugins
         +-->
     <match pattern="plugins.home">
-            <location src="{properties:forrest.plugins}"/>
+      <location src="{properties:forrest.plugins}" />
     </match>
     <!--+
         | Base location of the builded dispatcher plugin
@@ -156,18 +137,14 @@
         | Configuration of general location
         | END
         +-->
-<!-- resource types -->
+    <!-- resource types -->
     <match pattern="dispatcher.structurer.resourceType.**">
       <select>
-        <location 
-                    src="{lm:structurer.project.dir}/resource-types/{1}{properties:dispatcher.theme-ext}" 
-                    />
-        <location 
-                    src="{lm:dispatcher.themer}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}" 
-                    />
+        <location src="{lm:structurer.project.dir}/resource-types/{1}{properties:dispatcher.theme-ext}" />
+        <location src="{lm:dispatcher.themer}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}" />
       </select>
     </match>
-<!-- 
+    <!-- 
       FIXME - Problem with the pattern
       ********************************
       We have encountered a strange problem with the pattern 'resolve.structurer.**'.
@@ -200,11 +177,9 @@
       -->
     <match pattern="resolve.structurer.**">
       <select type="exists">
-<!-- project-based 
+        <!-- project-based 
           url-based (url location) -->
-        <location 
-                    src="{lm:structurer.project.dir}/url/{1}{properties:dispatcher.theme-ext}" 
-                    />
+        <location src="{lm:structurer.project.dir}/url/{1}{properties:dispatcher.theme-ext}" />
         <!--<act type="sourcetype" 
                     src="{properties:content.xdocs}{1}.xml">
  Sourcetype based 
@@ -213,7 +188,8 @@
                         src="lm://dispatcher.structurer.resourceType.{sourcetype}" 
                         />
         </act>
-        --><!--<act type="resourceTypeAction">
+        -->
+        <!--<act type="resourceTypeAction">
           <parameter value="{../1}{1}" name="request"/>
           <parameter value="{properties:content.xdocs}" 
                         name="projectDir"/>
@@ -227,190 +203,133 @@
   Meta data based 
           <location src="{uri}" />
         </act>
-        --><act type="RecursiveDirectoryTraversalAction">
-          <parameter value="{../1}{1}" name="request"/>
-          <parameter value="{properties:dispatcher.theme}" name="projectFallback"/>
-          <parameter value="{properties:dispatcher.theme-ext}" 
-                        name="projectExtension"/>
-          <parameter value="{lm:structurer.project.dir}/url/" 
-                        name="projectDir"/>
-<!--  url
+        -->
+        <act type="RecursiveDirectoryTraversalAction">
+          <parameter value="{../1}{1}" name="request" />
+          <parameter value="{properties:dispatcher.theme}"
+          name="projectFallback" />
+          <parameter value="{properties:dispatcher.theme-ext}"
+          name="projectExtension" />
+          <parameter value="{lm:structurer.project.dir}/url/"
+          name="projectDir" />
+          <!--  url
             project-based theme-based = directory-based / parent-directory based (recursively) -->
           <location src="{uri}" />
         </act>
-<!-- themes-dir: project-application-based theme-dir-based -->
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" 
-                    />
-<!-- themes-dir: project-application-based default -->
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" 
-                    />
-<!-- themer: forrest-application-based theme-based -->
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" 
-                    />
-<!-- themer: forrest-application-based default -->
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" 
-                    />
+        <!-- themes-dir: project-application-based theme-dir-based -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" />
+        <!-- themes-dir: project-application-based default -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" />
+        <!-- themer: forrest-application-based theme-based -->
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" />
+        <!-- themer: forrest-application-based default -->
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" />
       </select>
     </match>
-<!-- Structurer panels - You can group elements to a template and call it from any view. -->
+    <!-- Structurer panels - You can group elements to a template and call it from any view. -->
     <match pattern="resolve.panels.**">
       <select type="exists">
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" 
-                    />
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" 
-                    />
-<!--  plugin provided panels -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+        <!--  plugin provided panels -->
         <location src="{lm:resolvePluginPanels.{1}}" />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" 
-                    />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" 
-                    />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
       </select>
     </match>
-
-<!-- Next coming from themer -->
-<!-- Project implementation of templates have priority before default ones.
+    <!-- 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.  
        {1} name of the contract -->
     <match pattern="resolve.contract.*.**">
       <select type="exists">
-<!-- project-based theme -->
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
-<!-- project-based default fallback -->
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
-<!--  plugin provided contracts -->
+        <!-- project-based theme -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+        <!-- project-based default fallback -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+        <!--  plugin provided contracts -->
         <location src="{lm:resolvePluginContract.{1}.{2}}" />
-<!-- forrest-application-based theme -->
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
-<!--  forrest-application-based default fallback -->
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" 
-                    />
-<!--  forrest-application-based no found -->
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/noFt{properties:dispatcher.contract-ext}" 
-                    />
+        <!-- forrest-application-based theme -->
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+        <!--  forrest-application-based default fallback -->
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+        <!--  forrest-application-based no found -->
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/noFt{properties:dispatcher.contract-ext}" />
       </select>
     </match>
-
-<!-- generic match for theme image resources -->
-<!-- 
+    <!-- generic match for theme image resources -->
+    <!-- 
       {1} name
       {2} extension (note we assume e.g. {1}.gif)
       -->
     <match pattern="themes/images/**.*">
       <select type="exists">
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.theme}/images/{1}.{2}" 
-                    />
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/images/{1}.{2}" 
-                    />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}" 
-                    />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}" 
-                    />
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/images/{1}.{2}" />
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/images/{1}.{2}" />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}" />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}" />
       </select>
     </match>
-<!-- generic match for theme resources like css and js. -->
-<!-- 
+    <!-- generic match for theme resources like css and js. -->
+    <!-- 
       {1} name
       {2} extension (note we assume e.g. PATH/css/{1}.css)
       -->
     <match pattern="themes/**.*">
       <select type="exists">
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{2}/{1}.{2}" />
-        <location 
-                    src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" 
-                    />
-<!--  plugin provided contracts -->
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{2}/{1}.{2}" />
+        <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" />
+        <!--  plugin provided contracts -->
         <location src="{lm:resolvePluginThemes.{2}.{1}}" />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}.{2}" 
-                    />
-        <location 
-                    src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" 
-                    />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}.{2}" />
+        <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" />
       </select>
     </match>
-    
     <!--+
         | various helper xsl matches 
         +-->
     <!-- xhtml2 to html core transformation -->
     <match pattern="transform.xhtml2.html.structurer">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/html/xhtml2_to_html.xsl" 
-            />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/html/xhtml2_to_html.xsl" />
     </match>
     <!-- Some input need to be striped by their root element. -->
     <match pattern="root-strip.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/helper/root-strip.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/helper/root-strip.xsl" />
       </select>
     </match>
     <!-- dataModel -->
-<!-- A project can to supersede the standard <format>-to-<format>.xsl file to add specific feature.
+    <!-- A project can to supersede the standard <format>-to-<format>.xsl file to add specific feature.
              to include the standard in the new stylesheet, just import the standard stylesheet has follows :
                 <xsl:import href="lm://std-dataModel-xml-document-to-<format>.xsl"/>
              or <xsl:import href="lm://std-dataModel-html-<format>-to-<format>.xsl"/>
         -->
     <match pattern="dataModel-xml-document-to-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:resources.home}stylesheets/xslt/xml/document-to-{1}.xsl" 
-                    />
-        <location 
-                    src="{lm:std-dataModel-xml-document-to-{1}.xsl}" 
-                    />
+        <location src="{lm:resources.home}stylesheets/xslt/xml/document-to-{1}.xsl" />
+        <location src="{lm:std-dataModel-xml-document-to-{1}.xsl}" />
       </select>
     </match>
     <match pattern="dataModel-html-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:resources.home}stylesheets/xslt/html/{1}.xsl" 
-                    />
-        <location 
-                    src="{lm:std-dataModel-html-{1}.xsl}" 
-                    />
+        <location src="{lm:resources.home}stylesheets/xslt/html/{1}.xsl" />
+        <location src="{lm:std-dataModel-html-{1}.xsl}" />
       </select>
     </match>
     <match pattern="std-dataModel-html-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/html/{1}.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/html/{1}.xsl" />
       </select>
     </match>
     <match pattern="std-dataModel-xml-document-to-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/xml/document-to-{1}.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/xml/document-to-{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="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" />
       </select>
     </match>
     <match pattern="transform.book.menu">
@@ -420,50 +339,36 @@
     </match>
     <match pattern="hooks-to-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/{1}/hooksMatcher.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/{1}/hooksMatcher.xsl" />
       </select>
     </match>
     <match pattern="strip-dispatcher-remains-**.xsl">
       <select type="exists">
-        <location 
-                    src="{lm:dispatcher.home}/resources/stylesheets/{1}/strip-dispatcher-remains.xsl" 
-                    />
+        <location src="{lm:dispatcher.home}/resources/stylesheets/{1}/strip-dispatcher-remains.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">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts.xsl" />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts.xsl" />
     </match>
     <match pattern="ls.contracts-to-document.xsl">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts-to-document.xsl" 
-            />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts-to-document.xsl" />
     </match>
     <!-- Dispatcher has its own implementation of the following match
       since the original has a dependency on skinconf.xml -->
     <match pattern="transform.project.text">
-      <location
-          src="{lm:dispatcher.home}/resources/stylesheets/helper/project-to-text.xsl"/>
+      <location src="{lm:dispatcher.home}/resources/stylesheets/helper/project-to-text.xsl" />
     </match>
-<!--  Extracts the style sheet from the contract.  -->
+    <!--  Extracts the style sheet from the contract.  -->
     <match pattern="contract-strip-xsl.xsl">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" 
-            />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" />
     </match>
     <!-- Round corner images -->
     <match pattern="theme.images.corner.round">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/helper/round-corner-hex.svg.xslt" 
-            />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/helper/round-corner-hex.svg.xslt" />
     </match>
     <match pattern="transform.xml.variable.helper">
-      <location 
-            src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl" 
-            />
+      <location src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl" />
     </match>
   </locator>
 </locationmap>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap Thu Aug 27 12:07:38 2009
@@ -37,11 +37,12 @@
     <map:serializers default="xml" />
   </map:components>
   <map:pipelines>
-<!-- ls.contracts 
+    <!-- ls.contracts 
       list the default contracts-->
     <map:pipeline>
       <map:match pattern="ls.contracts.source.xml">
-        <map:generate src="{lm:dispatcher.themer}/themes" type="xpathdirectory">
+        <map:generate src="{lm:dispatcher.themer}/themes"
+        type="xpathdirectory">
           <map:parameter name="xpath" value="/*" />
           <map:parameter name="xmlFiles" value="\.ft$" />
           <map:parameter name="exclude" value="[\w]*.svn" />
@@ -51,14 +52,15 @@
         <map:serialize />
       </map:match>
       <map:match pattern="ls.contracts.**.plugin.**.source.xml">
-        <map:generate src="{forrest:forrest.plugins}/{1}.plugin.{2}/resources/themes" type="xpathdirectory">
+        <map:generate src="{forrest:forrest.plugins}/{1}.plugin.{2}/resources/themes"
+        type="xpathdirectory">
           <map:parameter name="xpath" value="/*" />
           <map:parameter name="xmlFiles" value="\.ft$" />
           <map:parameter name="exclude" value="[\w]*.svn" />
           <map:parameter name="depth" value="3" />
         </map:generate>
         <map:transform src="{lm:ls.contracts.xsl}" />
-        <map:serialize type="xml-document"/>
+        <map:serialize type="xml-document" />
       </map:match>
       <map:match pattern="ls.contracts.project.source.xml">
         <map:generate src="{lm:themer.project.dir}" type="xpathdirectory">

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl Thu Aug 27 12:07:38 2009
@@ -15,22 +15,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:template match="/">
-    <xsl:apply-templates/>
+    <xsl:apply-templates />
   </xsl:template>
-<!--This template will match the different combinations for hooks-->
+  <!--This template will match the different combinations for hooks-->
   <xsl:template match="hook">
-    <xsl:element name="fo:{@name}" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-      <xsl:apply-templates/>
+    <xsl:element name="fo:{@name}"
+    xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <xsl:apply-templates />
     </xsl:element>
   </xsl:template>
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
-      <xsl:apply-templates 
-        select="@*|*|text()|processing-instruction()|comment()"/>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()" />
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,40 +15,38 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format">
-  <xsl:param name="rootFontFamily" select="//rootFontFamily/@value"/>
-  <xsl:key name="static-content" match="fo:static-content" use="@flow-name"/>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:fo="http://www.w3.org/1999/XSL/Format">
+  <xsl:param name="rootFontFamily" select="//rootFontFamily/@value" />
+  <xsl:key name="static-content" match="fo:static-content" use="@flow-name" />
   <xsl:template match="/">
-    <fo:root
-            xmlns:fo="http://www.w3.org/1999/XSL/Format"
-            font-family="{$rootFontFamily}"
-            font-size="12pt">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    font-family="{$rootFontFamily}" font-size="12pt">
       <fo:layout-master-set>
-        <xsl:copy-of select="/fo/layout-master-set/*"/>
+        <xsl:copy-of select="/fo/layout-master-set/*" />
       </fo:layout-master-set>
       <fo:bookmark-tree>
-        <xsl:copy-of select="/fo/bookmark-tree/*"/>
+        <xsl:copy-of select="/fo/bookmark-tree/*" />
       </fo:bookmark-tree>
       <fo:page-sequence master-reference="book">
         <xsl:for-each select="//fo:static-content[generate-id()=generate-id(key('static-content', @flow-name))]">
-          <xsl:sort select="@flow-name"/>
-          <xsl:variable name="flow-name" select="@flow-name"/>
+
+          <xsl:sort select="@flow-name" />
+          <xsl:variable name="flow-name" select="@flow-name" />
           <fo:static-content flow-name="{@flow-name}">
-            <xsl:copy-of select="//fo:static-content[@flow-name=$flow-name]/*"/>
+            <xsl:copy-of select="//fo:static-content[@flow-name=$flow-name]/*" />
           </fo:static-content>
         </xsl:for-each>
         <fo:flow flow-name="xsl-region-body">
-          <xsl:copy-of select="/fo/xsl-region-body/title/*"/>
-<!-- FIXME : left was {$text-align} -->
+          <xsl:copy-of select="/fo/xsl-region-body/title/*" />
+          <!-- FIXME : left was {$text-align} -->
           <!--<fo:block text-align="left" padding-before="18pt" padding-after="18pt">-->
-            <xsl:copy-of select="/fo/xsl-region-body/body/*"/>
+          <xsl:copy-of select="/fo/xsl-region-body/body/*" />
           <!--</fo:block>-->
           <fo:block id="term" />
         </fo:flow>
       </fo:page-sequence>
     </fo:root>
   </xsl:template>
-  <xsl:template match="//rootFontFamily"/>
+  <xsl:template match="//rootFontFamily" />
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl Thu Aug 27 12:07:38 2009
@@ -15,10 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <xsl:template match="/">
-    <xsl:copy-of select="forrest:contract/forrest:template/xsl:stylesheet"/>
+    <xsl:copy-of select="forrest:contract/forrest:template/xsl:stylesheet" />
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl Thu Aug 27 12:07:38 2009
@@ -20,19 +20,19 @@
 imported document2html.xsl for details.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!--  Templates for "toc" mode.  This will generate a complete
+  <!--  Templates for "toc" mode.  This will generate a complete
         Table of Contents for the document.  This will then be used
         by the site2xhtml to generate a Menu ToC and a Page ToC -->
   <xsl:template name="generate-id">
     <xsl:choose>
       <xsl:when test="@id">
-        <xsl:value-of select="@id"/>
+        <xsl:value-of select="@id" />
       </xsl:when>
       <xsl:when test="title">
-        <xsl:value-of select="title"/>
+        <xsl:value-of select="title" />
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="generate-id(.)"/>
+        <xsl:value-of select="generate-id(.)" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/project-to-text.xsl Thu Aug 27 12:07:38 2009
@@ -19,10 +19,11 @@
     | Replace element for the value on the project descriptor 
     | xmlns:for has to be replaced for the final version
     +-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:for="http://apache.org/forrest" version="1.0">
-  <xsl:import href="lm://transform.xml.copyover.helper"/>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:for="http://apache.org/forrest" version="1.0">
+  <xsl:import href="lm://transform.xml.copyover.helper" />
   <xsl:template match="for:*">
-    <xsl:variable name="ln" select="local-name()"/>
-    <xsl:value-of select="//*[@name = $ln]/@value"/>
+    <xsl:variable name="ln" select="local-name()" />
+    <xsl:value-of select="//*[@name = $ln]/@value" />
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/root-strip.xsl Thu Aug 27 12:07:38 2009
@@ -15,10 +15,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <xsl:template match="/">
-    <xsl:copy-of select="*/*"/>
+    <xsl:copy-of select="*/*" />
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/round-corner-hex.svg.xslt Thu Aug 27 12:07:38 2009
@@ -16,31 +16,36 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:param name="orientation-tb"/>
-  <xsl:param name="orientation-lr"/>
-  <xsl:param name="size"/>
-  <xsl:param name="bg-color-name"/>
-  <xsl:param name="stroke-color-name"/>
-  <xsl:param name="fg-color-name"/>
-<!-- if not all colors are present, don't even try to render the corners -->
+  <xsl:param name="orientation-tb" />
+  <xsl:param name="orientation-lr" />
+  <xsl:param name="size" />
+  <xsl:param name="bg-color-name" />
+  <xsl:param name="stroke-color-name" />
+  <xsl:param name="fg-color-name" />
+  <!-- if not all colors are present, don't even try to render the corners -->
   <xsl:variable name="isize">
     <xsl:choose>
       <xsl:when test="$bg-color-name and $stroke-color-name and $fg-color-name">
-        <xsl:value-of select="$size"/>
+
+        <xsl:value-of select="$size" />
       </xsl:when>
       <xsl:otherwise>0</xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  <xsl:variable name="smallersize" select="number($isize)-1"/>
-  <xsl:variable name="biggersize" select="number($isize)+1"/>
-  <xsl:variable name="bg">fill:#<xsl:value-of select="$bg-color-name"/>;</xsl:variable>
-  <xsl:variable name="fill">fill:#<xsl:value-of select="$fg-color-name"/>;</xsl:variable>
-  <xsl:variable name="stroke">stroke:#<xsl:value-of select="$stroke-color-name"/>;</xsl:variable>
+  <xsl:variable name="smallersize" select="number($isize)-1" />
+  <xsl:variable name="biggersize" select="number($isize)+1" />
+  <xsl:variable name="bg">fill:# 
+  <xsl:value-of select="$bg-color-name" />;</xsl:variable>
+  <xsl:variable name="fill">fill:# 
+  <xsl:value-of select="$fg-color-name" />;</xsl:variable>
+  <xsl:variable name="stroke">stroke:# 
+  <xsl:value-of select="$stroke-color-name" />;</xsl:variable>
   <xsl:template match="/">
     <svg width="{$isize}" height="{$isize}">
-<!-- background -->
-      <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}" style="{$bg}stroke-width:0"/>
-<!-- 0,0 0,-4 4,0 4,-4-->
+      <!-- background -->
+      <rect x="-1" y="-1" width="{$biggersize}" height="{$biggersize}"
+      style="{$bg}stroke-width:0" />
+      <!-- 0,0 0,-4 4,0 4,-4-->
       <xsl:variable name="flip-tb-scale">
         <xsl:choose>
           <xsl:when test="$orientation-tb='t'">1</xsl:when>
@@ -56,31 +61,32 @@
       <xsl:variable name="flip-tb-translate">
         <xsl:choose>
           <xsl:when test="$orientation-tb='t'">0</xsl:when>
-          <xsl:otherwise>-<xsl:value-of select="$isize" />
-          </xsl:otherwise>
+          <xsl:otherwise>- 
+          <xsl:value-of select="$isize" /></xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
       <xsl:variable name="flip-lr-translate">
         <xsl:choose>
           <xsl:when test="$orientation-lr='l'">0</xsl:when>
-          <xsl:otherwise>-<xsl:value-of select="$isize" />
-          </xsl:otherwise>
+          <xsl:otherwise>- 
+          <xsl:value-of select="$isize" /></xsl:otherwise>
         </xsl:choose>
       </xsl:variable>
-<!-- flip transform -->
+      <!-- flip transform -->
       <g transform="scale({$flip-lr-scale},{$flip-tb-scale}) translate({$flip-lr-translate}, {$flip-tb-translate})">
+
         <xsl:call-template name="figure" />
       </g>
     </svg>
   </xsl:template>
   <xsl:template name="figure">
-<!-- Just change shape here -->
+    <!-- Just change shape here -->
     <g transform="translate(0.5 0.5)">
-      <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}" ry="{$smallersize}"
-				 style="{$fill}{$stroke}stroke-width:1"/>
+      <ellipse cx="{$smallersize}" cy="{$smallersize}" rx="{$smallersize}"
+      ry="{$smallersize}" style="{$fill}{$stroke}stroke-width:1" />
     </g>
-<!-- end -->
+    <!-- end -->
   </xsl:template>
-<!--<xsl:template match="*"></xsl:template>
+  <!--<xsl:template match="*"></xsl:template>
   <xsl:template match="text()"></xsl:template>-->
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl Thu Aug 27 12:07:38 2009
@@ -16,44 +16,45 @@
   limitations under the License.
 -->
 <xsl:stylesheet version="1.0"
-  xmlns:forrest="http://apache.org/forrest/properties/1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="lm://transform.xml.dotdots"/>
-  <xsl:import href="lm://transform.xml.pathutils"/>
-  <xsl:param name="path" select="'test.html'"/>
-  <xsl:param name="theme" select="'notheme'"/>
-<!-- Path (..'s) to the root directory -->
+xmlns:forrest="http://apache.org/forrest/properties/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:import href="lm://transform.xml.dotdots" />
+  <xsl:import href="lm://transform.xml.pathutils" />
+  <xsl:param name="path" select="'test.html'" />
+  <xsl:param name="theme" select="'notheme'" />
+  <!-- Path (..'s) to the root directory -->
   <xsl:variable name="root">
     <xsl:call-template name="dotdots">
-      <xsl:with-param name="path" select="$path"/>
+      <xsl:with-param name="path" select="$path" />
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="filename-noext">
     <xsl:call-template name="filename-noext">
-      <xsl:with-param name="path" select="$path"/>
+      <xsl:with-param name="path" select="$path" />
     </xsl:call-template>
   </xsl:variable>
-<!-- Source filename (eg 'foo.xml') of current page -->
+  <!-- Source filename (eg 'foo.xml') of current page -->
   <xsl:variable name="filename">
     <xsl:call-template name="filename">
-      <xsl:with-param name="path" select="$path"/>
+      <xsl:with-param name="path" select="$path" />
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="skin-img-dir"
-    select="concat(string($root), 'themes/images')"/>
-  <xsl:variable name="spacer" select="concat($root, 'themer/images/spacer.gif')"/>
+  select="concat(string($root), 'themes/images')" />
+  <xsl:variable name="spacer"
+  select="concat($root, 'themer/images/spacer.gif')" />
   <xsl:template match="/">
     <properties>
-      <property name="skin-img-dir" value="{$skin-img-dir}"/>
-      <property name="filename" value="{$filename}"/>
-      <property name="filename-noext" value="{$filename-noext}"/>
-      <property name="root" value="{$root}"/>
-      <property name="path" value="{$path}"/>
-      <property name="theme" value="{$theme}"/>
-      <xsl:apply-templates select="forrest:properties/forrest:property"/>
+      <property name="skin-img-dir" value="{$skin-img-dir}" />
+      <property name="filename" value="{$filename}" />
+      <property name="filename-noext" value="{$filename-noext}" />
+      <property name="root" value="{$root}" />
+      <property name="path" value="{$path}" />
+      <property name="theme" value="{$theme}" />
+      <xsl:apply-templates select="forrest:properties/forrest:property" />
     </properties>
   </xsl:template>
   <xsl:template match="forrest:property">
-    <property name="{@name}" value="{@value}"/>
+    <property name="{@name}" value="{@value}" />
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl Thu Aug 27 12:07:38 2009
@@ -20,34 +20,38 @@
 details.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="lm://transform.book.menu"/>
+  <xsl:import href="lm://transform.book.menu" />
   <xsl:template match="book">
     <div id="menu">
       <ul>
-        <xsl:apply-templates select="menu"/>
+        <xsl:apply-templates select="menu" />
       </ul>
     </div>
   </xsl:template>
   <xsl:template match="menu">
-    <li><h1>
-        <xsl:value-of select="@label"/>
+    <li>
+      <h1>
+        <xsl:value-of select="@label" />
       </h1>
       <ul>
-        <xsl:apply-templates/>
-      </ul></li>
+        <xsl:apply-templates />
+      </ul>
+    </li>
   </xsl:template>
-  <xsl:template match="menu-item[@type='hidden']"/>
+  <xsl:template match="menu-item[@type='hidden']" />
   <xsl:template match="menu-item">
-    <li><xsl:apply-imports/></li>
+    <li>
+      <xsl:apply-imports />
+    </li>
   </xsl:template>
   <xsl:template name="selected">
     <div class="current">
-      <xsl:value-of select="@label"/>
+      <xsl:value-of select="@label" />
     </div>
   </xsl:template>
   <xsl:template name="print-external">
     <font color="#ffcc00">
-      <xsl:apply-imports/>
+      <xsl:apply-imports />
     </font>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl Thu Aug 27 12:07:38 2009
@@ -20,24 +20,24 @@
 imported document2html.xsl for details.
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="lm://transform.xdoc.html"/>
-  <xsl:include href="lm://transform.xml.generateId"/>
-  <xsl:variable name="skin-img-dir" select="concat(string($root), 'themes/images')"/>
-
-  <xsl:template match="body" mode="toc"/>
+  <xsl:import href="lm://transform.xdoc.html" />
+  <xsl:include href="lm://transform.xml.generateId" />
+  <xsl:variable name="skin-img-dir"
+  select="concat(string($root), 'themes/images')" />
+  <xsl:template match="body" mode="toc" />
   <xsl:template match="document">
     <div id="content">
       <xsl:if test="normalize-space(header/title)!=''">
         <h1>
-          <xsl:value-of select="header/title"/>
+          <xsl:value-of select="header/title" />
         </h1>
       </xsl:if>
       <xsl:if test="normalize-space(header/subtitle)!=''">
         <h3>
-          <xsl:value-of select="header/subtitle"/>
+          <xsl:value-of select="header/subtitle" />
         </h3>
       </xsl:if>
-<!--
+      <!--
       <xsl:apply-templates select="header/type"/>
       <xsl:apply-templates select="header/notice"/>
       <xsl:apply-templates select="header/abstract"/>
@@ -52,116 +52,120 @@
       </div>
     -->
       <div id="content-main">
-        <xsl:apply-templates select="body"/>
+        <xsl:apply-templates select="body" />
       </div>
     </div>
   </xsl:template>
   <xsl:template match="body">
-    <xsl:apply-templates/>
+    <xsl:apply-templates />
   </xsl:template>
-  <xsl:template name="tocLinkGenerator"><a>
-    <xsl:attribute name="name">
-      <xsl:call-template 
-        name="generate-id"/>
-    </xsl:attribute>
-    <xsl:attribute name="title">
-      <xsl:value-of select="title"/>
-    </xsl:attribute>
-<xsl:text> </xsl:text></a>
+  <xsl:template name="tocLinkGenerator">
+    <a>
+      <xsl:attribute name="name">
+        <xsl:call-template name="generate-id" />
+      </xsl:attribute>
+      <xsl:attribute name="title">
+        <xsl:value-of select="title" />
+      </xsl:attribute>
+      <xsl:text>
+ 
+</xsl:text>
+    </a>
   </xsl:template>
-<!--<xsl:template match="@id">
+  <!--<xsl:template match="@id">
     <xsl:apply-imports/>
   </xsl:template>-->
-<!-- Generate a <a name="..."> tag for an @id -->
-<!--<xsl:template match="@id">
+  <!-- Generate a <a name="..."> tag for an @id -->
+  <!--<xsl:template match="@id">
     <xsl:if test="normalize-space(.)!=''">
       <a name="{.}">&#160;</a>
     </xsl:if>
   </xsl:template>-->
   <xsl:template match="section">
-    <xsl:call-template name="tocLinkGenerator"/>
-<!-- <xsl:apply-templates select="@id"/>-->
-    <xsl:variable name = "level" select = "count(ancestor::section)+1" />
+    <xsl:call-template name="tocLinkGenerator" />
+    <!-- <xsl:apply-templates select="@id"/>-->
+    <xsl:variable name="level" select="count(ancestor::section)+1" />
     <xsl:choose>
       <xsl:when test="$level=1">
         <div class="skinconf-heading-{$level}">
           <h1>
-            <xsl:value-of select="title"/>
+            <xsl:value-of select="title" />
           </h1>
         </div>
         <div class="section">
-          <xsl:apply-templates select="*[not(self::title)]"/>
+          <xsl:apply-templates select="*[not(self::title)]" />
         </div>
       </xsl:when>
       <xsl:when test="$level=2">
         <div class="skinconf-heading-{$level}">
           <h2>
-            <xsl:value-of select="title"/>
+            <xsl:value-of select="title" />
           </h2>
         </div>
         <div class="section">
-          <xsl:apply-templates select="*[not(self::title)]"/>
+          <xsl:apply-templates select="*[not(self::title)]" />
         </div>
       </xsl:when>
-<!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
+      <!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
       <xsl:when test="$level=3 and $notoc='true'">
         <h4 class="faq">
-          <xsl:value-of select="title"/>
+          <xsl:value-of select="title" />
         </h4>
-        <div align="right"><a href="#{@id}-menu">^</a>
+        <div align="right">
+          <a href="#{@id}-menu">^</a>
         </div>
         <div style="margin-left: 15px">
-          <xsl:apply-templates select="*[not(self::title)]"/>
+          <xsl:apply-templates select="*[not(self::title)]" />
         </div>
       </xsl:when>
       <xsl:when test="$level=3">
         <h4>
-          <xsl:value-of select="title"/>
+          <xsl:value-of select="title" />
         </h4>
-        <xsl:apply-templates select="*[not(self::title)]"/>
+        <xsl:apply-templates select="*[not(self::title)]" />
       </xsl:when>
       <xsl:otherwise>
         <h5>
-          <xsl:value-of select="title"/>
+          <xsl:value-of select="title" />
         </h5>
-        <xsl:apply-templates select="*[not(self::title)]"/>
+        <xsl:apply-templates select="*[not(self::title)]" />
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
   <xsl:template match="figure">
-    <xsl:apply-templates select="@id"/>
+    <xsl:apply-templates select="@id" />
     <div style="text-align: center;">
       <img src="{@src}" alt="{@alt}" class="figure">
         <xsl:if test="@height">
           <xsl:attribute name="height">
-            <xsl:value-of select="@height"/>
+            <xsl:value-of select="@height" />
           </xsl:attribute>
         </xsl:if>
         <xsl:if test="@width">
           <xsl:attribute name="width">
-            <xsl:value-of select="@width"/>
+            <xsl:value-of select="@width" />
           </xsl:attribute>
         </xsl:if>
       </img>
     </div>
   </xsl:template>
   <xsl:template match="note | warning | fixme">
-    <xsl:apply-templates select="@id"/>
+    <xsl:apply-templates select="@id" />
     <div class="{local-name()}">
       <div class="label">
         <xsl:choose>
-<!-- FIXME: i18n Transformer here -->
+          <!-- FIXME: i18n Transformer here -->
           <xsl:when test="@label">
-            <xsl:value-of select="@label"/>
+            <xsl:value-of select="@label" />
           </xsl:when>
           <xsl:when test="local-name() = 'note'">Note</xsl:when>
           <xsl:when test="local-name() = 'warning'">Warning</xsl:when>
-          <xsl:otherwise>Fixme (<xsl:value-of 
-            select="@author"/>)</xsl:otherwise>
+          <xsl:otherwise>Fixme ( 
+          <xsl:value-of select="@author" />)</xsl:otherwise>
         </xsl:choose>
       </div>
       <div class="content">
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </div>
     </div>
   </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl Thu Aug 27 12:07:38 2009
@@ -15,30 +15,34 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0" 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:template match="/">
-    <xsl:apply-templates/>
+    <xsl:apply-templates />
   </xsl:template>
-<!--This template will match the different combinations for hooks-->
+  <!--This template will match the different combinations for hooks-->
   <xsl:template match="forrest:hook">
     <xsl:if test="@type='block' or not(@type)">
       <div>
-        <xsl:call-template name="attributes"/>
+        <xsl:call-template name="attributes" />
         <xsl:if test="@nbsp='true'">
-<xsl:text> </xsl:text>
+          <xsl:text>
+ 
+</xsl:text>
         </xsl:if>
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </div>
     </xsl:if>
     <xsl:if test="@type='inline'">
       <span id="{@name}">
-        <xsl:call-template name="attributes"/>
+        <xsl:call-template name="attributes" />
         <xsl:if test="@nbsp='true'">
-<xsl:text> </xsl:text>
+          <xsl:text>
+ 
+</xsl:text>
         </xsl:if>
-        <xsl:apply-templates/>
+        <xsl:apply-templates />
       </span>
     </xsl:if>
   </xsl:template>
@@ -56,8 +60,7 @@
   </xsl:template>
   <xsl:template match="@*|*|text()|processing-instruction()|comment()">
     <xsl:copy>
-      <xsl:apply-templates 
-        select="@*|*|text()|processing-instruction()|comment()"/>
+      <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()" />
     </xsl:copy>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/strip-dispatcher-remains.xsl Thu Aug 27 12:07:38 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -15,12 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<xsl:stylesheet version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:template match="/">
     <html xmlns="http://www.w3.org/1999/xhtml">
-      <xsl:copy-of select="html/head"/>
-      <xsl:copy-of select="html/body"/>
+      <xsl:copy-of select="html/head" />
+      <xsl:copy-of select="html/body" />
     </html>
   </xsl:template>
 </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/tab-to-menu.xsl Thu Aug 27 12:07:38 2009
@@ -38,14 +38,14 @@
 
 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="lm://transform.tab.menu"/>
+  <xsl:import href="lm://transform.tab.menu" />
   <xsl:template match="tabs">
     <ul id="nav-main">
-      <xsl:call-template name="base-tabs"/>
+      <xsl:call-template name="base-tabs" />
     </ul>
     <xsl:if test="tab[@dir=$longest-dir]/tab">
       <div id="nav-main-sub">
-        <xsl:call-template name="level2tabs"/>
+        <xsl:call-template name="level2tabs" />
       </div>
     </xsl:if>
   </xsl:template>
@@ -53,15 +53,19 @@
   <xsl:template name="post-separator"></xsl:template>
   <xsl:template name="separator"></xsl:template>
   <xsl:template name="selected">
-    <li class="current"><xsl:call-template name="base-selected"/></li>
+    <li class="current">
+      <xsl:call-template name="base-selected" />
+    </li>
   </xsl:template>
   <xsl:template name="not-selected">
-    <li><xsl:call-template name="base-not-selected"/></li>
+    <li>
+      <xsl:call-template name="base-not-selected" />
+    </li>
   </xsl:template>
   <xsl:template name="level2-not-selected">
-    <xsl:call-template name="base-not-selected"/>
+    <xsl:call-template name="base-not-selected" />
   </xsl:template>
   <xsl:template name="level2-selected">
-    <xsl:call-template name="base-selected"/>
+    <xsl:call-template name="base-selected" />
   </xsl:template>
 </xsl:stylesheet>



Mime
View raw message