forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r325864 - in /forrest/trunk: main/template-sites/v2/ main/webapp/ whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/ whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ whiteboard/plugins/o...
Date Mon, 17 Oct 2005 09:01:27 GMT
Author: thorsten
Date: Mon Oct 17 01:59:56 2005
New Revision: 325864

URL: http://svn.apache.org/viewcvs?rev=325864&view=rev
Log:
Views are now fully format aware. The request extension determines which view should be used. I needed to change all occurence of xhtml to html in 
*all* releated code (e.g. all contracts).
Still not finished the rewritting, but close to the finish. 
Started to integrate the ls.contract plugin into v2. 

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/get.structurer.by.requested.format.xsl
      - copied, changed from r322462, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/root-strip.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl
      - copied, changed from r322463, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
Modified:
    forrest/trunk/main/template-sites/v2/forrest.properties
    forrest/trunk/main/webapp/locationmap-structurer.xml
    forrest/trunk/main/webapp/locationmap-themer.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.properties.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-abstract.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-main.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-xml-link.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-main-sub.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section-round-bottom.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.scale-dev.fv
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/pelt.fv

Modified: forrest/trunk/main/template-sites/v2/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/template-sites/v2/forrest.properties?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/main/template-sites/v2/forrest.properties (original)
+++ forrest/trunk/main/template-sites/v2/forrest.properties Mon Oct 17 01:59:56 2005
@@ -24,21 +24,56 @@
 # Project name (used to name .war file)
 #project.name=my-project
 
-# Specifies name of Forrest skin to use
-# See list at http://forrest.apache.org/docs/skins.html
-#project.skin=pelt
-
-# codename: views
-# uncomment the following skin if you are using views
-#project.skin=leather-dev
-# views is using a fallback mechanism for theming.
-# You can configure the theme name and its extension here
-#project.theme-extension=.fv
-#project.theme=pelt
+#********************************************************
+# code name: views v2
+#********************************************************
+# code name: themer
+#   views is using a fallback mechanism for theming.
+#   Themes are structured and transformed through templates. 
+#   You can configure the theme name and its extension here
+#####################################
+#   *theme* aka (also known as) {project:theme}
+ project.theme=pelt
+#   *theme-extension* aka {project:theme-ext}
+ project.theme-extension=.fv
+#####################################
+#  *description* 
+#  Forrest will resolve which (view-) template is responsible 
+#  for the request with the help of themes.
+#  
+#  If no (view-) template (first choice or fallback) can be found, 
+#  the structurer will return the default fallback 
+#  ({defaults:view-themes}/{defaults:theme}{defaults:theme-ext}).
+#
+# Example (default.fv):
+# 1.request: index 
+#  First choice: index.{project:theme-ext} = index.fv
+#  First/last fallback: {project:theme}{project:theme-ext} = default.fv
+# 
+# 2.request: sample/index 
+#  First choice: sample/index.fv 
+#  First fallback: sample/default.fv 
+#  Last fallback: default.fv
+# 
+# 3.request: sample/subdir/index 
+#  First choice: sample/subdir/index.fv 
+#  First fallback: sample/subdir/default.fv 
+#  Second fallback: sample/default.fv
+#  Last fallback: default.fv
+# ...
+# The parent (view-) template inherits to its children until a child
+# is overriding this template. This fallback templating can be 
+# used for directories (default.fv) and/or files (*.fv). 
+# That means that the root view is the
+# default view as long no other view can be found in the requested child.
+##########################################
+#   *advanced configuration* - you can specify which plugins you want
+#   use internal.
+#project.themer=${forrest.home}/build/plugins/org.apache.forrest.plugin.output.themer
+#project.stucturer=${forrest.home}/build/plugins/org.apache.forrest.plugin.internal.structurer
 
-# Descriptors for plugins and skins
+# Descriptors for plugins
 # comma separated list, file:// is supported
-#forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
 #forrest.plugins.descriptors=http://forrest.apache.org/plugins/plugins.xml,http://forrest.apache.org/plugins/whiteboard-plugins.xml
 
 ##############
@@ -111,6 +146,9 @@
 # server, set to -Djava.awt.headless=true
 #forrest.jvmargs=
 
+# Debug forrest on PORT 8000
+ #forrest.jvmargs=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
+
 # The bugtracking URL - the issue number will be appended
 #project.bugtracking-url=http://issues.apache.org/bugzilla/show_bug.cgi?id=
 #project.bugtracking-url=http://issues.apache.org/jira/browse/
@@ -131,7 +169,7 @@
 # a production environment it is recomended that you specify a known working 
 # version.
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.output.pdf,org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
 
 # codename: views
 # Add the following plugins to project.required.plugins when using views:

Modified: forrest/trunk/main/webapp/locationmap-structurer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-structurer.xml?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Mon Oct 17 01:59:56 2005
@@ -70,9 +70,15 @@
           />
       </select>
     </match>
-    <match pattern="structurer.**">
+    <match pattern="get.structurer.by.requested.format.xsl">
       <select type="exists">
-        <location src="cocoon://prepare.structurer.{1}" />
+        <location src="{project:structurer}/resources/stylesheets/get.structurer.by.requested.format.xsl" />
+        <location src="{defaults:structurer}/resources/stylesheets/get.structurer.by.requested.format.xsl" />
+      </select>
+    </match>
+    <match pattern="structurer.**.*">
+      <select type="exists">
+        <location src="cocoon://prepare.structurer.{1}.{2}" />
       </select>
     </match>
     <!-- Structurer tiles - You can group elements to a template and call it from any view. -->
@@ -94,7 +100,7 @@
       </select>
     </match>
         <!-- Aggregate the forrest:properties requested by the *.fv.  -->
-    <match pattern="structurer-properties.*.**">
+    <match pattern="structurer-properties.**.*">
       <select type="exists">
         <location src="cocoon://prepare.structurer-properties.{1}.{2}" />
       </select>
@@ -123,8 +129,8 @@
     <!--  Doing the transformation of all contracts-templates requested by the view.  -->
     <match pattern="structurer-final-xsl-*.xsl">
       <select type="exists">
-        <location src="{project:structurer}/resources/stylesheets/prepare.{1}.xsl" />
-        <location src="{defaults:structurer}/resources/stylesheets/prepare.{1}.xsl" />
+        <location src="{project:structurer}/resources/stylesheets/themer.{1}.xsl" />
+        <location src="{defaults:structurer}/resources/stylesheets/themer.{1}.xsl" />
       </select>
     </match>
   </locator>

Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Mon Oct 17 01:59:56 2005
@@ -40,7 +40,7 @@
     <!-- Project implementation of templates have priority before default ones.
         If no implementation can be found we use the noFt (~ - no forrest:template) implementation.  
        {1} name of the contract -->
-    <match pattern="resolve.contract.xhtml.**">
+    <match pattern="resolve.contract.html.**">
       <select type="exists">
         <!-- project-based theme -->
         <location src="{project:resources}/templates/{project:theme}/{1}.ft" />
@@ -58,14 +58,14 @@
         <location src="{defaults:themer}/resources/templates/noFt.ft" />
       </select>
     </match>
-    <match pattern="contract.xhtml.**">
+    <match pattern="contract.html.**">
       <select type="exists">
-        <location src="cocoon://prepare.contract.xhtml.{1}" />
+        <location src="cocoon://prepare.contract.html.{1}" />
       </select>
     </match>
-    <match pattern="contract-property.xhtml.**">
+    <match pattern="contract-property.html.**">
       <select type="exists">
-        <location src="cocoon://prepare.contract-property.xhtml.{1}" />
+        <location src="cocoon://prepare.contract-property.html.{1}" />
       </select>
     </match>
     <match pattern="dataModel-xml-document-to-**.xsl">
@@ -93,7 +93,7 @@
         <location src="{defaults:structurer}/resources/stylesheets/contract-strip-xsl.xsl" />
       </select>
     </match>
-        <!-- contracts (e.g. xhtml) need  to be prepared for their stylesheet-aggregation. -->
+        <!-- contracts (e.g. html) need  to be prepared for their stylesheet-aggregation. -->
     <match pattern="contract-property.xsl">
       <select type="exists">
         <location src="{project:structurer}/resources/stylesheets/contract.property.xsl" />

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap Mon Oct 17 01:59:56 2005
@@ -162,14 +162,18 @@
       that the content can be used later on.
       {1} - requested url (striped from extension) -->
     <map:pipeline>
-      <map:match pattern="prepare.structurer.**">
-        <map:generate src="{lm:resolve.structurer.{1}}" />
+      <map:match pattern="prepare.structurer.*.**">
+        <map:generate src="{lm:resolve.structurer.{2}}" />
+        <map:transform src="{lm:get.structurer.by.requested.format.xsl}">
+          <map:parameter name="format" value="{1}" />
+        </map:transform>
         <!-- FIXME: jxpath -->
         <!-- When jxpath problem is solved rewrite tiles and uncomment -->
         <!-- <map:transform type="linkrewriter" /> -->
         <map:transform type="jx">
           <map:parameter name="lenient-xpath" value="true" />
-          <map:parameter name="getRequest" value="{1}" />
+          <map:parameter name="getRequest" value="{2}" />
+          <map:parameter name="getRequestExstension" value="{1}" />
         </map:transform>
         <map:serialize />
       </map:match>
@@ -200,7 +204,7 @@
         {2} - requested url
       -->
       <map:match pattern="prepare.structurer-properties.*.**">
-        <map:generate src="{lm:structurer.{2}}" />
+        <map:generate src="{lm:structurer.{1}.{2}}" />
         <map:transform src="{lm:structurer-properties-includes.xsl}">
           <map:parameter name="format" value="{1}" />
         </map:transform>
@@ -218,7 +222,7 @@
       -->
       <map:match pattern="structurer-xsl.*.**">
         <map:aggregate element="filter">
-          <map:part src="{lm:structurer.{2}}" />
+          <map:part src="{lm:structurer.{1}.{2}}" />
           <map:part src="{lm:structurer-properties.{1}.{2}}" />
         </map:aggregate>
         <map:transform src="{lm:structurer-final-xsl-{1}.xsl}">
@@ -235,8 +239,8 @@
         Here we are overriding the default skin generation.
       -->
       <map:match pattern="**.html">
-        <map:generate src="{lm:structurer.{1}}" />
-        <map:transform src="cocoon:/structurer-xsl.xhtml.{1}">
+        <map:generate src="{lm:structurer.html.{1}}" />
+        <map:transform src="cocoon:/structurer-xsl.html.{1}">
           <map:parameter name="path" value="{0}" />
         </map:transform>
         <!-- <map:transform src="resources/stylesheets/strip_namespaces.xsl" /> -->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl Mon Oct 17 01:59:56 2005
@@ -15,20 +15,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!--
-site2xml.xsl is the final stage in XML page production.  It merges HTML from
-document2html.xsl, tab2menu.xsl and book2menu.xsl, and adds the site header,
-footer, searchbar, css etc.  As input, it takes XML of the form:
-
-<elements>
-  <branding/>
-  <search/>
-  <menu/>
-  <content/>
-  <siteinfo/>
-</elements>
-
--->
 
 <xsl:stylesheet version="1.0" 
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/get.structurer.by.requested.format.xsl (from r322462, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/root-strip.xsl)
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/get.structurer.by.requested.format.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/get.structurer.by.requested.format.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/root-strip.xsl&r1=322462&r2=325864&rev=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/root-strip.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/get.structurer.by.requested.format.xsl Mon Oct 17 01:59:56 2005
@@ -20,8 +20,10 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
   xmlns:forrest="http://apache.org/forrest/templates/1.0">
   
+  <xsl:param name="format"/>
+  
   <xsl:template match="/">
-    <xsl:copy-of select="*/*"/>
+    <xsl:copy-of select="forrest:views/forrest:view[@type=$format]"/>
   </xsl:template>
   
 </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.properties.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.properties.xsl?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.properties.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.properties.xsl Mon Oct 17 01:59:56 2005
@@ -25,7 +25,7 @@
 
   <xsl:template match="/">
     <forrest:properties >
-	    <xsl:for-each select="forrest:views/forrest:view[@type=$format]//forrest:contract">
+	    <xsl:for-each select="forrest:view[@type=$format]//forrest:contract">
         <c:include>
           <xsl:attribute name="src">
             <xsl:value-of 

Copied: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl (from r322463, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl)
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl&r1=322463&r2=325864&rev=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.xhtml.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/themer.html.xsl Mon Oct 17 01:59:56 2005
@@ -36,12 +36,12 @@
               contracts are allowed only to be importet once! Thx to
               http://www.jenitennison.com/xslt/grouping/muenchian.html-->
             <xsl:for-each 
-              select="/*/forrest:views/forrest:view[@type='xhtml']//forrest:contract[count(. | key('contract-name', @name)[1]) = 1]">
+              select="/*/forrest:view[@type='html']//forrest:contract[count(. | key('contract-name', @name)[1]) = 1]">
               <xsl:sort select="@name" />
               <alias:include>
                 <xsl:attribute name="href">
                   <xsl:value-of 
-                    select="concat('cocoon://prepare.contract.xhtml.', @name)"/>
+                    select="concat('cocoon://prepare.contract.html.', @name)"/>
                 </xsl:attribute>
               </alias:include>  
             </xsl:for-each>
@@ -57,7 +57,7 @@
             </alias:template>
             <xsl:comment>All xhtml body elements requested by the forrest:template</xsl:comment>
             <alias:template name="getBody">
-                <xsl:apply-templates select="/*/forrest:views/forrest:view"/>
+                <xsl:apply-templates select="/*/forrest:view"/>
             </alias:template>
           <!--default entry point into the presentation model 'site'-->
             <alias:template match="/">
@@ -65,19 +65,16 @@
                     <head>
                       <!--Test whether there is an own css implemention requested by the view-->
                       <!--*No* forrest:css found in the view-->
-                        <xsl:if test="not(/*/forrest:views/forrest:view/forrest:css)">
+                        <xsl:if test="not(/*/forrest:view/forrest:css)">
                             <link rel="stylesheet" type="text/css">
                                 <xsl:attribute name="href">{$root}skin/default.css</xsl:attribute>
                             </link>
                         </xsl:if>
                       <!-- forrest:css *found* in the view-->
-                        <xsl:if test="/*/forrest:views/forrest:view/forrest:css">
-                            <xsl:apply-templates select="/*/forrest:views/forrest:view/forrest:css"/>
+                        <xsl:if test="/*/forrest:view/forrest:css">
+                            <xsl:apply-templates select="/*/forrest:view/forrest:css"/>
                         </xsl:if>
                         <alias:call-template name="getHead"/>
-                        <title>
-                            <alias:value-of select="div[@id='content']/h1"/>
-                        </title>
                     </head>
                     <body onload="init()">
                         <alias:call-template name="getBody"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap Mon Oct 17 01:59:56 2005
@@ -32,6 +32,7 @@
         src="org.apache.cocoon.generation.HTMLGenerator">
         <jtidy-config>jtidy.properties</jtidy-config>
       </map:generator>
+      <map:generator label="content" logger="sitemap.generator.xpathdirectory" name="xpathdirectory" src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
       <map:generator name="directory"
         src="org.apache.cocoon.generation.DirectoryGenerator" />
     </map:generators>
@@ -76,7 +77,7 @@
         <map:generate src="status.xml" />
         <map:transform src="resources/stylesheets/temp.xsl">
           <map:parameter name="test"
-            value="{lm:contract-property.{2}.{1}}" />
+            value="{lm:structurer-final-xsl-{1}.xsl}" />
         </map:transform>
         <map:serialize />
       </map:match>
@@ -88,10 +89,11 @@
       list the default fbits-->
     <map:pipeline>
       <map:match pattern="ls.contracts">
-        <map:generate type="directory" src="resources/templates">
-          <map:parameter name="depth" value="1" />
-          <!-- sorted alphabetically -->
-          <map:parameter name="reverse" value="false" />
+       <map:generate src="resources/templates" type="xpathdirectory">
+          <map:parameter name="xpath" value="*" />
+          <map:parameter name="xmlFiles" value="\.ft$" />
+          <map:parameter name="exclude" value="[\w]*.svn" />
+            <map:parameter name="depth" value="2" />
         </map:generate>
         <map:serialize type="xml" />
       </map:match>
@@ -102,11 +104,11 @@
       <map:match pattern="ls.contracts.project">
         <map:generate type="directory"
           src="{project:resources}/templates/">
-          <map:parameter name="depth" value="1" />
+          <map:parameter name="depth" value="2" />
           <!-- sorted alphabetically -->
           <map:parameter name="reverse" value="false" />
         </map:generate>
-        <map:serialize type="xml" />
+        
       </map:match>
     </map:pipeline>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft Mon Oct 17 01:59:56 2005
@@ -28,7 +28,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="blank" inputFormat="xsl" body="false" head="false">
+    format="html" name="blank" inputFormat="xsl" body="false" head="false">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
         <!--Add here the needed templates-->

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft Mon Oct 17 01:59:56 2005
@@ -36,7 +36,7 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="branding-breadcrumbs" inputFormat="xsl" body="true" head="false">
+    format="html" name="branding-breadcrumbs" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft Mon Oct 17 01:59:56 2005
@@ -24,7 +24,7 @@
   <usage><![CDATA[<forrest:contract name="branding-fontsize"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="branding-fontsize" inputFormat="xsl" body="true" head="true">
+  format="html" name="branding-fontsize" inputFormat="xsl" body="true" head="true">
 	 	<xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="branding-fontsize-head">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="branding-logo" inputFormat="xsl" body="true" head="false">
+  format="html" name="branding-logo" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="branding-logo-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
     <forrest:template 
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:forrest="http://apache.org/forrest/templates/1.0"
-        format="xhtml" name="branding-tagline" inputFormat="xsl" body="true" head="false" css="false">
+        format="html" name="branding-tagline" inputFormat="xsl" body="true" head="false" css="false">
         <xsl:stylesheet version="1.1" 
             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
             <xsl:template name="branding-tagline-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft Mon Oct 17 01:59:56 2005
@@ -20,7 +20,7 @@
   <description> Display valid XHTML and CSS compliance links </description>
   <usage><![CDATA[<forrest:contract name="siteinfo-compliance-links"/>]]></usage>
   <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="xhtml" 
+    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="html" 
     name="siteinfo-compliance-links" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-abstract" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-abstract-body">
         <xsl:param name="content-abstract"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft Mon Oct 17 01:59:56 2005
@@ -24,7 +24,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="content-author"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-author" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-author" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-author-body">
 	<xsl:comment>+

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-authors" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-authors" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-authors-body">
         <xsl:param name="content-authors"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="content-feeder" inputFormat="xsl" body="true" head="false">
+  format="html" name="content-feeder" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-feeder-body" >

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft Mon Oct 17 01:59:56 2005
@@ -36,7 +36,7 @@
   
   <forrest:template
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" 
+    format="html" 
     name="content-include-html" 
     inputFormat="xsl" 
     body="true" 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft Mon Oct 17 01:59:56 2005
@@ -34,7 +34,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="content-ls-contracts" inputFormat="xsl" body="true" head="false">
+  format="html" name="content-ls-contracts" inputFormat="xsl" body="true" head="false">
 
    <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft Mon Oct 17 01:59:56 2005
@@ -31,7 +31,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-main-lenya" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-main-lenya" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="content-main-lenya-body" >
         <xsl:param name="content-main-lenya"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-main" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-main-body" >
         <xsl:param name="content-main"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft Mon Oct 17 01:59:56 2005
@@ -36,7 +36,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="content-minitoc" inputFormat="xsl" body="true" 
+    format="html" name="content-minitoc" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft Mon Oct 17 01:59:56 2005
@@ -61,7 +61,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-motd-page" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-motd-page" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-motd-page-body" 
         match="div[@id='content']/div[@id='skinconf-toc-page']">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
 	<usage><![CDATA[<forrest:contract name="content-pdf-link"/>]]></usage>
 	<forrest:template
   	xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  	format="xhtml" name="content-pdf-link" inputFormat="xsl" body="true" head="false">
+  	format="html" name="content-pdf-link" inputFormat="xsl" body="true" head="false">
   	<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="content-pdf-link-body">
           <a href="{$filename-noext}.pdf" class="format">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="content-pod-link"/>]]></usage>
 	<forrest:template
   	xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  	format="xhtml" name="content-pod-link" inputFormat="xsl" body="true" head="false">
+  	format="html" name="content-pod-link" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="content-pod-link-body">
 		    <a href="{$filename-noext}.pod" class="format">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft Mon Oct 17 01:59:56 2005
@@ -28,7 +28,7 @@
     <usage><![CDATA[<forrest:contract name="content-source-xml-link"/>]]></usage>
     <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="content-source-xml-link" inputFormat="xsl" body="true">
+  format="html" name="content-source-xml-link" inputFormat="xsl" body="true">
       <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="content-source-xml-link-body">
           <a href="{$filename-noext}.source.xml" class="dida">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-title" inputFormat="xsl" body="true" head="true">
+    format="html" name="content-title" inputFormat="xsl" body="true" head="true">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-title-head" >
         <xsl:param name="content-title"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="content-txt-link"/>]]></usage>
   
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="content-txt-link" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-txt-link" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-txt-link-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft Mon Oct 17 01:59:56 2005
@@ -25,7 +25,7 @@
     <usage><![CDATA[<forrest:contract name="content-xml-link"/>]]></usage>
     <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="content-xml-link" inputFormat="xsl" body="true">
+  format="html" name="content-xml-link" inputFormat="xsl" body="true">
       <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="content-xml-link-body">
           <a href="{$filename-noext}.xml" class="format">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="genericMarkup" inputFormat="xsl" body="true" head="false">
+    format="html" name="genericMarkup" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 	    <xsl:template name="genericMarkup-body">
         <xsl:param name="genericMarkup"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-sub-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-main" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-main" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-section" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-section" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="noFt" inputFormat="xsl" body="true" head="true" 
+    format="html" name="noFt" inputFormat="xsl" body="true" head="true" 
     css="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-abstract.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-abstract.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-abstract.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-abstract.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-abstract" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-abstract" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-abstract-body">
         <xsl:param name="content-abstract"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-main.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-main.ft Mon Oct 17 01:59:56 2005
@@ -35,7 +35,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="content-main" inputFormat="xsl" body="true" head="false">
+    format="html" name="content-main" inputFormat="xsl" body="true" head="false">
      <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="content-main-body" >
         <xsl:param name="content-main"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-xml-link.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-xml-link.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-xml-link.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/content-xml-link.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
     <usage><![CDATA[<forrest:contract name="content-xml-link"/>]]></usage>
     <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="content-xml-link" inputFormat="xsl" body="true">
+  format="html" name="content-xml-link" inputFormat="xsl" body="true">
       <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="content-xml-link-body">
           <a href="{$filename-noext}.xml" class="format">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-main-sub.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-main-sub.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-main-sub.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-main-sub.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-main-sub" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-main-sub-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section-round-bottom.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section-round-bottom.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section-round-bottom.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section-round-bottom.ft Mon Oct 17 01:59:56 2005
@@ -23,7 +23,7 @@
   <usage><![CDATA[<forrest:contract name="nav-section-round-bottom"/>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-section-round-bottom" inputFormat="xsl" body="true" head="false">
+  format="html" name="nav-section-round-bottom" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="nav-section-round-bottom-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/nav-section.ft Mon Oct 17 01:59:56 2005
@@ -29,7 +29,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="nav-section" inputFormat="xsl" body="true" head="true">
+  format="html" name="nav-section" inputFormat="xsl" body="true" head="true">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="nav-section-head">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/search-input.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/search-input.ft Mon Oct 17 01:59:56 2005
@@ -32,7 +32,7 @@
   <forrest:template
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="search-input" inputFormat="xsl" body="true" head="true">
+  format="html" name="search-input" inputFormat="xsl" body="true" head="true">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored into

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/siteinfo-credits.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/pelt/siteinfo-credits.ft Mon Oct 17 01:59:56 2005
@@ -39,7 +39,7 @@
    </forrest:properties>]
  </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" 
+    format="html" name="siteinfo-credits" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft Mon Oct 17 01:59:56 2005
@@ -34,7 +34,7 @@
   <forrest:template
   xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="search-input" inputFormat="xsl" body="true" head="false">
+  format="html" name="search-input" inputFormat="xsl" body="true" head="false">
 
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored into

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft Mon Oct 17 01:59:56 2005
@@ -24,7 +24,7 @@
     <forrest:template 
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:forrest="http://apache.org/forrest/templates/1.0"
-        format="xhtml" name="siteinfo-compliance-links" inputFormat="xsl" body="true" head="false">
+        format="html" name="siteinfo-compliance-links" inputFormat="xsl" body="true" head="false">
         <xsl:stylesheet version="1.1" 
             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
             <xsl:template name="siteinfo-compliance-links-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft Mon Oct 17 01:59:56 2005
@@ -34,7 +34,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="xhtml" 
+    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="html" 
     name="siteinfo-copyright" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft Mon Oct 17 01:59:56 2005
@@ -38,7 +38,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-credits" inputFormat="xsl" body="true" 
+    format="html" name="siteinfo-credits" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft Mon Oct 17 01:59:56 2005
@@ -26,7 +26,7 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="siteinfo-current-time" inputFormat="xsl" body="true" head="false">
+    format="html" name="siteinfo-current-time" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
 		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="siteinfo-feedback-dyn" inputFormat="xsl" body="true" head="false">
+  format="html" name="siteinfo-feedback-dyn" inputFormat="xsl" body="true" head="false">
 
       <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft Mon Oct 17 01:59:56 2005
@@ -33,7 +33,7 @@
   </forrest:properties>
 </forrest:contract>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-feedback" inputFormat="xsl" body="true" 
+    format="html" name="siteinfo-feedback" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft Mon Oct 17 01:59:56 2005
@@ -30,7 +30,7 @@
   <usage><![CDATA[<forrest:contract name="siteinfo-last-published-net"/>]]>
     </usage>
   <forrest:template xmlns:i18n="http://apache.org/cocoon/i18n/2.1" 
-    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="xhtml" 
+    xmlns:forrest="http://apache.org/forrest/templates/1.0" format="html" 
     name="siteinfo-last-published-net" inputFormat="xsl" body="true" 
     head="false">
     <xsl:stylesheet version="1.1" 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft Mon Oct 17 01:59:56 2005
@@ -24,7 +24,7 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="siteinfo-last-published" inputFormat="xsl" body="true" head="false">
+    format="html" name="siteinfo-last-published" inputFormat="xsl" body="true" head="false">
     <xsl:stylesheet version="1.1" 
 		    xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft Mon Oct 17 01:59:56 2005
@@ -34,7 +34,7 @@
   <forrest:template 
     xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
     xmlns:forrest="http://apache.org/forrest/templates/1.0"
-    format="xhtml" name="siteinfo-meta-icon" inputFormat="xsl" body="false" head="true">
+    format="html" name="siteinfo-meta-icon" inputFormat="xsl" body="false" head="true">
     <xsl:stylesheet version="1.1" 
         xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft Mon Oct 17 01:59:56 2005
@@ -24,7 +24,7 @@
   </description>
   <usage><![CDATA[<forrest:contract name="siteinfo-meta-navigation"/>]]></usage>
   <forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0" 
-    format="xhtml" name="siteinfo-meta-navigation" inputFormat="xsl" 
+    format="html" name="siteinfo-meta-navigation" inputFormat="xsl" 
     body="false" head="true">
     <xsl:stylesheet version="1.1" 
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft Mon Oct 17 01:59:56 2005
@@ -33,7 +33,7 @@
 </forrest:contract>]]></usage>
   <forrest:template
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
-  format="xhtml" name="siteinfo-meta" inputFormat="xsl" body="false" head="true">
+  format="html" name="siteinfo-meta" inputFormat="xsl" body="false" head="true">
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 		  <xsl:template name="siteinfo-meta-head">
         <xsl:param name="siteinfo-meta" select="'test'"/>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.fv?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.fv Mon Oct 17 01:59:56 2005
@@ -19,7 +19,7 @@
 <forrest:views 
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <forrest:view type="xhtml">
+  <forrest:view type="html">
     <forrest:css url="default.css"/>
     <forrest:contract name="siteinfo-meta">
       <forrest:properties contract="siteinfo-meta">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.scale-dev.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.scale-dev.fv?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.scale-dev.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/default.scale-dev.fv Mon Oct 17 01:59:56 2005
@@ -17,7 +17,7 @@
 -->
 
 <forrest:views xmlns:forrest="http://apache.org/forrest/templates/1.0" >
-  <forrest:view type="xhtml">
+  <forrest:view type="html">
     <forrest:contract name="meta"/>
     <forrest:hook name="container">
       <forrest:hook name="branding">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/pelt.fv
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/pelt.fv?rev=325864&r1=325863&r2=325864&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/pelt.fv (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/views/pelt.fv Mon Oct 17 01:59:56 2005
@@ -19,7 +19,7 @@
 <forrest:views 
   xmlns:forrest="http://apache.org/forrest/templates/1.0"
   xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
-  <forrest:view type="xhtml">
+  <forrest:view type="html">
     <forrest:css url="default.css" media="screen" rel="alternate stylesheet" title="leather-dev"/>
     <forrest:css url="leather-dev.css" media="screen" rel="alternate stylesheet" title="leather-dev"/>
     <forrest:css url="pelt.basic.css" media="screen" title="Pelt"/>



Mime
View raw message