forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [7/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/src/documentation/content/xdocs/news.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/news.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
@@ -15,34 +15,33 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN" 
-  "http://forrest.apache.org/dtd/document-v20.dtd">
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+"http://forrest.apache.org/dtd/document-v20.dtd">
 <document>
   <header>
     <title>News about recent changes</title>
   </header>
   <body>
-    <warning>
-      The "dispatcher" is new functionality which is still in development phase.
-      That is why it is in the "whiteboard" section of the Forrest distribution.
-      We are working at the moment on moving this plugin from the whiteboard
-      into the core plugins. Further all dispatcher related documents will be
-      moved into the plugin as well. See
-      <a 
-      href="http://forrest.apache.org/docs_0_80/status-themes.html">Status
-      of Themes: Skins and Dispatcher</a>.
-    </warning>
+    <warning>The "dispatcher" is new functionality which is still in
+    development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. We are working at the moment on moving this plugin
+    from the whiteboard into the core plugins. Further all dispatcher related
+    documents will be moved into the plugin as well. See 
+    <a href="http://forrest.apache.org/docs_0_80/status-themes.html">Status of
+    Themes: Skins and Dispatcher</a>.</warning>
     <!-- FIFO order: first in first out
       Add new events to the top. -->
     <section id="cleanup.15.06.07">
       <title>Cleanup of the locationmap - 15.06.07</title>
-      <p> The locationmap matching for the structurer needed a cleanup. Structurer needs to
-        be placed now in
-        <code>${project.resources-dir}/structurer/url</code> instead of the xdocs
-        directory. </p>
-      <p>The following matches have been removed during this cleanup (you need to implement
-        them in your project locationmap if you still want their behavior.</p>
-      <source><![CDATA[<match pattern="resolve.structurer.**">
+      <p>The locationmap matching for the structurer needed a cleanup.
+      Structurer needs to be placed now in 
+      <code>${project.resources-dir}/structurer/url</code>instead of the xdocs
+      directory.</p>
+      <p>The following matches have been removed during this cleanup (you need
+      to implement them in your project locationmap if you still want their
+      behavior.</p>
+      <source>
+        <![CDATA[<match pattern="resolve.structurer.**">
   <select type="exists">
 <!-- ... -->
     <!-- project-based url-based (xdocs location) -->
@@ -62,7 +61,7 @@
 <!-- ... -->
   </select>
 </match>      ]]>
-      </source>
+</source>
     </section>
   </body>
 </document>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/site.xml Thu Aug 27 12:07:38 2009
@@ -28,27 +28,33 @@
 
 See http://forrest.apache.org/docs/linking.html for more info
 -->
-<site label="org.apache.forrest.plugin.internal.views" href="" xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
+<site label="org.apache.forrest.plugin.internal.views" href=""
+xmlns="http://apache.org/forrest/linkmap/1.0" tab="">
   <about label="About">
-    <dispatcher-concept label="Dispatcher development" href="index.html"/>
-    <news label="News" href="news.html" description="News about changes"/>
-    <glossary label="Glossary" href="dispatcher-glossary.html" description="Dispactcher related terms and meanings" />
-    <changes label="Changes" href="changes.html" description="History of Changes" />
+    <dispatcher-concept label="Dispatcher development" href="index.html" />
+    <news label="News" href="news.html" description="News about changes" />
+    <glossary label="Glossary" href="dispatcher-glossary.html"
+    description="Dispactcher related terms and meanings" />
+    <changes label="Changes" href="changes.html"
+    description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>
   <dispatcher label="How to" tab="how">
-    <quickstart label="Quickstart" href="how/howto-dispatcher-quickstart.html"/>
-    <structurer label="Structurer" href="how/howto-dispatcher-structurer.html"/>
-    <contracts label="Contracts" href="how/howto-dispatcher-contracts.html"/>
-    <perFolderThemes label="Per Folder/File Themes" href="how/perFolderThemes/index.html"/> 
+    <quickstart label="Quickstart"
+    href="how/howto-dispatcher-quickstart.html" />
+    <structurer label="Structurer"
+    href="how/howto-dispatcher-structurer.html" />
+    <contracts label="Contracts" href="how/howto-dispatcher-contracts.html" />
+    <perFolderThemes label="Per Folder/File Themes"
+    href="how/perFolderThemes/index.html" />
   </dispatcher>
   <internals label="Internals" tab="int" href="int/">
-    <index label="Overview" href="index.html"/>
+    <index label="Overview" href="index.html" />
   </internals>
   <examples label="Examples" tab="examples" href="examples/">
-          <index label="Overview" href="index.html"/>
+    <index label="Overview" href="index.html" />
   </examples>
-<!--
+  <!--
   The href must be wholesite.html/pdf  You can change the labels and node names
   <all label="All">
     <whole_site_html label="Whole Site HTML" href="wholesite.html"/>
@@ -57,14 +63,14 @@
   -->
   <external-refs>
     <forrest href="http://forrest.apache.org/">
-      <linking href="docs/linking.html"/>
-      <validation href="docs/validation.html"/>
-      <webapp href="docs/your-project.html#webapp"/>
-      <dtd-docs href="docs/dtd-docs.html"/>
-      <dtd-docs href="issues.html"/>
-      <mail-lists href="mail-lists.html"/>
-      <status-themes href="docs_0_80/status-themes.html"/>
-      <forrestbar href="tools/forrestbar.html"/>
+      <linking href="docs/linking.html" />
+      <validation href="docs/validation.html" />
+      <webapp href="docs/your-project.html#webapp" />
+      <dtd-docs href="docs/dtd-docs.html" />
+      <dtd-docs href="issues.html" />
+      <mail-lists href="mail-lists.html" />
+      <status-themes href="docs_0_80/status-themes.html" />
+      <forrestbar href="tools/forrestbar.html" />
     </forrest>
     <sun href="http://java.sun.com/">
       <j2ee href="j2ee/">
@@ -78,12 +84,12 @@
         <dispatcherView href="DispatcherView.htm" />
       </patterns>
     </corej2eepatterns>
-    <cocoon href="http://cocoon.apache.org/"/>
-    <xml.apache.org href="http://xml.apache.org/"/>
+    <cocoon href="http://cocoon.apache.org/" />
+    <xml.apache.org href="http://xml.apache.org/" />
     <mailings href="http://marc.theaimsgroup.com/?">
       <dev href="l=forrest-dev&amp;">
-        <pInfra href="m=110019697426791&amp;w=2"/>
-        <ftLeather href="m=109959086204887&amp;w=2"/>
+        <pInfra href="m=110019697426791&amp;w=2" />
+        <ftLeather href="m=109959086204887&amp;w=2" />
       </dev>
     </mailings>
   </external-refs>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/tabs.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
@@ -15,12 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
-<tabs software="MyProj"
-  title="MyProj"
-  copyright="Foo"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
-<!-- The rules for tabs are:
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN"
+"http://forrest.apache.org/dtd/tab-cocoon-v11.dtd">
+<tabs software="MyProj" title="MyProj" copyright="Foo"
+xmlns:xlink="http://www.w3.org/1999/xlink">
+  <!-- The rules for tabs are:
     @dir will always have '/@indexfile' added.
     @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
     @href is not modified unless it is root-relative and obviously specifies a
@@ -30,12 +29,14 @@
    Tabs can be embedded to a depth of two. The second level of tabs will only 
     be displayed when their parent tab is selected.    
   -->
-  <tab id="plugins" label="Forrest Plugins" href="http://forrest.apache.org/pluginDocs" indexfile="index.html"/>
-  <tab id="" label="Home" dir="" indexfile="index.html"/>
-  <tab id="how" label="HowTo" dir="how" indexfile="howto-dispatcher-quickstart.html"/>
-  <tab id="int" label="Internals" dir="int" indexfile="index.html"/>
-  <tab id="examples" label="Examples" dir="examples" indexfile="index.html"/>
-<!-- Add new tabs here, eg:
+  <tab id="plugins" label="Forrest Plugins"
+  href="http://forrest.apache.org/pluginDocs" indexfile="index.html" />
+  <tab id="" label="Home" dir="" indexfile="index.html" />
+  <tab id="how" label="HowTo" dir="how"
+  indexfile="howto-dispatcher-quickstart.html" />
+  <tab id="int" label="Internals" dir="int" indexfile="index.html" />
+  <tab id="examples" label="Examples" dir="examples" indexfile="index.html" />
+  <!-- Add new tabs here, eg:
   <tab label="How-Tos" dir="community/howto/"/>
   <tab label="XML Site" dir="xml-site/"/>
   -->

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/examples/pelt.fv 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,29 +15,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-<!-- The following variables are used to contact data models and/or contracts. -->
-  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
-  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
-  <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
+<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <!-- The following variables are used to contact data models and/or contracts. -->
+  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}" />
+  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}" />
+  <jx:set var="getRequestExtension"
+  value="#{$cocoon/parameters/getRequestExtension}" />
   <forrest:view type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo" />
   </forrest:view>
-<!-- CSS View of the request e.g. index.dispatcher.css -->
+  <!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:view type="css" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.pelt-css"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-css" />
   </forrest:view>
-<!-- HTML View of the request (e.g. index.html)-->
+  <!-- HTML View of the request (e.g. index.html)-->
   <forrest:view type="html" hooksXpath="/html/body">
-    <jx:import uri="cocoon://prepare.panels.pelt-html.head"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.head" />
     <forrest:hook name="container">
-      <jx:import uri="cocoon://prepare.panels.pelt-html.header"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.header" />
       <forrest:hook name="page">
-        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar"/>
-        <jx:import uri="cocoon://prepare.panels.pelt-html.example-specific"/>
+        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar" />
+        <jx:import uri="cocoon://prepare.panels.pelt-html.example-specific" />
       </forrest:hook>
-      <jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.footer" />
     </forrest:hook>
   </forrest:view>
 </forrest:views>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/structurer/url/how/perFolderThemes/subFolder/pelt.fv 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,29 +15,30 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-<!-- The following variables are used to contact data models and/or contracts. -->
-  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
-  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
-  <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
+<forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <!-- The following variables are used to contact data models and/or contracts. -->
+  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}" />
+  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}" />
+  <jx:set var="getRequestExtension"
+  value="#{$cocoon/parameters/getRequestExtension}" />
   <forrest:view type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo" />
   </forrest:view>
-<!-- CSS View of the request e.g. index.dispatcher.css -->
+  <!-- CSS View of the request e.g. index.dispatcher.css -->
   <forrest:view type="css" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.pelt-css"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-css" />
   </forrest:view>
-<!-- HTML View of the request (e.g. index.html)-->
+  <!-- HTML View of the request (e.g. index.html)-->
   <forrest:view type="html" hooksXpath="/html/body">
-    <jx:import uri="cocoon://prepare.panels.pelt-html.head"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.head" />
     <forrest:hook name="container">
-      <jx:import uri="cocoon://prepare.panels.pelt-html.header"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.header" />
       <forrest:hook name="page">
-        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar"/>
-        <jx:import uri="cocoon://prepare.panels.pelt-html.content-specific"/>
+        <jx:import uri="cocoon://prepare.panels.pelt-html.leftbar" />
+        <jx:import uri="cocoon://prepare.panels.pelt-html.content-specific" />
       </forrest:hook>
-      <jx:import uri="cocoon://prepare.panels.pelt-html.footer"/>
+      <jx:import uri="cocoon://prepare.panels.pelt-html.footer" />
     </forrest:hook>
   </forrest:view>
 </forrest:views>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.content-specific.panel.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
@@ -16,21 +16,21 @@
   limitations under the License.
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="content">
     <forrest:contract name="content-title"
-      dataURI="cocoon://#{$getRequest}.title.xml"/>
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     <forrest:contract name="content-abstract"
-      dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     <forrest:contract name="content-minitoc"
-      dataURI="cocoon://#{$getRequest}.toc.xml">
-      <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1"
-        location="page"/>
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      <forrest:property name="content-minitoc-conf" max-depth="2"
+      min-sections="1" location="page" />
     </forrest:contract>
     <forrest:contract name="content-main"
-      dataURI="cocoon://#{$getRequest}.body.xml">
+    dataURI="cocoon://#{$getRequest}.body.xml">
       <forrest:property name="content-main-conf">
-        <headings type="underlined"/>
+        <headings type="underlined" />
       </forrest:property>
     </forrest:contract>
     <!--

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.example-specific.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.example-specific.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.example-specific.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.example-specific.panel.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
@@ -16,29 +16,28 @@
   limitations under the License.
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:hook name="content">
     <forrest:hook name="export-link">
-      <forrest:contract name="content-pod-link"/>
+      <forrest:contract name="content-pod-link" />
     </forrest:hook>
-    
     <!-- FIXME - Problem with ndeSetTextSize() script from fontsize.js not compliant between Pelt and Leather-dev... -->
     <forrest:hook class="trail">
-      <forrest:contract name="branding-fontsize"/>
+      <forrest:contract name="branding-fontsize" />
     </forrest:hook>
     <forrest:contract name="content-title"
-      dataURI="cocoon://#{$getRequest}.title.xml"/>
+    dataURI="cocoon://#{$getRequest}.title.xml" />
     <forrest:contract name="content-abstract"
-      dataURI="cocoon://#{$getRequest}.abstract.xml"/>
+    dataURI="cocoon://#{$getRequest}.abstract.xml" />
     <forrest:contract name="content-minitoc"
-      dataURI="cocoon://#{$getRequest}.toc.xml">
-      <forrest:property name="content-minitoc-conf" max-depth="2" min-sections="1"
-        location="page"/>
+    dataURI="cocoon://#{$getRequest}.toc.xml">
+      <forrest:property name="content-minitoc-conf" max-depth="2"
+      min-sections="1" location="page" />
     </forrest:contract>
     <forrest:contract name="content-main"
-      dataURI="cocoon://#{$getRequest}.body.xml">
+    dataURI="cocoon://#{$getRequest}.body.xml">
       <forrest:property name="content-main-conf">
-        <headings type="underlined"/>
+        <headings type="underlined" />
       </forrest:property>
     </forrest:contract>
     <!--

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/resources/themes/pelt/panels/pelt-html.header.panel.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
@@ -16,44 +16,46 @@
   limitations under the License.
 -->
 <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:contract name="branding-breadcrumbs">
     <forrest:property name="branding-breadcrumbs">
       <trail>
-        <link1 name="Apache Forrest" href="http://forrest.apache.org/"/>
+        <link1 name="Apache Forrest" href="http://forrest.apache.org/" />
       </trail>
     </forrest:property>
   </forrest:contract>
   <forrest:hook name="header">
     <forrest:contract name="branding-tagline">
-      <forrest:property name="branding-tagline-name">new seed</forrest:property>
+      <forrest:property name="branding-tagline-name">new
+      seed</forrest:property>
       <forrest:property name="branding-tagline-tagline">powered by the
-        dispatcher</forrest:property>
+      dispatcher</forrest:property>
     </forrest:contract>
     <forrest:hook class="logo">
       <forrest:contract name="branding-logo">
         <forrest:property name="branding-logo-name">Apache Forrest
-          Logo</forrest:property>
+        Logo</forrest:property>
         <forrest:property name="branding-logo-description">Apache
-          Forrest</forrest:property>
+        Forrest</forrest:property>
         <forrest:property name="branding-logo-url">
-          http://forrest.apache.org/</forrest:property>
+        http://forrest.apache.org/</forrest:property>
         <forrest:property name="branding-logo-logo">
-          images/project-logo.gif</forrest:property>
+        images/project-logo.gif</forrest:property>
       </forrest:contract>
     </forrest:hook>
     <forrest:hook class="logo">
       <forrest:contract name="branding-logo">
-        <forrest:property name="branding-logo-name">plugin logo</forrest:property>
+        <forrest:property name="branding-logo-name">plugin
+        logo</forrest:property>
         <forrest:property name="branding-logo-description">
-          org.apache.forrest.plugin.internal.dispatcher plugin for Apache
-          Forrest</forrest:property>
+        org.apache.forrest.plugin.internal.dispatcher plugin for Apache
+        Forrest</forrest:property>
         <forrest:property name="branding-logo-url">
-          http://forrest.apache.org/pluginDocs/</forrest:property>
+        http://forrest.apache.org/pluginDocs/</forrest:property>
         <forrest:property name="branding-logo-logo">
-          images/project.png</forrest:property>
+        images/project.png</forrest:property>
       </forrest:contract>
     </forrest:hook>
-    <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main"/>
+    <jx:import uri="cocoon://prepare.panels.pelt-html.nav-main" />
   </forrest:hook>
 </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/skinconf.xml Thu Aug 27 12:07:38 2009
@@ -15,13 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN" "http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.7-1//EN"
+"http://forrest.apache.org/dtd/skinconfig-v07-1.dtd"
 [
   <!ENTITY skinconf-common PUBLIC "-//Apache Forrest//ENTITIES Skin Configuration common plugins V0.7-1//EN" "">
 ]>
-<skinconfig>
-  &skinconf-common;
-
-  <project-name>Plugin: dispatcher internal</project-name>
-  <project-description>org.apache.forrest.plugin.internal.dispatcher plugin for Apache Forrest</project-description>
-</skinconfig>
+<skinconfig>&skinconf-common; 
+<project-name>Plugin: dispatcher internal</project-name>
+<project-description>org.apache.forrest.plugin.internal.dispatcher plugin for
+Apache Forrest</project-description></skinconfig>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/ContractHandler.java Thu Aug 27 12:07:38 2009
@@ -143,12 +143,7 @@
    * @param length
    */
   private String cleanCharacters(char[] ch, int start, int length) {
-    StringBuffer buffer = new StringBuffer();
-    for (int i = 0; i < length; i++) {
-      char c = ch[start + i];
-      buffer.append(c);
-    }
-    return StringEscapeUtils.escapeXml(buffer.toString().trim());
+    return StringEscapeUtils.escapeXml(new String(ch,start,length));
   }
 
 }

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/java/org/apache/forrest/dispatcher/impl/helper/EchoHandler.java Thu Aug 27 12:07:38 2009
@@ -19,6 +19,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.UnsupportedEncodingException;
 
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
@@ -188,25 +190,11 @@
    * @see org.xml.sax.helpers.DefaultHandler#characters(char[], int, int)
    */
   public void characters(char ch[], int start, int length) throws SAXException {
-    boolean ignorSpace = true;
-    for (int i = 0; i < length; i++) {
-      char c = ch[start + i];
-      if (c == '&') {
-        emit("&amp;");
-      } else if (c == '<') {
-        emit("&lt;");
-      } else if (c == '>') {
-        emit("&gt;");
-      } else if(c!='\n'){
-        // this is a workaround to ignore whitespaces that are not needed.
-        if(c==' ' && !ignorSpace){
-          emit(c);
-          ignorSpace=false;
-        }else if (c!=' '){
-          emit(c);
-          ignorSpace=false;
-        }
-      }
+    String outPut = new String(ch,start,length);
+    //outPut=StringUtils.trimToEmpty(outPut);
+    outPut=StringEscapeUtils.escapeXml(outPut);
+    if(!StringUtils.isEmpty(outPut)){
+      emit(outPut);
     }
   }
 

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/common.fv 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,16 +15,11 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-  
 <forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
   <forrest:view type="html" hooksXpath="/html/body">
     <forrest:contract name="genericMarkup">
-      <forrest:property name="genericMarkup">
-        placeholder
-      </forrest:property>
+      <forrest:property name="genericMarkup">placeholder</forrest:property>
     </forrest:contract>
   </forrest:view>
-  
-</forrest:views>
\ No newline at end of file
+</forrest:views>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/convertor.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,46 +14,46 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="convertor">
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="convertor">
   <description>
-    <p> This is a test convertor to develop a component that allows user
-    to convert from the former version of the dispatcher to this one.</p>
+    <p>This is a test convertor to develop a component that allows user to
+    convert from the former version of the dispatcher to this one.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="convertor"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="convertor"/>]]>
+</usage>
   <forrest:template name="convertor" inputFormat="xsl">
     <xsl:stylesheet version="1.0"
-      xmlns:forrest="http://apache.org/forrest/templates/1.0"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:forrest="http://apache.org/forrest/templates/1.0"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-           <forrest:structurer
-           xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-             <xsl:apply-templates/>
-           </forrest:structurer>
+            <forrest:structurer xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+
+              <xsl:apply-templates />
+            </forrest:structurer>
           </forrest:part>
         </forrest:content>
       </xsl:template>
-      <xsl:template match="*[local-name()='view'] ">
+      <xsl:template match="*[local-name()='view']">
         <forrest:structure>
-          <xsl:copy-of select="@*"/>
-          <xsl:apply-templates/>
+          <xsl:copy-of select="@*" />
+          <xsl:apply-templates />
         </forrest:structure>
       </xsl:template>
       <xsl:template match="*[local-name()='contract']">
         <forrest:contract>
-          <xsl:copy-of select="@*"/>
-          <xsl:apply-templates/>
+          <xsl:copy-of select="@*" />
+          <xsl:apply-templates />
         </forrest:contract>
       </xsl:template>
       <xsl:template match="*[local-name()='property']">
         <forrest:property>
-          <xsl:copy-of select="@*"/>
-          <xsl:apply-templates/>
+          <xsl:copy-of select="@*" />
+          <xsl:apply-templates />
         </forrest:property>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/fo.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,27 +14,27 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="fo">
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="fo">
   <description>
-    <p> This is just a test contract for using in junit.</p>
+    <p>This is just a test contract for using in junit.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="fo"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="fo"/>]]>
+</usage>
   <forrest:template name="fo" inputFormat="xsl">
     <xsl:stylesheet version="1.0"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="test-inline" select="'No parameter has been passed'" />
-      <xsl:param name="test-inline-xml" select="'No xml parameter has been passed'" />
+      <xsl:param name="test-inline-xml"
+      select="'No xml parameter has been passed'" />
       <xsl:template match="/">
         <forrest:content xmlns:forrest="http://apache.org/forrest/templates/1.0"
-         xmlns:fo="http://www.w3.org/1999/XSL/Format">
+        xmlns:fo="http://www.w3.org/1999/XSL/Format">
           <forrest:part>
-           <fo:bookmark>
-            Another test! </fo:bookmark>
+            <fo:bookmark>Another test!</fo:bookmark>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/m2.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,26 +14,25 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="m2">
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="m2">
   <description>
-    <p> This is just a test contract for using in junit.</p>
+    <p>This is just a test contract for using in junit.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="m2"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="m2"/>]]>
+</usage>
   <forrest:template name="m2" inputFormat="xsl">
     <xsl:stylesheet version="1.0"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="test-inline" select="'No parameter has been passed'" />
-      <xsl:param name="test-inline-xml" select="'No xml parameter has been passed'" />
+      <xsl:param name="test-inline-xml"
+      select="'No xml parameter has been passed'" />
       <xsl:template match="/">
         <forrest:content xmlns:forrest="http://apache.org/forrest/templates/1.0">
-          <forrest:part>
-            Another test! $test-inline:
-            <xsl:value-of select="$test-inline" />
-            $test-inline-xml:
-            <xsl:copy-of select="$test-inline-xml" />
-          </forrest:part>
+
+          <forrest:part>Another test! $test-inline: 
+          <xsl:value-of select="$test-inline" />$test-inline-xml: 
+          <xsl:copy-of select="$test-inline-xml" /></forrest:part>
           <forrest:part xpath="/html/head">
             <meta content="m2 - another test" name="Description" />
           </forrest:part>
@@ -41,4 +40,4 @@
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.advanced.structurer.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -19,14 +19,17 @@
       <forrest:contract name="master">
         <forrest:property name="test-inline-xml">
           <css url="common.css" />
-<!--<nupp/>-->
+          <!--<nupp/>-->
         </forrest:property>
-        <forrest:property name="test-inline" value="position:hook/forrest:contract" />
+        <forrest:property name="test-inline"
+        value="position:hook/forrest:contract" />
       </forrest:contract>
       <forrest:hook id="level2">
         <forrest:contract name="master">
-          <forrest:property name="test-inline" value="position:hook/hook/forrest:contract" />
-          <forrest:property name="injectPointBody" value="/html/body/forrest:hook/forrest:hook[@id='level2' and @ie='level2']/hook" /> 
+          <forrest:property name="test-inline"
+          value="position:hook/hook/forrest:contract" />
+          <forrest:property name="injectPointBody"
+          value="/html/body/forrest:hook/forrest:hook[@id='level2' and @ie='level2']/hook" />
         </forrest:contract>
       </forrest:hook>
     </forrest:hook>
@@ -37,9 +40,10 @@
     </forrest:hook>
   </forrest:structure>
   <forrest:structure type="xml" hooksXpath="/">
-    <forrest:contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv" />
+    <forrest:contract name="convertor"
+    dataURI="/org/apache/forrest/dispatcher/common.fv" />
   </forrest:structure>
   <forrest:structure type="fo" hooksXpath="/">
     <forrest:contract name="fo" />
   </forrest:structure>
-</forrest:structurer>
\ No newline at end of file
+</forrest:structurer>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,44 +14,41 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="master">
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="master">
   <description>
-    <p> This is just a master contract, it will output something but
-      *nothing* in special. It should just serve to explain a wee bit
-      contracts and what you can do with them.</p>
+    <p>This is just a master contract, it will output something but *nothing*
+    in special. It should just serve to explain a wee bit contracts and what
+    you can do with them.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="master"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="master"/>]]>
+</usage>
   <forrest:template name="master" inputFormat="xsl">
     <xsl:stylesheet version="1.0"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:param name="test-inline" select="'No parameter has been passed'" />
-      <xsl:param name="test-inline-xml" select="'No xml parameter has been passed'" />
+      <xsl:param name="test-inline-xml"
+      select="'No xml parameter has been passed'" />
       <xsl:param name="injectPointHead" select="'/html/head'" />
-      <xsl:param name="injectPointBody" select="'/html/body/forrest:hook/forrest:hook'" />
+      <xsl:param name="injectPointBody"
+      select="'/html/body/forrest:hook/forrest:hook'" />
       <xsl:template match="/">
         <forrest:content xmlns:forrest="http://apache.org/forrest/templates/1.0">
+
           <forrest:part xpath="{$injectPointHead}">
-            <meta
-              content=" Content going to a fixed location defined by the contract 
-              (here: {$injectPointHead})."
-              name="Description" />
-          </forrest:part>
-          <forrest:part>
-            Content going to the location defined by the structurer.
-            $test-inline:
-            <xsl:value-of select="$test-inline" />
-            $test-inline-xml:
-            <xsl:copy-of select="$test-inline-xml" />
+            <meta content=" Content going to a fixed location defined by the contract (here: {$injectPointHead})."
+            name="Description" />
           </forrest:part>
+          <forrest:part>Content going to the location defined by the
+          structurer. $test-inline: 
+          <xsl:value-of select="$test-inline" />$test-inline-xml: 
+          <xsl:copy-of select="$test-inline-xml" /></forrest:part>
           <forrest:part xpath="{$injectPointBody}">
-            <p>
-             $injectPointBody: <xsl:value-of select="$injectPointBody" />
-            </p>
+            <p>$injectPointBody: 
+            <xsl:value-of select="$injectPointBody" /></p>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/master.structurer.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -21,16 +21,18 @@
           <forrest:property name="test-inline" value="xxx" />
           <forrest:property name="test-inline-xml">
             <css url="common.css" />
-<!--<nupp/>-->
+            <!--<nupp/>-->
           </forrest:property>
         </forrest:contract>
       </forrest:hook>
       <forrest:hook id="sort">
-        <forrest:contract name="sort" dataURI="/org/apache/forrest/dispatcher/sort.xml"/>
+        <forrest:contract name="sort"
+        dataURI="/org/apache/forrest/dispatcher/sort.xml" />
       </forrest:hook>
     </forrest:hook>
   </forrest:structure>
   <forrest:structure type="xml" hooksXpath="/">
-    <forrest:contract name="convertor" dataURI="/org/apache/forrest/dispatcher/common.fv" />
+    <forrest:contract name="convertor"
+    dataURI="/org/apache/forrest/dispatcher/common.fv" />
   </forrest:structure>
-</forrest:structurer>
\ No newline at end of file
+</forrest:structurer>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.contract.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,30 +14,31 @@
     limitations under the License.
   -->
 <forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0" name="sort">
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="sort">
   <description>
-    <p> This is just a sort contract, it will output something but
-      *nothing* in special. It should just serve to explain a wee bit
-      contracts and what you can do with them.</p>
+    <p>This is just a sort contract, it will output something but *nothing* in
+    special. It should just serve to explain a wee bit contracts and what you
+    can do with them.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="sort" dataURI="path"/>]]>
-  </usage>
+    <![CDATA[<forrest:contract name="sort" dataURI="path"/>]]>
+</usage>
   <forrest:template name="sort" inputFormat="xsl">
     <xsl:stylesheet version="1.0"
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template match="/">
         <forrest:content xmlns:forrest="http://apache.org/forrest/templates/1.0">
+
           <forrest:part>
-            <xsl:apply-templates/>
+            <xsl:apply-templates />
           </forrest:part>
         </forrest:content>
       </xsl:template>
       <xsl:template match="root">
-         <xsl:apply-templates select="child">
-           <xsl:sort select="@prioridad" data-type="number"/>
-         </xsl:apply-templates>
+        <xsl:apply-templates select="child">
+          <xsl:sort select="@prioridad" data-type="number" />
+        </xsl:apply-templates>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>
-</forrest:contract>
\ No newline at end of file
+</forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/testing/org/apache/forrest/dispatcher/sort.xml Thu Aug 27 12:07:38 2009
@@ -1,5 +1,5 @@
-<?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
     this work for additional information regarding copyright ownership.
@@ -14,19 +14,9 @@
     limitations under the License.
   -->
 <root>
-  <child prioridad="2">
-    2
-  </child>
-  <child prioridad="3">
-    3
-  </child>
-  <child prioridad="1">
-    1
-  </child>
-  <child prioridad="5">
-    5
-  </child>
-  <child prioridad="4">
-    4
-  </child>
-</root>
\ No newline at end of file
+  <child prioridad="2">2</child>
+  <child prioridad="3">3</child>
+  <child prioridad="1">1</child>
+  <child prioridad="5">5</child>
+  <child prioridad="4">4</child>
+</root>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/status.xml Thu Aug 27 12:07:38 2009
@@ -21,109 +21,95 @@
     <person name="Ross Gardler" email="rgardler@apache.org" id="RDG" />
     <person name="Thorsten Scherler" email="thorsten@apache.org" id="TS" />
     <person name="Gavin McDonald" email="gmcdonald@apache.org" id="GM" />
-    <person name="Volunteer needed" email="dev@forrest.apache.org" id="open"/>
+    <person name="Volunteer needed" email="dev@forrest.apache.org" id="open" />
   </developers>
-<!-- Define here the Title of the Context you want to display in the Changes pages.
+  <!-- Define here the Title of the Context you want to display in the Changes pages.
        id = the context value of actions
        title = Title of the Context
   -->
   <contexts>
-    <context id="code" title="Changes to the Code Base"/>
-    <context id="docs" title="Changes to Documentation"/>
-    <context id="admin" title="Changes to Project Administration"/>
-    <context id="design" title="Changes to Design"/>
-    <context id="build" title="Changes to Build"/>
+    <context id="code" title="Changes to the Code Base" />
+    <context id="docs" title="Changes to Documentation" />
+    <context id="admin" title="Changes to Project Administration" />
+    <context id="design" title="Changes to Design" />
+    <context id="build" title="Changes to Build" />
   </contexts>
   <changes>
-<!-- Add new releases here -->
-     <release version="0.1" date="unreleased">
-      <action context="docs" dev="GM" importance="high" type="add">
-       Added an examples tab and section to show working examples
-       of how to add independant and plugin dependent contracts.
-       A first example showing the POD plugin &amp; contract has
-       been started.
-      </action>
-      <action context="code" dev="TS" type="update"> Cleaning up
-        usage of structurer using the new chunks of FOR-1059. Reducing code duplications.
-        </action>
-      <action context="code" dev="TS" importance="high" type="update"> Cleaning up
-        locationmap from the former xdocs location. See
-        <link href="site:news">news #cleanup.15.06.07</link> how to update. </action>
-      <action context="code" type="fix" dev="TS" fixes-bug="FOR-975" importance="high">
-        FOR-975 Renaming tiles to panel.
-      </action>
-      <action context="code" type="add" dev="TS" fixes-bug="FOR-937" due-to="Sjur Moshagen">
-        More i18n work by Sjur on Dispatcher. This patch correctly localizes menus &amp; tabs.
-      </action>
-      <action context="code" type="fix" dev="DC" fixes-bug="FOR-939" due-to="Sjur Moshagen">
-        Rename to ContractsMessages_en.xml, part of i18n changes by Sjur.
-      </action>
-      <action context="code" type="add" dev="RDG">
-        Add ability to get a list of contracts provided by a plugin. For
-        this to work the plugin name must have "plugin" within it, e.g.
-        "org.apache.forrest.plugin.input.doap". Requesting
-        <code>ls.contracts.org.apache.forrest.plugin.input.doap.source.xml</code>
-        will return a source listing of plugins provided by the named plugin.
-        Requesting <code>ls.contracts.org.apache.forrest.plugin.input.doap.[FORMAT]</code> 
-        will return a formatted output document listing all templates supplied
-        by the identified plugin.        
-      </action>
+    <!-- Add new releases here -->
+    <release version="0.1" date="unreleased">
+      <action context="docs" dev="GM" importance="high" type="add">Added an
+      examples tab and section to show working examples of how to add
+      independant and plugin dependent contracts. A first example showing the
+      POD plugin &amp; contract has been started.</action>
+      <action context="code" dev="TS" type="update">Cleaning up usage of
+      structurer using the new chunks of FOR-1059. Reducing code
+      duplications.</action>
+      <action context="code" dev="TS" importance="high" type="update">Cleaning
+      up locationmap from the former xdocs location. See 
+      <link href="site:news">news #cleanup.15.06.07</link>how to
+      update.</action>
+      <action context="code" type="fix" dev="TS" fixes-bug="FOR-975"
+      importance="high">FOR-975 Renaming tiles to panel.</action>
+      <action context="code" type="add" dev="TS" fixes-bug="FOR-937"
+      due-to="Sjur Moshagen">More i18n work by Sjur on Dispatcher. This patch
+      correctly localizes menus &amp; tabs.</action>
+      <action context="code" type="fix" dev="DC" fixes-bug="FOR-939"
+      due-to="Sjur Moshagen">Rename to ContractsMessages_en.xml, part of i18n
+      changes by Sjur.</action>
+      <action context="code" type="add" dev="RDG">Add ability to get a list of
+      contracts provided by a plugin. For this to work the plugin name must
+      have "plugin" within it, e.g. "org.apache.forrest.plugin.input.doap".
+      Requesting 
+      <code>
+      ls.contracts.org.apache.forrest.plugin.input.doap.source.xml</code>will
+      return a source listing of plugins provided by the named plugin.
+      Requesting 
+      <code>
+      ls.contracts.org.apache.forrest.plugin.input.doap.[FORMAT]</code>will
+      return a formatted output document listing all templates supplied by the
+      identified plugin.</action>
       <action context="code" type="update" dev="DC" fixes-bug="FOR-935"
-        due-to="Sjur Moshagen">
-        i18n: Add LocaleAction action wrapper, and use the locale provided by it.
-        Was taking the locale directly from the request instead of using the standard method in Forrest: LocaleAction.
-      </action>
-      <action dev="TS" type="add" context="docs">
-        Adding the "how tos" from the site-author to this plugin.
-      </action>
-<!-- 07/2006 -->
-      <action dev="TS" type="add" context="code"> Extending the dispatcher 
-          with an internal format. This internal format is our xdoc or 
-          xhtml2. The internal format will then be contacted by e.g. html 
-          contracts. </action>
-<!-- < 07/2006 -->
-      <action dev="TS" type="add" context="admin">
-        Initial plugin code extracted from the old views plugin.
-</action>
-      <action dev="TS" type="add" context="code"> Added first implementation of 
-        the dispatcher. Including contract bean implementation and interface; 
-        dispatcher exception and dispatcher transformers. </action>
-      <action dev="GM" type="add" context="docs">
-        Added a dispatcher glossary. Thanks to Thorsten for moving to the plugin.
-      </action>
-      <action dev="TS" type="add" context="docs">
-        Added infos of the pattern the plugin is using.
-      </action>
-      <action dev="TS" type="add" context="docs">
-        Updated the "how it works" section and moved it to its own site.
-      </action>
-      <action context="code" dev="TS" type="add">
-        Adding the dispatcher concept documentation from the site-author.
-      </action>
-      <action dev="TS" type="update" context="docs" fixes-bug="FOR-768" 
-        due-to="Paul Bolger">
-       Added section "linking to external css files" to howto-structurer-dsl doc.
-      </action>
-      <action dev="TS" type="add" context="code">
-        Activated multiple output formats to be configured via a View.
-      </action>
-      <action dev="TS" type="add" context="code">
-        Added contracts and nuggets to the "view" plugins.
-      </action>
+      due-to="Sjur Moshagen">i18n: Add LocaleAction action wrapper, and use the
+      locale provided by it. Was taking the locale directly from the request
+      instead of using the standard method in Forrest: LocaleAction.</action>
+      <action dev="TS" type="add" context="docs">Adding the "how tos" from the
+      site-author to this plugin.</action>
+      <!-- 07/2006 -->
+      <action dev="TS" type="add" context="code">Extending the dispatcher with
+      an internal format. This internal format is our xdoc or xhtml2. The
+      internal format will then be contacted by e.g. html contracts.</action>
+      <!-- < 07/2006 -->
+      <action dev="TS" type="add" context="admin">Initial plugin code extracted
+      from the old views plugin.</action>
+      <action dev="TS" type="add" context="code">Added first implementation of
+      the dispatcher. Including contract bean implementation and interface;
+      dispatcher exception and dispatcher transformers.</action>
+      <action dev="GM" type="add" context="docs">Added a dispatcher glossary.
+      Thanks to Thorsten for moving to the plugin.</action>
+      <action dev="TS" type="add" context="docs">Added infos of the pattern the
+      plugin is using.</action>
+      <action dev="TS" type="add" context="docs">Updated the "how it works"
+      section and moved it to its own site.</action>
+      <action context="code" dev="TS" type="add">Adding the dispatcher concept
+      documentation from the site-author.</action>
+      <action dev="TS" type="update" context="docs" fixes-bug="FOR-768"
+      due-to="Paul Bolger">Added section "linking to external css files" to
+      howto-structurer-dsl doc.</action>
+      <action dev="TS" type="add" context="code">Activated multiple output
+      formats to be configured via a View.</action>
+      <action dev="TS" type="add" context="code">Added contracts and nuggets to
+      the "view" plugins.</action>
     </release>
   </changes>
   <todo>
     <actions priority="high">
-      <action context="docs" dev="open">
-              create some more example, that it is easier to adapt the concept. An examples section
-              has been added, but more examples needed to cover the contracts available.
-      </action>
-      <action context="core" dev="open">
-        Rewrite matches to allow other output implementation then html.
-      </action>
-      <action context="core" dev="open">
-        Extract businessHelper to their on implementation plugin.
-      </action>
+      <action context="docs" dev="open">create some more example, that it is
+      easier to adapt the concept. An examples section has been added, but more
+      examples needed to cover the contracts available.</action>
+      <action context="core" dev="open">Rewrite matches to allow other output
+      implementation then html.</action>
+      <action context="core" dev="open">Extract businessHelper to their on
+      implementation plugin.</action>
     </actions>
   </todo>
 </status>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/coat.structurer.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
@@ -15,64 +15,65 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:structurer 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-<!-- The following variables are used to contact data models and/or contracts. -->
-  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
-  <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
-  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+  <!-- The following variables are used to contact data models and/or contracts. -->
+  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}" />
+  <jx:set var="getRequestExtension"
+  value="#{$cocoon/parameters/getRequestExtension}" />
+  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}" />
   <forrest:structure type="html" hooksXpath="/html/body">
-<!-- 
+    <!-- 
         @type defines this structurer to html.
         @hooksXpath defines where all hooks will be injected (as prefix).
         -->
     <forrest:contract name="branding-css-links">
-<!-- More information around this contract
+      <!-- More information around this contract
         http://marc.theaimsgroup.com/?l=forrest-dev&m=113473237805195&w=2
         -->
-<!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
+      <!--Note: The forrest:properties element does not exit anymore (in comparison to a previous versions) -->
       <forrest:property name="branding-css-links-input">
-        <css url="coat.css"/>
+        <css url="coat.css" />
       </forrest:property>
     </forrest:contract>
     <forrest:contract name="siteinfo-meta" dataURI="lm://project.build-info">
       <forrest:property name="custom">
-        <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+        <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
       </forrest:property>
     </forrest:contract>
     <forrest:hook name="container">
       <forrest:hook name="header">
         <forrest:hook name="group-logo">
           <forrest:contract name="branding-logo">
-            <forrest:property name="branding-logo-name">The Apache Software 
-              Foundation</forrest:property>
-            <forrest:property name="branding-logo-description">The Apache 
-              Software Foundation</forrest:property>
+            <forrest:property name="branding-logo-name">The Apache Software
+            Foundation</forrest:property>
+            <forrest:property name="branding-logo-description">The Apache
+            Software Foundation</forrest:property>
             <forrest:property name="branding-logo-url">
-              http://www.apache.org/</forrest:property>
+            http://www.apache.org/</forrest:property>
             <forrest:property name="branding-logo-logo">
-              images/group-logo.gif</forrest:property>
+            images/group-logo.gif</forrest:property>
           </forrest:contract>
         </forrest:hook>
       </forrest:hook>
       <forrest:hook name="page">
         <forrest:hook name="leftbar">
-          <forrest:contract name="nav-section" 
-            dataURI="cocoon://#{$getRequest}.navigation.xml">
+          <forrest:contract name="nav-section"
+          dataURI="cocoon://#{$getRequest}.navigation.xml">
             <forrest:property name="expanding">false</forrest:property>
           </forrest:contract>
           <forrest:contract name="search-input">
             <forrest:property name="search-input">
-              <search name="MyProject" domain="example.org" provider="google"/>
+              <search name="MyProject" domain="example.org"
+              provider="google" />
             </forrest:property>
           </forrest:contract>
         </forrest:hook>
         <forrest:hook name="content">
-          <forrest:contract name="content-abstract" 
-            dataURI="cocoon://#{$getRequest}.abstract.xml"/>
-          <forrest:contract name="content-main" 
-            dataURI="cocoon://#{$getRequest}.body.xml"/>
+          <forrest:contract name="content-abstract"
+          dataURI="cocoon://#{$getRequest}.abstract.xml" />
+          <forrest:contract name="content-main"
+          dataURI="cocoon://#{$getRequest}.body.xml" />
         </forrest:hook>
       </forrest:hook>
     </forrest:hook>
@@ -80,12 +81,11 @@
       <forrest:contract name="siteinfo-feedback">
         <forrest:property name="siteinfo-feedback">
           <feedback to="webmaster@foo.com"
-              href="mailto:webmaster@foo.com?subject=Feedback&#160;" >
-              Send feedback about the website to:
-            </feedback>
+          href="mailto:webmaster@foo.com?subject=Feedback&#160;">Send feedback
+          about the website to:</feedback>
         </forrest:property>
       </forrest:contract>
-      <forrest:contract name="siteinfo-last-published"/>
+      <forrest:contract name="siteinfo-last-published" />
     </forrest:hook>
   </forrest:structure>
 </forrest:structurer>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/themer/themes/common.structurer.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
@@ -15,16 +15,17 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<forrest:structurer 
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
-  jx:cache-key="#{$cocoon/parameters/getRequest}" 
-  jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
-<!-- The following variables are used to contact data models and/or contracts. -->
-  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}"/>
-  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}"/>
-  <jx:set var="getRequestExtension" value="#{$cocoon/parameters/getRequestExtension}" />
-<!-- 
+<forrest:structurer xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:jx="http://apache.org/cocoon/templates/jx/1.0"
+jx:cache-key="#{$cocoon/parameters/getRequest}"
+jx:cache-validity="${Packages.org.apache.excalibur.source.impl.validity.NOPValidity()}">
+
+  <!-- The following variables are used to contact data models and/or contracts. -->
+  <jx:set var="contextPath" value="#{$cocoon/parameters/contextPath}" />
+  <jx:set var="getRequest" value="#{$cocoon/parameters/getRequest}" />
+  <jx:set var="getRequestExtension"
+  value="#{$cocoon/parameters/getRequestExtension}" />
+  <!-- 
     You can group elements (hooks and contracts) to a template 
     and import it from any structurer. 
     The following <jx:import uri="cocoon://prepare.panels.*"/>
@@ -36,9 +37,9 @@
     {properties:resources}/themes/{properties:dispatcher.theme}/html/{1}.vt.xml
 -->
   <forrest:structure type="fo" hooksXpath="/">
-    <jx:import uri="cocoon://prepare.panels.common-fo"/>
+    <jx:import uri="cocoon://prepare.panels.common-fo" />
   </forrest:structure>
   <forrest:structure type="html" hooksXpath="/html/body">
-    <jx:import uri="cocoon://prepare.panels.common-html"/>
+    <jx:import uri="cocoon://prepare.panels.common-html" />
   </forrest:structure>
 </forrest:structurer>



Mime
View raw message