forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r808385 [5/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/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/branding-logo.contract.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,24 +16,29 @@
   limitations under the License.
 -->
 <forrest:contract name="branding-logo"
-  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
   <description>
-    <p>
-      This contract will output images. You can configure it like follow:
-    </p>
+    <p>This contract will output images. You can configure it like follow:</p>
     <ul>
-      <li>branding-logo-name - will be used for @alt value of the &lt;img&gt; </li>
-      <li>branding-logo-description - will be used for @title value of the &lt;img&gt; </li>
-      <li>branding-logo-url - will be used for the @href location of a surrounding &lt;a&gt;  </li>
-      <li>branding-logo-logo - will be used for @src value of the &lt;img&gt; </li>
-      <li>branding-logo-over - if used then a javascript will be rendered which switches the images.
-             Will be used for @onmouseover image @src value of the &lt;img&gt; </li>
-      <li>branding-logo-width - will be used for @width value of the &lt;img&gt; </li>
-      <li>branding-logo-height - will be used for @height value of the &lt;img&gt; </li>
+      <li>branding-logo-name - will be used for @alt value of the
+      &lt;img&gt;</li>
+      <li>branding-logo-description - will be used for @title value of the
+      &lt;img&gt;</li>
+      <li>branding-logo-url - will be used for the @href location of a
+      surrounding &lt;a&gt;</li>
+      <li>branding-logo-logo - will be used for @src value of the
+      &lt;img&gt;</li>
+      <li>branding-logo-over - if used then a javascript will be rendered which
+      switches the images. Will be used for @onmouseover image @src value of
+      the &lt;img&gt;</li>
+      <li>branding-logo-width - will be used for @width value of the
+      &lt;img&gt;</li>
+      <li>branding-logo-height - will be used for @height value of the
+      &lt;img&gt;</li>
     </ul>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="branding-logo">
+    <![CDATA[<forrest:contract name="branding-logo">
   <forrest:property name="branding-logo-name">Apache Forrest</forrest:property>
   <forrest:property name="branding-logo-description">Apache Forrest</forrest:property>
   <forrest:property name="branding-logo-url">http://forrest.apache.org/</forrest:property>
@@ -42,42 +47,44 @@
   [<forrest:property name="branding-logo-width">500</forrest:property>]
   [<forrest:property name="branding-logo-height">490</forrest:property>]
 </forrest:contract>]]>
-  </usage>
-  <forrest:template
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="branding-logo" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="branding-logo-name"/>
-      <xsl:param name="branding-logo-description"/>
-      <xsl:param name="branding-logo-url"/>
-      <xsl:param name="branding-logo-logo"/>
-      <xsl:param name="branding-logo-over"/>
-      <xsl:param name="branding-logo-width"/>
-      <xsl:param name="branding-logo-height"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:include href="cocoon://prepare.contract.html.helper-render-image" />
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="branding-logo-name" />
+      <xsl:param name="branding-logo-description" />
+      <xsl:param name="branding-logo-url" />
+      <xsl:param name="branding-logo-logo" />
+      <xsl:param name="branding-logo-over" />
+      <xsl:param name="branding-logo-width" />
+      <xsl:param name="branding-logo-height" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:comment>+
-    |start Logo
-    +</xsl:comment>
+            <xsl:comment>+ |start Logo +</xsl:comment>
             <xsl:call-template name="renderlogo">
-              <xsl:with-param name="name" select="normalize-space($branding-logo-name)"/>
-              <xsl:with-param name="url" select="normalize-space($branding-logo-url)"/>
-              <xsl:with-param name="logo" select="normalize-space($branding-logo-logo)"/>
-              <xsl:with-param name="rollover" select="normalize-space($branding-logo-over)"/>
-              <xsl:with-param name="width" select="normalize-space($branding-logo-width)"/>
-              <xsl:with-param name="height" select="normalize-space($branding-logo-height)"/>
-              <xsl:with-param name="root" select="$root"/>
-              <xsl:with-param name="description" 
-                select="normalize-space($branding-logo-description)"/>
+              <xsl:with-param name="name"
+              select="normalize-space($branding-logo-name)" />
+              <xsl:with-param name="url"
+              select="normalize-space($branding-logo-url)" />
+              <xsl:with-param name="logo"
+              select="normalize-space($branding-logo-logo)" />
+              <xsl:with-param name="rollover"
+              select="normalize-space($branding-logo-over)" />
+              <xsl:with-param name="width"
+              select="normalize-space($branding-logo-width)" />
+              <xsl:with-param name="height"
+              select="normalize-space($branding-logo-height)" />
+              <xsl:with-param name="root" select="$root" />
+              <xsl:with-param name="description"
+              select="normalize-space($branding-logo-description)" />
             </xsl:call-template>
-            <xsl:comment>+
-    |end group Logo
-    +</xsl:comment>
+            <xsl:comment>+ |end group Logo +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/genericMarkup.contract.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,38 +15,34 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="genericMarkup">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="genericMarkup">
   <description>
-    <p>
-      genericMarkup - Template will output generic markup.
-    </p>
+    <p>genericMarkup - Template will output generic markup.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="genericMarkup">
+    <![CDATA[<forrest:contract name="genericMarkup">
   <forrest:property name="genericMarkup">
     <hr/>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="genericMarkup" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="genericMarkup"/>
+  name="genericMarkup" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="genericMarkup" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part>
-            <xsl:apply-templates 
-              select="$genericMarkup/*|$genericMarkup/comment()| $genericMarkup/processing-instruction() | $genericMarkup/text()"/>
+            <xsl:apply-templates select="$genericMarkup/*|$genericMarkup/comment()| $genericMarkup/processing-instruction() | $genericMarkup/text()" />
           </forrest:part>
         </forrest:content>
       </xsl:template>
-      <xsl:template 
-        match="@* | * | comment() | processing-instruction() | text()">
+      <xsl:template match="@* | * | comment() | processing-instruction() | text()">
+
         <xsl:copy>
-          <xsl:apply-templates 
-            select="@* | * | comment() | processing-instruction() | text()"/>
+          <xsl:apply-templates select="@* | * | comment() | processing-instruction() | text()" />
         </xsl:copy>
       </xsl:template>
     </xsl:stylesheet>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/helper-render-image.contract.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,91 +15,96 @@
   See the License for the specific language governing permissions and
   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="helper-render-image">
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="helper-render-image">
   <description>
-    <p>
-      helper-render-image is a helper class to be used <strong>only</strong>
-      internally as import/include from within other contracts!
-    </p>
+    <p>helper-render-image is a helper class to be used 
+    <strong>only</strong>internally as import/include from within other
+    contracts!</p>
   </description>
   <usage>
-<![CDATA[internal only!!!
+    <![CDATA[internal only!!!
   
   <xsl:include href="cocoon://prepare.contract.html.helper-render-image"/>]]>
-  </usage>
-  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    name="helper-render-image" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+</usage>
+  <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
+  name="helper-render-image" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="renderlogo">
-        <xsl:param name="name"/>
-        <xsl:param name="url"/>
-        <xsl:param name="logo"/>
-        <xsl:param name="rollover"/>
-        <xsl:param name="width"/>
-        <xsl:param name="height"/>
-        <xsl:param name="root"/>
-        <xsl:param name="description"/>
+        <xsl:param name="name" />
+        <xsl:param name="url" />
+        <xsl:param name="logo" />
+        <xsl:param name="rollover" />
+        <xsl:param name="width" />
+        <xsl:param name="height" />
+        <xsl:param name="root" />
+        <xsl:param name="description" />
         <xsl:variable name="logoSrc">
           <xsl:if test="not(starts-with($logo, 'http://'))">
-            <xsl:value-of select="$root"/>
+            <xsl:value-of select="$root" />
           </xsl:if>
-          <xsl:value-of select="$logo"/>
+          <xsl:value-of select="$logo" />
         </xsl:variable>
         <xsl:variable name="overSrc">
           <xsl:if test="not(starts-with($rollover, 'http://'))">
-            <xsl:value-of select="$root"/>
+            <xsl:value-of select="$root" />
           </xsl:if>
-          <xsl:value-of select="$rollover"/>
+          <xsl:value-of select="$rollover" />
         </xsl:variable>
         <xsl:if test="$rollover">
-<script type="text/javascript" > function 
-            swapImage(name,src){ document[name].src=src; } </script>
-<!--tricking the cli to request the overSrc image--><a href="{$overSrc}">
-<xsl:text> </xsl:text></a>
-        </xsl:if><a href="{$url}">
-        <xsl:if test="$rollover">
-          <xsl:attribute name="onMouseOver">swapImage('<xsl:value-of 
-              select="$name"/>','<xsl:value-of 
-              select="$overSrc"/>');</xsl:attribute>
-          <xsl:attribute name="onMouseOut">swapImage('<xsl:value-of 
-              select="$name"/>','<xsl:value-of 
-              select="$logoSrc"/>');</xsl:attribute>
+          <script type="text/javascript">function swapImage(name,src){
+          document[name].src=src; }</script>
+          <!--tricking the cli to request the overSrc image-->
+          <a href="{$overSrc}">
+            <xsl:text>
+ 
+</xsl:text>
+          </a>
         </xsl:if>
-        <xsl:choose>
-          <xsl:when test="$logo and not($logo = '')">
-            <img alt="{$name}" class="logoImage">
-              <xsl:attribute name="src">
-                <xsl:value-of select="$logoSrc"/>
-              </xsl:attribute>
-              <xsl:if test="$width">
-                <xsl:attribute name="width">
-                  <xsl:value-of select="$width"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$height">
-                <xsl:attribute name="height">
-                  <xsl:value-of select="$height"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$description">
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$description"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:if test="$rollover">
-                <xsl:attribute name="name">
-                  <xsl:value-of select="$name"/>
+        <a href="{$url}">
+          <xsl:if test="$rollover">
+            <xsl:attribute name="onMouseOver">swapImage(' 
+            <xsl:value-of select="$name" />',' 
+            <xsl:value-of select="$overSrc" />');</xsl:attribute>
+            <xsl:attribute name="onMouseOut">swapImage(' 
+            <xsl:value-of select="$name" />',' 
+            <xsl:value-of select="$logoSrc" />');</xsl:attribute>
+          </xsl:if>
+          <xsl:choose>
+            <xsl:when test="$logo and not($logo = '')">
+              <img alt="{$name}" class="logoImage">
+                <xsl:attribute name="src">
+                  <xsl:value-of select="$logoSrc" />
                 </xsl:attribute>
-              </xsl:if>
-            </img>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$name"/>
-          </xsl:otherwise>
-        </xsl:choose></a>
+                <xsl:if test="$width">
+                  <xsl:attribute name="width">
+                    <xsl:value-of select="$width" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$height">
+                  <xsl:attribute name="height">
+                    <xsl:value-of select="$height" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$description">
+                  <xsl:attribute name="title">
+                    <xsl:value-of select="$description" />
+                  </xsl:attribute>
+                </xsl:if>
+                <xsl:if test="$rollover">
+                  <xsl:attribute name="name">
+                    <xsl:value-of select="$name" />
+                  </xsl:attribute>
+                </xsl:if>
+              </img>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="$name" />
+            </xsl:otherwise>
+          </xsl:choose>
+        </a>
       </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/master.contract.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,57 +15,51 @@
   See the License for the specific language governing permissions and
   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">
-<!--NOTE: 
+<forrest:contract xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
+xmlns:forrest="http://apache.org/forrest/templates/1.0" name="master">
+  <!--NOTE: 
   THIS IS JUST AN EXPLANATION!!!-->
   <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 xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="master" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" 
-      xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!-- If you need default variables: -->
-<!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
-<!-- then extract the variable like: -->
-<!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
-<!-- more information which variables are available can be found at http://localhost:8888/**.props
+  name="master" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <!-- If you need default variables: -->
+      <!--<xsl:param name="defaultVariables" select="'test.html'"/>-->
+      <!-- then extract the variable like: -->
+      <!--<xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>-->
+      <!-- more information which variables are available can be found at http://localhost:8888/**.props
      which connects to the org.apache.forrest.plugin.output.inputModule plugin.
      A custom generator contacts the forrest properties input module to get all aviable key/values and
      outputs them to xml (dtd like forrest.properties.xml). -->
-<!-- Since contracts are standalone every implementation has to be invoked by some input.-->
-<!--  That means for xsl contracts that they are working for any xml input. 
+      <!-- Since contracts are standalone every implementation has to be invoked by some input.-->
+      <!--  That means for xsl contracts that they are working for any xml input. 
           We need to match the root element to invoke the contract processing!!! 
           If no data model is requested by the structurer, the dispatcher will use a foo-doc in the transformation.
           That means that matching "/" always will work. -->
       <xsl:template match="/">
-<!-- The dispatcher needs a well-formed xml document to work with. 
+        <!-- The dispatcher needs a well-formed xml document to work with. 
             The forrest:content element (as root element) can contain as many forrest:part's as you want. -->
         <forrest:content>
-<!-- forrest:part within this element the actual content is going to. 
+          <!-- forrest:part within this element the actual content is going to. 
             If you use no @xpath then we insert content on the current structurer position.-->
-          <forrest:part>
-            Content going to the location defined by the structurer.
-          </forrest:part>
-<!--If you want to inject the content into a certain DOM position and
+          <forrest:part>Content going to the location defined by the
+          structurer.</forrest:part>
+          <!--If you want to inject the content into a certain DOM position and
               *not* the current position in the structurer, you can use the @xpath attribute. -->
-          <forrest:part xpath="/html/head">
-            Content going to a fixed location defined by the contract (here: /html/head).
-          </forrest:part>
+          <forrest:part xpath="/html/head">Content going to a fixed location
+          defined by the contract (here: /html/head).</forrest:part>
         </forrest:content>
       </xsl:template>
-<!-- copy n paste -->
-<!--
+      <!-- copy n paste -->
+      <!--
       <xsl:param name="defaultVariables" select="'test.html'"/>
       <xsl:variable name="skin-img-dir" select="$defaultVariables/*[@name='skin-img-dir']/@value"/>
       <xsl:template match="/">

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/resource/themer/themes/common/html/siteinfo-meta-icon.contract.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,47 +15,46 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<forrest:contract
-  xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  name="siteinfo-meta-icon">
+<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
+name="siteinfo-meta-icon">
   <description>
     <p>
-      <strong>siteinfo-meta-icon</strong>
-      <br/>
-      will output the html additional shortcut icon in head element. This icon
-      is generally displayed by browser at the beginning of the URL.
-    </p>
-
-    <p>
-      This icon is directly searched in the <code>xdoc</code> directory.
-    </p>
+    <strong>siteinfo-meta-icon</strong>
+    <br />will output the html additional shortcut icon in head element. This
+    icon is generally displayed by browser at the beginning of the URL.</p>
+    <p>This icon is directly searched in the 
+    <code>xdoc</code>directory.</p>
   </description>
   <usage>
-<![CDATA[<forrest:contract name="siteinfo-meta-icon">
+    <![CDATA[<forrest:contract name="siteinfo-meta-icon">
   <forrest:property name="siteinfo-meta-icon">
     <favicon-url>favico.ico</favicon-url>
   </forrest:property>
 </forrest:contract>]]>
-  </usage>
+</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    name="siteinfo-meta-icon" inputFormat="xsl">
-    <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-      <xsl:param name="defaultVariables" select="'test.html'"/>
-      <xsl:param name="siteinfo-meta-icon"/>
-      <xsl:variable name="root" select="$defaultVariables/*[@name='root']/@value"/>
+  name="siteinfo-meta-icon" inputFormat="xsl">
+    <xsl:stylesheet version="1.1"
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+      <xsl:param name="defaultVariables" select="'test.html'" />
+      <xsl:param name="siteinfo-meta-icon" />
+      <xsl:variable name="root"
+      select="$defaultVariables/*[@name='root']/@value" />
       <xsl:template match="/">
         <forrest:content>
           <forrest:part xpath="/html/head">
             <xsl:comment>+|start favicon +</xsl:comment>
-            <xsl:if test="$siteinfo-meta-icon/favicon-url"><link rel="shortcut icon">
-              <xsl:attribute name="href">
-                <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)"/>
-              </xsl:attribute></link>
+            <xsl:if test="$siteinfo-meta-icon/favicon-url">
+              <link rel="shortcut icon">
+                <xsl:attribute name="href">
+                  <xsl:value-of select="concat($root,$siteinfo-meta-icon/favicon-url)" />
+                </xsl:attribute>
+              </link>
             </xsl:if>
             <xsl:comment>+|start favicon +</xsl:comment>
           </forrest:part>
         </forrest:content>
       </xsl:template>
     </xsl:stylesheet>
-  </forrest:template >
+  </forrest:template>
 </forrest:contract>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/COB-INF/sitemap.xmap 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,124 +16,117 @@
   limitations under the License.
 -->
 <map:sitemap xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://apache.org/cocoon/sitemap/1.0 http://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd"
-  xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-  
+xsi:schemaLocation="http://apache.org/cocoon/sitemap/1.0 http://cocoon.apache.org/schema/sitemap/cocoon-sitemap-1.0.xsd"
+xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:pipelines>
-    
     <map:pipeline id="lm">
       <map:match pattern="locationmap.xml">
-        <map:generate src="locationmap.xml"/>
-        <map:serialize type="xml"/>
+        <map:generate src="locationmap.xml" />
+        <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
-    
     <map:pipeline id="dispatcher">
       <map:match pattern="**.html">
         <map:generate src="lm://resolve.structurer.{1}" type="jx">
-          <map:parameter name="lenient-xpath" value="true"/>
-          <map:parameter name="getRequest" value="{1}"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
-          <map:parameter name="getRequestExtension" value="html"/>
+          <map:parameter name="lenient-xpath" value="true" />
+          <map:parameter name="getRequest" value="{1}" />
+          <map:parameter name="contextPath" value="{request:contextPath}" />
+          <map:parameter name="getRequestExtension" value="html" />
         </map:generate>
         <map:transform type="dispatcher">
-          <map:parameter name="cacheKey" value="{0}"/>
+          <map:parameter name="cacheKey" value="{0}" />
           <map:parameter name="validityFile"
-            value="lm://resolve.structurer.{1}"/>
-          <map:parameter name="request" value="{1}"/>
-          <map:parameter name="type" value="html"/>
+          value="lm://resolve.structurer.{1}" />
+          <map:parameter name="request" value="{1}" />
+          <map:parameter name="type" value="html" />
         </map:transform>
-        <map:transform src="lm://hooks-to-html.xsl"/>
-        <map:transform src="lm://namespace-stripped"/>
-        <map:transform src="lm://strip-dispatcher-remains-html.xsl"/>
-        <map:serialize type="xhtml"/>
+        <map:transform src="lm://hooks-to-html.xsl" />
+        <map:transform src="lm://namespace-stripped" />
+        <map:transform src="lm://strip-dispatcher-remains-html.xsl" />
+        <map:serialize type="xhtml" />
       </map:match>
       <map:match pattern="**.fo">
         <map:generate src="lm://resolve.structurer.{1}" type="jx">
-          <map:parameter name="lenient-xpath" value="true"/>
-          <map:parameter name="getRequest" value="{1}"/>
-          <map:parameter name="getRequestExtension" value="fo"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
+          <map:parameter name="lenient-xpath" value="true" />
+          <map:parameter name="getRequest" value="{1}" />
+          <map:parameter name="getRequestExtension" value="fo" />
+          <map:parameter name="contextPath" value="{request:contextPath}" />
         </map:generate>
         <map:transform type="dispatcher">
-          <map:parameter name="cacheKey" value="{0}"/>
+          <map:parameter name="cacheKey" value="{0}" />
           <map:parameter name="validityFile"
-            value="lm://resolve.structurer.{1}"/>
-          <map:parameter name="request" value="{1}"/>
-          <map:parameter name="type" value="fo"/>
+          value="lm://resolve.structurer.{1}" />
+          <map:parameter name="request" value="{1}" />
+          <map:parameter name="type" value="fo" />
         </map:transform>
-        <map:transform src="lm://hooks-to-fo.xsl"/>
-        <map:transform src="lm://strip-dispatcher-remains-fo.xsl"/>
-        <map:serialize type="xml"/>
+        <map:transform src="lm://hooks-to-fo.xsl" />
+        <map:transform src="lm://strip-dispatcher-remains-fo.xsl" />
+        <map:serialize type="xml" />
       </map:match>
       <map:match pattern="**.prepare.dispatcher.css">
         <map:generate src="lm://resolve.structurer.{1}" type="jx">
-          <map:parameter name="lenient-xpath" value="true"/>
-          <map:parameter name="getRequest" value="{1}"/>
-          <map:parameter name="getRequestExtension" value="css"/>
-          <map:parameter name="contextPath" value="{request:contextPath}"/>
+          <map:parameter name="lenient-xpath" value="true" />
+          <map:parameter name="getRequest" value="{1}" />
+          <map:parameter name="getRequestExtension" value="css" />
+          <map:parameter name="contextPath" value="{request:contextPath}" />
         </map:generate>
         <map:transform type="dispatcher">
-          <map:parameter name="cacheKey" value="{0}"/>
+          <map:parameter name="cacheKey" value="{0}" />
           <map:parameter name="validityFile"
-            value="lm://resolve.structurer.{1}"/>
+          value="lm://resolve.structurer.{1}" />
           <map:parameter name="dispatcher.caching"
-            value="{global:dispatcher.caching}"/>
-          <map:parameter name="request" value="{1}"/>
-          <map:parameter name="type" value="css"/>
+          value="{global:dispatcher.caching}" />
+          <map:parameter name="request" value="{1}" />
+          <map:parameter name="type" value="css" />
         </map:transform>
-        <map:serialize type="text"/>
+        <map:serialize type="text" />
       </map:match>
       <map:match pattern="**.dispatcher.css">
-        <map:generate type="text" src="cocoon://{1}.prepare.dispatcher.css"/>
+        <map:generate type="text" src="cocoon://{1}.prepare.dispatcher.css" />
         <map:transform type="pattern"
-          src="resource/chaperon/grammars/link.xlex"/>
-        <map:transform
-          src="resource/chaperon/stylesheets/pattern2link.xsl"/>
-        <map:serialize type="text" mime-type="text/css"/>
+        src="resource/chaperon/grammars/link.xlex" />
+        <map:transform src="resource/chaperon/stylesheets/pattern2link.xsl" />
+        <map:serialize type="text" mime-type="text/css" />
       </map:match>
     </map:pipeline>
-    
     <map:pipeline id="contracts">
       <map:act type="locale">
         <map:match pattern="resolve.structurer.**">
-          <map:generate src="lm://resolve.structurer.{1}"/>
-          <map:serialize type="xml"/>
+          <map:generate src="lm://resolve.structurer.{1}" />
+          <map:serialize type="xml" />
         </map:match>
         <map:match pattern="resolve.contract.*.**">
-          <map:generate src="{lm:resolve.contract.{1}.{2}}"/>
-          <map:serialize type="xml"/>
+          <map:generate src="{lm:resolve.contract.{1}.{2}}" />
+          <map:serialize type="xml" />
         </map:match>
         <map:match pattern="prepare.contract.*.**">
-          <map:generate src="{lm:resolve.contract.{1}.{2}}"/>
-          <map:transform src="{lm:contract-strip-xsl.xsl}"/>
+          <map:generate src="{lm:resolve.contract.{1}.{2}}" />
+          <map:transform src="{lm:contract-strip-xsl.xsl}" />
           <map:transform type="i18n">
-            <map:parameter name="locale" value="{../locale}"/>
+            <map:parameter name="locale" value="{../locale}" />
           </map:transform>
-          <map:serialize type="xml"/>
+          <map:serialize type="xml" />
         </map:match>
       </map:act>
     </map:pipeline>
-    
     <map:pipeline id="structurer">
       <!-- You can group elements to a template and call it from any view. 
       <jx:import uri="cocoon://prepare.panels.export-link"/>
       -->
       <map:match pattern="prepare.panels.**">
-        <map:generate src="{lm:resolve.panels.{1}}"/>
-        <map:transform src="{lm:root-strip.xsl}"/>
-        <map:serialize type="xml"/>
+        <map:generate src="{lm:resolve.panels.{1}}" />
+        <map:transform src="{lm:root-strip.xsl}" />
+        <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
     <map:pipeline>
       <map:match pattern="**.props">
-        <map:generate
-          src="servlet:propertiesGenerator:/module.global.properties"/>
+        <map:generate src="servlet:propertiesGenerator:/module.global.properties" />
         <map:transform src="resource/stylesheets/variable.helper.xsl">
-          <map:parameter name="path" value="{1}.html"/>
-          <map:parameter name="theme" value="{global:dispatcher.theme}"/>
+          <map:parameter name="path" value="{1}.html" />
+          <map:parameter name="theme" value="{global:dispatcher.theme}" />
         </map:transform>
-        <map:serialize type="xml"/>
+        <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
     <map:pipeline id="resources">
@@ -141,29 +134,28 @@
         <map:read mime-type="text/css" src="{lm:themes/{1}.css}" />
       </map:match>
       <map:match pattern="themes/**.js">
-        <map:read mime-type="application/x-javascript" src="{lm:themes/{1}.js}"/>
+        <map:read mime-type="application/x-javascript"
+        src="{lm:themes/{1}.js}" />
       </map:match>
       <map:match pattern="themes/images/**.*">
         <map:match type="regexp" pattern="(.*\.)(jpg|JPG|Jpg|jpeg|Jpeg|JPEG)$">
-          <map:read src="{lm:{1}{2}}" mime-type="image/jpeg"/>
+          <map:read src="{lm:{1}{2}}" mime-type="image/jpeg" />
           <!--<map:read mime-type="image/jpg" src="http://preproduccion.andaluciajunta.es/portalv4/img/{1}{2}"/>-->
         </map:match>
         <map:match type="regexp" pattern="(.*)(gif|GIF|Gif)$">
-          <map:read src="{lm:{1}{2}}" mime-type="image/gif"/>
+          <map:read src="{lm:{1}{2}}" mime-type="image/gif" />
           <!--<map:read mime-type="image/jpg" src="http://preproduccion.andaluciajunta.es/portalv4/img/{1}{2}"/>-->
         </map:match>
         <map:match type="regexp" pattern="(.*)(png|PNG|Png)$">
-          <map:read src="{lm:{1}{2}}" mime-type="image/png"/>
+          <map:read src="{lm:{1}{2}}" mime-type="image/png" />
         </map:match>
         <map:match type="regexp" pattern="(.*)(ico|ICO|Ico)$">
-          <map:read mime-type="image/x-icon" src="{lm:{1}{2}}"/>
+          <map:read mime-type="image/x-icon" src="{lm:{1}{2}}" />
         </map:match>
       </map:match>
     </map:pipeline>
-     <map:pipeline id="listing">
+    <map:pipeline id="listing">
       <map:mount uri-prefix="" src="ls.xmap" check-reload="yes" />
     </map:pipeline>
-    
   </map:pipelines>
-  
-</map:sitemap>
\ No newline at end of file
+</map:sitemap>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/avalon/dispatcher-sitemapcomponents.xconf 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,24 +15,23 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
 <map:components xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:transformers default="xslt">
     <map:transformer name="i18n"
-      src="org.apache.cocoon.transformation.I18nTransformer">
+    src="org.apache.cocoon.transformation.I18nTransformer">
       <catalogues default="contracts">
         <catalogue id="other" name="OtherMessages"
-          location="{lm:project.translations}"/>
+        location="{lm:project.translations}" />
         <catalogue id="contracts" name="ContractsMessages"
-          location="{lm:project.translations}"/>
+        location="{lm:project.translations}" />
       </catalogues>
       <cache-at-startup>true</cache-at-startup>
     </map:transformer>
   </map:transformers>
   <map:serializers default="xhtml">
     <map:serializer logger="sitemap.serializer.xhtml"
-      mime-type="text/html; charset=UTF-8" name="xhtml" ppool-max="64"
-      src="org.apache.cocoon.serialization.XMLSerializer">
+    mime-type="text/html; charset=UTF-8" name="xhtml" ppool-max="64"
+    src="org.apache.cocoon.serialization.XMLSerializer">
       <!--+
       | You can choose from Strict, Transitional, or Frameset XHTML.
       | For Strict XHTML set doctype to:
@@ -53,9 +52,10 @@
       <encoding>UTF-8</encoding-->
       <omit-xml-declaration>yes</omit-xml-declaration>
       <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
-      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+      <doctype-system>
+      http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
       <encoding>UTF-8</encoding>
       <indent>true</indent>
     </map:serializer>
   </map:serializers>
-</map:components>
\ No newline at end of file
+</map:components>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/dispatcher-context.xml Thu Aug 27 12:07:38 2009
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN"
-    "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+"http://www.springframework.org/dtd/spring-beans-2.0.dtd">
 <!--
   Licensed to the Apache Software Foundation (ASF) under one or more
   contributor license agreements.  See the NOTICE file distributed with
@@ -19,33 +19,39 @@
 -->
 <beans>
   <bean id="dispatcher" scope="prototype"
-    name="org.apache.cocoon.transformation.Transformer/dispatcher"
-    class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
-    <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/>
-    <property name="config" ref="config"/>
-    <property name="xpathSupport" value="basic"/>
+  name="org.apache.cocoon.transformation.Transformer/dispatcher"
+  class="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+    <property name="manager"
+    ref="org.apache.avalon.framework.service.ServiceManager" />
+    <property name="config" ref="config" />
+    <property name="xpathSupport" value="basic" />
   </bean>
   <bean id="dispatcherWrapper" scope="prototype"
-    name="org.apache.cocoon.transformation.Transformer/dispatcherWrapper"
-    class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer">
-    <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/>
-    <property name="config" ref="config"/>
-    <property name="xpathSupport" value="basic"/>
+  name="org.apache.cocoon.transformation.Transformer/dispatcherWrapper"
+  class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer">
+
+    <property name="manager"
+    ref="org.apache.avalon.framework.service.ServiceManager" />
+    <property name="config" ref="config" />
+    <property name="xpathSupport" value="basic" />
   </bean>
   <bean id="dispatcherWrapperEnhanced" scope="prototype"
-    name="org.apache.cocoon.transformation.Transformer/dispatcherWrapperEnhanced"
-    class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer">
-    <property name="manager" ref="org.apache.avalon.framework.service.ServiceManager"/>
-    <property name="config" ref="config"/>
-    <property name="xpathSupport" value="enhanced"/>
+  name="org.apache.cocoon.transformation.Transformer/dispatcherWrapperEnhanced"
+  class="org.apache.forrest.dispatcher.transformation.DispatcherWrapperTransformer">
+
+    <property name="manager"
+    ref="org.apache.avalon.framework.service.ServiceManager" />
+    <property name="config" ref="config" />
+    <property name="xpathSupport" value="enhanced" />
   </bean>
   <bean id="config" scope="prototype"
-    class="org.apache.forrest.dispatcher.config.WritableDispatcherBean">
-    <property name="allowXmlProperties" value="true"/>
-    <property name="shrink" value="false"/>
-    <property name="contractUriSufix" value=""/>
-    <property name="contractUriPrefix" value="cocoon://resolve.contract."/>
-    <property name="staxHelper" ref="staxHelper"/>
+  class="org.apache.forrest.dispatcher.config.WritableDispatcherBean">
+    <property name="allowXmlProperties" value="true" />
+    <property name="shrink" value="false" />
+    <property name="contractUriSufix" value="" />
+    <property name="contractUriPrefix" value="cocoon://resolve.contract." />
+    <property name="staxHelper" ref="staxHelper" />
   </bean>
-  <bean id="staxHelper" class="org.apache.forrest.dispatcher.impl.helper.StAX"/>
+  <bean id="staxHelper"
+  class="org.apache.forrest.dispatcher.impl.helper.StAX" />
 </beans>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/cocoon-2.2-block/src/main/resources/META-INF/cocoon/spring/servlet-service.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
@@ -21,17 +21,18 @@
     | @version $Id: servlet-service.xml 523714 2007-03-29 13:54:20Z gkossakowski $
     +-->
 <beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:servlet="http://cocoon.apache.org/schema/servlet"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-  http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
-  
-  <bean id="org.apache.forrest.dispatcher.service" class="org.apache.cocoon.sitemap.SitemapServlet">
-    <servlet:context mount-path="/dispatcher" context-path="blockcontext:/dispatcher/">
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:servlet="http://cocoon.apache.org/schema/servlet"
+xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd http://cocoon.apache.org/schema/servlet http://cocoon.apache.org/schema/servlet/cocoon-servlet-1.0.xsd">
+
+  <bean id="org.apache.forrest.dispatcher.service"
+  class="org.apache.cocoon.sitemap.SitemapServlet">
+    <servlet:context mount-path="/dispatcher"
+    context-path="blockcontext:/dispatcher/">
       <servlet:connections>
-        <entry key="propertiesGenerator" value-ref="org.apache.forrest.propertiesGenerator.block"/>
+        <entry key="propertiesGenerator"
+        value-ref="org.apache.forrest.propertiesGenerator.block" />
       </servlet:connections>
     </servlet:context>
   </bean>
-  
 </beans>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/dispatcher-glossary.xml Thu Aug 27 12:07:38 2009
@@ -20,28 +20,25 @@
 <glossary>
   <title>Dispatcher Glossary</title>
   <introduction>
-    <p>
-      This is a glossary of terms and their definitions for the Dispatcher (aka
-      views).
-    </p>
+    <p>This is a glossary of terms and their definitions for the Dispatcher
+    (aka views).</p>
   </introduction>
   <part id="a">
     <title>A</title>
     <item id="AddContent">
       <term>Add content to this Glossary</term>
       <definitions>
-        <definition>This glossary is incomplete, please help where you can by adding definitions to
-        existing items where needed. Also, add new Dispatcher related Items to the glossary as
-        appropriate.</definition>
+        <definition>This glossary is incomplete, please help where you can by
+        adding definitions to existing items where needed. Also, add new
+        Dispatcher related Items to the glossary as appropriate.</definition>
       </definitions>
       <notes>
         <item-note>See 
         <link href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112596689428172&amp;w=2#1">
-        Archive Mail</link>
-        </item-note>
+        Archive Mail</link></item-note>
         <item-note>See 
-        <link href="http://issues.apache.org/jira/browse/FOR-639">Issue FOR-639</link>
-        </item-note>
+        <link href="http://issues.apache.org/jira/browse/FOR-639">Issue
+        FOR-639</link></item-note>
       </notes>
     </item>
   </part>
@@ -50,15 +47,20 @@
     <item id="Contracts">
       <term>Contracts</term>
       <definitions>
-        <definition>A contract is a snippet of re-usable code that gets used in a structurer file.</definition>
-        <definition>Contracts can be used or omitted as neccessary, though a few are really compulsary in
-                      order to define a basic skeleton structure and to include some styling (CSS)</definition>
-        <definition>Contracts mainly come in three (3) types, static, semi-static &amp; dynamic.<br />
-                      Static Contracts are pre-defined snippets of code that need no further information.<br />
-                      Semi-static Contracts can include extra configuration variables, these would over-ride otherwise
-                      default variables.<br />
-                      Dynamic Contracts can have extra configuration variables, but can also define their own snippets
-                      of code information. (Such as extra CSS elements, or generic markup elements).</definition>
+        <definition>A contract is a snippet of re-usable code that gets used in
+        a structurer file.</definition>
+        <definition>Contracts can be used or omitted as neccessary, though a
+        few are really compulsary in order to define a basic skeleton structure
+        and to include some styling (CSS)</definition>
+        <definition>Contracts mainly come in three (3) types, static,
+        semi-static &amp; dynamic. 
+        <br />Static Contracts are pre-defined snippets of code that need no
+        further information. 
+        <br />Semi-static Contracts can include extra configuration variables,
+        these would over-ride otherwise default variables. 
+        <br />Dynamic Contracts can have extra configuration variables, but can
+        also define their own snippets of code information. (Such as extra CSS
+        elements, or generic markup elements).</definition>
       </definitions>
     </item>
     <item id="Class">
@@ -68,10 +70,12 @@
         <text>Name</text>
       </see>
       <definitions>
-        <definition>In the context of the dispatcher, a <strong>Class</strong> is used as an optional attribute to
-                            the forrest:hook. This converts to <code>
-<![CDATA[<div class="example"></div>]]></code>.
-                    </definition>
+        <definition>In the context of the dispatcher, a 
+        <strong>Class</strong>is used as an optional attribute to the
+        forrest:hook. This converts to 
+        <code>
+          <![CDATA[<div class="example"></div>]]>
+</code>.</definition>
       </definitions>
     </item>
   </part>
@@ -100,13 +104,14 @@
         <text>Views</text>
       </see>
       <definitions>
-        <definition>The Dispatcher is the codename for the Forrest Implementation of the Core J2EE
-        Dispatcher View. 
+        <definition>The Dispatcher is the codename for the Forrest
+        Implementation of the Core J2EE Dispatcher View. 
         <link href="http://java.sun.com/blueprints/corej2eepatterns/Patterns/DispatcherView.html">
-        java.sun.com</link> has more information on its origins.</definition>
-        <definition>What we at 'Forrest' relate the Dispatcher to, is the overall technology and
-        implementation of the replacement 'skins' system. Combining 'Views', 'Contracts' , 'Themes'
-        enables separation of concerns to provide a fast and efficient documentation
+        java.sun.com</link>has more information on its origins.</definition>
+        <definition>What we at 'Forrest' relate the Dispatcher to, is the
+        overall technology and implementation of the replacement 'skins'
+        system. Combining 'Views', 'Contracts' , 'Themes' enables separation of
+        concerns to provide a fast and efficient documentation
         framework.</definition>
       </definitions>
     </item>
@@ -124,18 +129,19 @@
         <text>Structurer</text>
       </see>
       <definitions>
-        <definition>forrest:hooks is a concept of defining format independent hooks to structure
-        the output.</definition>
-        <definition>Hooks are used to help define the layout of a page. Hooks are only used to
-        define the structure in our output that is required to enable a theme to apply its look and
-        feel.</definition>
-        <definition>Hooks convert to layout <![CDATA[<div></div>]]> container blocks and usually only consist
-        of forrest:contracts</definition>
+        <definition>forrest:hooks is a concept of defining format independent
+        hooks to structure the output.</definition>
+        <definition>Hooks are used to help define the layout of a page. Hooks
+        are only used to define the structure in our output that is required to
+        enable a theme to apply its look and feel.</definition>
+        <definition>Hooks convert to layout 
+<![CDATA[<div></div>]]>
+container blocks and usually only consist of forrest:contracts</definition>
         <definition>Hooks are applied currently in the themes.core plugin as
-part of a themes structurer configuration file such as %themename
-%-html.panel.xml (e.g pelt-html.panel.xml) or included in such configuration
-files via a panel file such as %themename%-%format%.panel.xml (e.g
-pelt-html.panel.xml)</definition>
+        part of a themes structurer configuration file such as %themename
+        %-html.panel.xml (e.g pelt-html.panel.xml) or included in such
+        configuration files via a panel file such as
+        %themename%-%format%.panel.xml (e.g pelt-html.panel.xml)</definition>
       </definitions>
     </item>
   </part>
@@ -148,9 +154,12 @@
         <text>Class</text>
       </see>
       <definitions>
-        <definition>In the context of the dispatcher, a <strong>name</strong> is used as an optional attribute to 
-                the forrest:hook. This converts to <code>
-<![CDATA[<div id="example"></div>]]></code>.</definition>
+        <definition>In the context of the dispatcher, a 
+        <strong>name</strong>is used as an optional attribute to the
+        forrest:hook. This converts to 
+        <code>
+          <![CDATA[<div id="example"></div>]]>
+</code>.</definition>
       </definitions>
     </item>
   </part>
@@ -169,7 +178,8 @@
         <text>Tiles</text>
       </see>
       <definitions>
-        <definition>Panels is the new name for a tile - a collection of contracts. </definition>
+        <definition>Panels is the new name for a tile - a collection of
+        contracts.</definition>
       </definitions>
     </item>
   </part>
@@ -194,9 +204,12 @@
         <text>Themes</text>
       </see>
       <definitions>
-        <definition>The Structurer allows a user to define the layout and content of a site or parts of a site.</definition>
-        <definition>Structurer files contain hooks &amp; contracts which you can include to build up a site structure template</definition>
-        <definition>A completed structurer file defines an overall theme (look and feel) for a site</definition>
+        <definition>The Structurer allows a user to define the layout and
+        content of a site or parts of a site.</definition>
+        <definition>Structurer files contain hooks &amp; contracts which you
+        can include to build up a site structure template</definition>
+        <definition>A completed structurer file defines an overall theme (look
+        and feel) for a site</definition>
       </definitions>
     </item>
     <item id="Skins">
@@ -210,9 +223,12 @@
         <text>Dispatcher</text>
       </see>
       <definitions>
-        <definition>Skins is the name of the older alternative way for structuring and styling your site pages.</definition>
-        <definition>Skins is still used in Forrest versions 0.7 and 0.8-dev, though for 0.8-dev and beyond it can be
-                concidered an option with Dispatcher being the other.(It is enabled as the default option currently)</definition>
+        <definition>Skins is the name of the older alternative way for
+        structuring and styling your site pages.</definition>
+        <definition>Skins is still used in Forrest versions 0.7 and 0.8-dev,
+        though for 0.8-dev and beyond it can be concidered an option with
+        Dispatcher being the other.(It is enabled as the default option
+        currently)</definition>
       </definitions>
     </item>
   </part>
@@ -225,18 +241,25 @@
         <text>Panels</text>
       </see>
       <definitions>
-        <definition>A tile is a collection of contracts that are grouped together for easy inclusion into a theme.</definition>
-        <definition>Tiles was the original but deprecated name for a collection of contracts, it is now
-                                  re-named and re-implemented as a 'Panels'</definition>
+        <definition>A tile is a collection of contracts that are grouped
+        together for easy inclusion into a theme.</definition>
+        <definition>Tiles was the original but deprecated name for a collection
+        of contracts, it is now re-named and re-implemented as a
+        'Panels'</definition>
       </definitions>
     </item>
     <item id="Themes">
       <term>Themes</term>
       <definitions>
-        <definition>A more extensible and adaptable solution than its alternative 'Skins'. A 'Theme' is an overall content &amp; style set.</definition>
-        <definition>A master 'common' theme provides the basis in which you can extend, over-ride or add to in order to make your own theme, you do not
-                      have to create a complete theme from scratch, simply include/exclude/over-ride/add what you need. The current 'Pelt Theme' based on its
-                      'Pelt Skin' counterpart, but uses functionality and extends/inherits what it needs to from the 'common' theme.</definition>
+        <definition>A more extensible and adaptable solution than its
+        alternative 'Skins'. A 'Theme' is an overall content &amp; style
+        set.</definition>
+        <definition>A master 'common' theme provides the basis in which you can
+        extend, over-ride or add to in order to make your own theme, you do not
+        have to create a complete theme from scratch, simply
+        include/exclude/over-ride/add what you need. The current 'Pelt Theme'
+        based on its 'Pelt Skin' counterpart, but uses functionality and
+        extends/inherits what it needs to from the 'common' theme.</definition>
       </definitions>
     </item>
   </part>
@@ -249,9 +272,11 @@
         <text>Dispatcher</text>
       </see>
       <definitions>
-        <definition>Views is the older now deprecated name for what is now the 'Dispatcher'</definition>
-        <definition>Views also, confusingly, was used as a term for the Structurer, and forrest:structurer is a 
-                                  deprecated code that has been replaced with forrest:template.</definition>
+        <definition>Views is the older now deprecated name for what is now the
+        'Dispatcher'</definition>
+        <definition>Views also, confusingly, was used as a term for the
+        Structurer, and forrest:structurer is a deprecated code that has been
+        replaced with forrest:template.</definition>
       </definitions>
     </item>
   </part>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/examples/index.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,46 +15,48 @@
   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>Dispatcher (Draft - feature under development)</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_90/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_90/status-themes.html">Status of
+    Themes: Skins and Dispatcher</a>.</warning>
     <section id="introduction">
       <title>Introduction</title>
-      <p>
-              This section will grow and show example usage of contracts in action -
-              either standalone contracts or those that work in conjunction with
-              plugins. Contributions Welcome.
-      </p>
+      <p>This section will grow and show example usage of contracts in action -
+      either standalone contracts or those that work in conjunction with
+      plugins. Contributions Welcome.</p>
     </section>
     <section id="examples">
-            <title>Some examples to help you on your way</title>
-    <section id="pod-example">
-            <title>Enabling and adding the POD plugin</title>
-            <p>On this page you will see a link to a .pod version of this page. Below are
-               the steps taken :-</p>
-       <ul><li>Add POD plugin to forrest.properties file</li>
-                <li><code><![CDATA[org.apache.forrest.plugin.output.POD]]></code></li>
-        <li>Add contract to include pod link - this can either be enabled in a 
-                master theme file (such as pelt.fv) or on a per folder basis (by altering a
-                nested pelt.fv to point to modified *.panels.xml). In this case, we want a
-                modified option to only alter files in this examples folder.
-</li></ul>
-<fixme author="GM">Example not yet complete, will expand on it soon.</fixme>
-</section>
-</section>
+      <title>Some examples to help you on your way</title>
+      <section id="pod-example">
+        <title>Enabling and adding the POD plugin</title>
+        <p>On this page you will see a link to a .pod version of this page.
+        Below are the steps taken :-</p>
+        <ul>
+          <li>Add POD plugin to forrest.properties file</li>
+          <li>
+            <code>
+              <![CDATA[org.apache.forrest.plugin.output.POD]]>
+</code>
+          </li>
+          <li>Add contract to include pod link - this can either be enabled in
+          a master theme file (such as pelt.fv) or on a per folder basis (by
+          altering a nested pelt.fv to point to modified *.panels.xml). In this
+          case, we want a modified option to only alter files in this examples
+          folder.</li>
+        </ul>
+        <fixme author="GM">Example not yet complete, will expand on it
+        soon.</fixme>
+      </section>
+    </section>
   </body>
 </document>

Modified: forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml
URL: http://svn.apache.org/viewvc/forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml?rev=808385&r1=808384&r2=808385&view=diff
==============================================================================
--- forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.xml (original)
+++ forrest/branches/dispatcher_rewrite/plugins/org.apache.forrest.plugin.internal.dispatcher/src/documentation/content/xdocs/how/howto-dispatcher-contracts.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,111 +15,94 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE howto PUBLIC "-//APACHE//DTD How-to V2.0//EN" "http://forrest.apache.org/dtd/howto-v20.dtd">
+<!DOCTYPE howto PUBLIC "-//APACHE//DTD How-to V2.0//EN"
+"http://forrest.apache.org/dtd/howto-v20.dtd">
 <howto>
   <header>
     <title>How to write a forrest:contract</title>
-    <abstract>
-      This How-To will explain how we wrote the contracts for the dispatcher and
-      hope afterwards you will be able to do the same.
-    </abstract>
-    <last-modified-content-date date="2007-03-24"/>
+    <abstract>This How-To will explain how we wrote the contracts for the
+    dispatcher and hope afterwards you will be able to do the same.</abstract>
+    <last-modified-content-date date="2007-03-24" />
   </header>
   <audience title="Intended Audience">
-    <warning>
-      The "Dispatcher" (aka "Views") is new functionality which is still in
-      development phase. That is why it is in the "whiteboard" section of the
-      Forrest distribution. This HowTo is a good start but still needs more
-      work. See <a href="ext:forrest/status-themes">Status of Themes: Skins and
-      Dispatcher</a>.
-    </warning>
-    <p>
-      Devs and skin developer that wants to get started with forrest:contract
-      development. To really understand this how-to you need basic and sometimes
-      advanced understanding of the "old fashion" skin development process.
-    </p>
+    <warning>The "Dispatcher" (aka "Views") is new functionality which is still
+    in development phase. That is why it is in the "whiteboard" section of the
+    Forrest distribution. This HowTo is a good start but still needs more work.
+    See 
+    <a href="ext:forrest/status-themes">Status of Themes: Skins and
+    Dispatcher</a>.</warning>
+    <p>Devs and skin developer that wants to get started with forrest:contract
+    development. To really understand this how-to you need basic and sometimes
+    advanced understanding of the "old fashion" skin development process.</p>
   </audience>
   <purpose title="Purpose">
-    <p>
-      This setup guide will explain how to create a forrest:contract from
-      scratch and how this forrest:contract work with the core parts of forrest.
-    </p>
+    <p>This setup guide will explain how to create a forrest:contract from
+    scratch and how this forrest:contract work with the core parts of
+    forrest.</p>
   </purpose>
   <prerequisites title="Prerequisites">
     <ul>
-      <li>Installing a mozilla browser and the forrestbar helps a lot in developing.</li>
+      <li>Installing a mozilla browser and the forrestbar helps a lot in
+      developing.</li>
     </ul>
   </prerequisites>
   <steps title="Steps">
-    <note>
-      The following content is from many mails around the topic, this how-to
-      tries to be the consolidation of this thread. It is mainly based on the
-      thread "[RT] Why using views" - in comparison with "old fashion" skins -
-      usecase i18n
-    </note>
-    <p>
-      By working on the i18n integration for "pelt" we again encountered the
-      reasons for using the dispatcher. ;-) The maintenance problem was to
-      change the captions of the skin features (contracts) to enable support for
-      i18n. The case is that the <code>site2xhtml.xsl</code> has a lot of
-      repeating code.
-    </p>
-    <p>
-      For example the "last-publish"-contract could be found 2 times in the
-      code. This is not the only contract that was (is) doubled in the code. The
-      problem with that is that we needed to search the code for each caption
-      and senselessly repeat the following maintenance step of adding the
+    <note>The following content is from many mails around the topic, this
+    how-to tries to be the consolidation of this thread. It is mainly based on
+    the thread "[RT] Why using views" - in comparison with "old fashion" skins
+    - usecase i18n</note>
+    <p>By working on the i18n integration for "pelt" we again encountered the
+    reasons for using the dispatcher. ;-) The maintenance problem was to change
+    the captions of the skin features (contracts) to enable support for i18n.
+    The case is that the 
+    <code>site2xhtml.xsl</code>has a lot of repeating code.</p>
+    <p>For example the "last-publish"-contract could be found 2 times in the
+    code. This is not the only contract that was (is) doubled in the code. The
+    problem with that is that we needed to search the code for each caption and
+    senselessly repeat the following maintenance step of adding the 
 <![CDATA[<i18n:text/>]]>
-      -tags.
-    </p>
+-tags.</p>
     <source>
-<![CDATA[
+      <![CDATA[
 - <script 
 - type="text/javascript">document.write("Published: " + document.lastModified);</script>
 
 + <script type="text/javascript">document.write("<i18n:text >Last
 + Published:</i18n:text>&#160;" + document.lastModified);
 ]]>
-    </source>
+</source>
     <section id="enhanceMaintenance">
       <title>Enhance the maintenance</title>
-      <p>
-        Now we can enhance the maintenance for the future and we give these code
-        snippets contracts names (based on their functionality). This naming
-        enables us to keep the contract separate from the position code itself.
-        In xsl you would simply do:
-      </p>
+      <p>Now we can enhance the maintenance for the future and we give these
+      code snippets contracts names (based on their functionality). This naming
+      enables us to keep the contract separate from the position code itself.
+      In xsl you would simply do:</p>
       <ol>
-        <li>replace the script by <![CDATA[<xsl:call-template name="siteinfo-last-published"/>]]></li>
+        <li>replace the script by 
+<![CDATA[<xsl:call-template name="siteinfo-last-published"/>]]>
+</li>
         <li>and add:</li>
       </ol>
       <source>
-<![CDATA[<xsl:template name="siteinfo-last-published">
+        <![CDATA[<xsl:template name="siteinfo-last-published">
  <script type="text/javascript">
   document.write("<i18n:text >Last Published:</i18n:text>&#160;" + document.lastModified);
  </script>
 </xsl:template>]]>
-      </source>
-      <p>
-        This allows us in a next maintenance to just change the code of
+</source>
+      <p>This allows us in a next maintenance to just change the code of 
 <![CDATA[<xsl:template name="siteinfo-last-published"/>]]>
-        and apply it in any position where it is placed.
-      </p>
-      <note>
-        Now this refactoring of the site2xhtml.xsl is exactly what we doing in
-        creating contracts for the dispatcher.
-      </note>
+and apply it in any position where it is placed.</p>
+      <note>Now this refactoring of the site2xhtml.xsl is exactly what we doing
+      in creating contracts for the dispatcher.</note>
     </section>
     <section id="blankContract">
       <title>Explaining the blank forrest:contract</title>
-      <p>
-        To start a new forrest:contract you can copy the 'blank.ft' from
-        <code>org.apache.forrest.plugin.themes.core/themes/common/html/blank.ft</code>.
-      </p>
-      <p>
-        The 'blank.ft' is a simple xml file with the following code which you
-        can use to base new contracts on:
-      </p>
+      <p>To start a new forrest:contract you can copy the 'blank.ft' from 
+      <code>
+      org.apache.forrest.plugin.themes.core/themes/common/html/blank.ft</code>.</p>
+      <p>The 'blank.ft' is a simple xml file with the following code which you
+      can use to base new contracts on:</p>
       <source>
 <![CDATA[<forrest:contract 
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
@@ -132,7 +115,11 @@
   <description>
     blank will output {contract-function}. This is just a blank contract, it will output *nothing*.
   </description>
-  <usage>]]>&lt;![CDATA[<![CDATA[<forrest:contract name="blank"/>]]>&gt;<![CDATA[</usage>
+  <usage>]]>
+&lt;![CDATA[ 
+<![CDATA[<forrest:contract name="blank"/>]]>
+&gt; 
+<![CDATA[</usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
     name="blank" inputFormat="xsl">
     <xsl:stylesheet version="1.1" 
@@ -148,121 +135,113 @@
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>]]>
-      </source>
-      <p>
-        The most important is the name of the contract <code>
-<![CDATA[<forrest:contract name="blank"/>]]>
-        </code>. This name is the same as the file name of the contract (without
-        file extension) <code>blank.ft</code>.
-      </p>
-      <note>
-        This is a <strong>naming convention</strong> that you need to always
-        meet. All @name attributes must be the file name of the contract without
-        file extension.
-      </note>
-      <p>
-        The <code>
-<![CDATA[<description/>]]>
-        </code> tag needs to be filled in with some information that is
-        explaining the contract to the webdesigner. The better explained the
-        more efficient for the web designer to pick the right contract.
-      </p>
+</source>
+      <p>The most important is the name of the contract 
+      <code>
+        <![CDATA[<forrest:contract name="blank"/>]]>
+</code>. This name is the same as the file name of the contract (without file
+extension) 
+      <code>blank.ft</code>.</p>
+      <note>This is a 
+      <strong>naming convention</strong>that you need to always meet. All @name
+      attributes must be the file name of the contract without file
+      extension.</note>
+      <p>The 
+      <code>
+        <![CDATA[<description/>]]>
+</code>tag needs to be filled in with some information that is explaining the
+contract to the webdesigner. The better explained the more efficient for the
+web designer to pick the right contract.</p>
       <source>
-<![CDATA[<description>
+        <![CDATA[<description>
   siteinfo-last-published-howto will output the last published date of the site with the help of jscript.
 </description>]]>
-      </source>
-      <p>
-        In the <code>
-<![CDATA[<usage/>]]>
-        </code> tag we have to explain how the designer can use the contract in
-        his structurer.
-      </p>
+</source>
+      <p>In the 
+      <code>
+        <![CDATA[<usage/>]]>
+</code>tag we have to explain how the designer can use the contract in his
+structurer.</p>
       <source>
-<![CDATA[<usage>]]>&lt;![CDATA[<![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>]]&gt;<![CDATA[</usage>]]>
-      </source>
-      <p>
-        To put contract code into the <code>
-<![CDATA[<head></head>]]>
-        </code> section, this needs to be declared in the contract as :- <code>
-<![CDATA[<forrest:part xpath="/html/head">...</forrest:part>]]>
-        </code> Simply by leaving out the xpath declaration and the code will go
-        into body. You can use <code>
-<![CDATA[<forrest:part xpath="/html/head">...</forrest:part><forrest:part>...</forrest:part>]]>
-        </code> if you need content in both head and body.
-      </p>
-      <warning>
-        The last paragraph about
+<![CDATA[<usage>]]>
+&lt;![CDATA[ 
+<![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>
+]]&gt; 
+<![CDATA[</usage>]]>
+</source>
+      <p>To put contract code into the 
+      <code>
+        <![CDATA[<head></head>]]>
+</code>section, this needs to be declared in the contract as :- 
+      <code>
+        <![CDATA[<forrest:part xpath="/html/head">...</forrest:part>]]>
+</code>Simply by leaving out the xpath declaration and the code will go into
+body. You can use 
+      <code>
+        <![CDATA[<forrest:part xpath="/html/head">...</forrest:part><forrest:part>...</forrest:part>]]>
+</code>if you need content in both head and body.</p>
+      <warning>The last paragraph about 
 <![CDATA[<forrest:part/>]]>
-        has replaced the older way of
+has replaced the older way of 
 <![CDATA[<forrest:template name="blank" body="false" head="false">]]>
-        . Please be aware that this part of the dispatcher is still a moving
-        target and may change still.
-      </warning>
-      <note>
-        It is possible to use contracts in different input/output formats. We
-        are focusing for now on format="html" as output and the
-        inputFormat="xsl".
-      </note>
+. Please be aware that this part of the dispatcher is still a moving target and
+may change still.</warning>
+      <note>It is possible to use contracts in different input/output formats.
+      We are focusing for now on format="html" as output and the
+      inputFormat="xsl".</note>
     </section>
     <section id="newContract">
       <title>Create a new contract</title>
-      <note >
-        We use basic naming convention for contracts. Like "naming does not say
-        anything about layout position, but functionality of the contract".
-      </note>
-      <p>
-        Now let us pick up the example we started with and create a
-        "siteinfo-last-published-howto" contract. Save the blank.ft to
-        <code>{project.home}/src/documentation/resources/themes/common/html/siteinfo-last-published-howto.ft</code>.
-      </p>
-      <p>
-        Now the maintenance-optimized code (xpath="/html/body/*") was:
-      </p>
+      <note>We use basic naming convention for contracts. Like "naming does not
+      say anything about layout position, but functionality of the
+      contract".</note>
+      <p>Now let us pick up the example we started with and create a
+      "siteinfo-last-published-howto" contract. Save the blank.ft to 
+      <code>
+      {project.home}/src/documentation/resources/themes/common/html/siteinfo-last-published-howto.ft</code>.</p>
+      <p>Now the maintenance-optimized code (xpath="/html/body/*") was:</p>
       <source>
-<![CDATA[<xsl:template name="siteinfo-last-published">
+        <![CDATA[<xsl:template name="siteinfo-last-published">
  <script type="text/javascript">
   document.write("<i18n:text >Last Published:</i18n:text>&#160;" + document.lastModified);
  </script>
 </xsl:template>]]>
-      </source>
-      <p>
-        In this code we have to do the following steps to use it in our
-        contract:
-      </p>
+</source>
+      <p>In this code we have to do the following steps to use it in our
+      contract:</p>
       <ul>
-        <li>Search and replace "siteinfo-last-published" with "siteinfo-last-publish-howto-body"</li>
+        <li>Search and replace "siteinfo-last-published" with
+        "siteinfo-last-publish-howto-body"</li>
         <li>Add a "debug string - " to the template</li>
       </ul>
-      <p>
-        The contract after this steps should look like:
-      </p>
+      <p>The contract after this steps should look like:</p>
       <source>
-<![CDATA[<xsl:template name="siteinfo-last-publish-howto-body">
+        <![CDATA[<xsl:template name="siteinfo-last-publish-howto-body">
 debug string - 
  <script type="text/javascript">
   document.write("<i18n:text >Last Published:</i18n:text>&#160;" + document.lastModified);
  </script>
 </xsl:template>]]>
-      </source>
-      <p>
-        Now we have to do some last steps in the siteinfo-last-publish-howto.ft
-      </p>
+</source>
+      <p>Now we have to do some last steps in the
+      siteinfo-last-publish-howto.ft</p>
       <ul>
         <li>Search and replace "blank" with "siteinfo-last-publish-howto"</li>
         <li>Add description and usage of the contract</li>
         <li>Copy the maintenance optimized code to the contract.</li>
       </ul>
-      <p>
-        As the result your code should look like this:
-      </p>
+      <p>As the result your code should look like this:</p>
       <source>
 <![CDATA[<forrest:contract xmlns:forrest="http://apache.org/forrest/templates/1.0"
   name="siteinfo-last-published-howto">
   <description>
     siteinfo-last-published-howto will output the last published date of the site with the help of jscript.
   </description>
-  <usage>]]>&lt;![CDATA[<![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>]]&gt;<![CDATA[</usage>
+  <usage>]]>
+&lt;![CDATA[ 
+<![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>
+]]&gt; 
+<![CDATA[</usage>
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
@@ -281,45 +260,40 @@
     </xsl:stylesheet>
   </forrest:template>
 </forrest:contract>]]>
-      </source>
+</source>
     </section>
     <section id="structurerContract">
       <title>Activating the contract</title>
-      <p>
-        To see whether the new contract works we need to add it to our
-        structurer. The contract usage contains the contract-tag <code>
-<![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>
-        </code> Please see <a href="site:dispatcher/structurer">Getting started
-        with the "structurer"</a> for more details.
-      </p>
-      <note>
-        Next to write are parameter-contracts with advanced features of the
-        dispatcher.
-      </note>
+      <p>To see whether the new contract works we need to add it to our
+      structurer. The contract usage contains the contract-tag 
+      <code>
+        <![CDATA[<forrest:contract name="siteinfo-last-published-howto"/>]]>
+</code>Please see 
+      <a href="site:dispatcher/structurer">Getting started with the
+      "structurer"</a>for more details.</p>
+      <note>Next to write are parameter-contracts with advanced features of the
+      dispatcher.</note>
     </section>
     <section id="pluginContracts">
       <title>Plugin Supplied Contracts</title>
-      <p>
-        It is possible for plugins to provide contracts for use in the
-        dispatcher. For details on how this is done see the
-        <a href="http://forrest.apache.org/docs/howto/howto-buildPlugin.html#Dispatcher">Plugin
-        HowTo</a>.
-      </p>
+      <p>It is possible for plugins to provide contracts for use in the
+      dispatcher. For details on how this is done see the 
+      <a href="http://forrest.apache.org/docs/howto/howto-buildPlugin.html#Dispatcher">
+      Plugin HowTo</a>.</p>
     </section>
   </steps>
   <extension title="Further Reading">
-    <p>
-      Congratulations you are now able to work with structurer contracts. From
-      here we recommend to read the following How-To's (if not already done):
-    </p>
+    <p>Congratulations you are now able to work with structurer contracts. From
+    here we recommend to read the following How-To's (if not already done):</p>
     <ul>
-      <li><a href="site:dispatcher/structurer">Getting started with the "structurer"</a></li>
+      <li>
+        <a href="site:dispatcher/structurer">Getting started with the
+        "structurer"</a>
+      </li>
     </ul>
   </extension>
   <feedback title="Feedback">
-    <p>
-      Please provide feedback about this document via the
-      <a href="ext:mail-lists">mailing lists</a>.
-    </p>
+    <p>Please provide feedback about this document via the 
+    <a href="ext:mail-lists">mailing lists</a>.</p>
   </feedback>
 </howto>



Mime
View raw message