forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r322463 - in /forrest/trunk: main/targets/ main/template-sites/v2/ main/template-sites/v2/src/ main/webapp/ main/webapp/WEB-INF/xconf/ site-author/content/xdocs/docs_0_80/howto/ whiteboard/plugins/org.apache.forrest.plugin.internal.structur...
Date Sun, 16 Oct 2005 10:02:34 GMT
Author: thorsten
Date: Sun Oct 16 03:01:36 2005
New Revision: 322463

URL: http://svn.apache.org/viewcvs?rev=322463&view=rev
Log:
Further refactored the structurer and themer. Being close to 'just' one plugin for the structurer. Added new seed v2 to forrrest. Removed not needed xsls.

Added:
    forrest/trunk/main/template-sites/v2/
      - copied from r321124, forrest/trunk/main/template-sites/basic/
    forrest/trunk/main/template-sites/v2/forrest.properties
      - copied unchanged from r322462, forrest/trunk/main/template-sites/basic/forrest.properties
    forrest/trunk/main/template-sites/v2/src/
      - copied from r322462, forrest/trunk/main/template-sites/basic/src/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract.property.xsl
      - copied unchanged from r321127, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/contract.property.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2authors.xsl
      - copied unchanged from r321124, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2authors.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2toc.xsl
      - copied unchanged from r321124, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2toc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/xml/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl   (with props)
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2abstract.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2authors.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/html/document2toc.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/includes-viewLocationmap.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.css.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.include.templates.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/prepare.include.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/viewLocationmap.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/viewLocationmap2path.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/contract.property.xsl
Modified:
    forrest/trunk/main/targets/seed.xml
    forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
    forrest/trunk/main/webapp/locationmap-structurer.xml
    forrest/trunk/main/webapp/locationmap-themer.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-structurer-install.xml
    forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-view-install.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
    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.internal.structurer/resources/stylesheets/prepare.xhtml.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/site.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/forrest.properties
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
    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/views/pelt.fv

Modified: forrest/trunk/main/targets/seed.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/targets/seed.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/main/targets/seed.xml (original)
+++ forrest/trunk/main/targets/seed.xml Sun Oct 16 03:01:36 2005
@@ -59,6 +59,17 @@
     <echo>${template-project-created-message}</echo>
   </target>
 
+  <target name="seed-v2" depends="ensure-nocontent"
+    description="* Seeds a basic views v2 example (1 file) and structure">
+     <copy todir="${project.home}" overwrite="false">
+        <fileset dir="${forrest.core}/template-sites/v2"/>
+     </copy>
+     <loadfile  property="template-project-created-message" srcFile="${forrest.core}/var/template-project-created-message-basic.txt">
+        <filterchain><expandproperties/></filterchain>
+    </loadfile>
+    <echo>${template-project-created-message}</echo>
+  </target>
+
   <target name="seed-benchmark" depends="ensure-nocontent"
     description="* Seeds a site to use for benchmarking measurements">
      <copy todir="${project.home}" overwrite="false">

Modified: forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf (original)
+++ forrest/trunk/main/webapp/WEB-INF/xconf/forrest-core.xconf Sun Oct 16 03:01:36 2005
@@ -152,7 +152,7 @@
         <plugins>@forrest.home@/build/plugins</plugins>
         <locationmap>@context.home@/locationmap.xml</locationmap>
         <structurer>@forrest.home@/build/plugins/org.apache.forrest.plugin.internal.structurer</structurer>
-        <themer>@forrest.home@/build/plugins/org.apache.forrest.plugin.output.themes</themer>
+        <themer>@forrest.home@/build/plugins/org.apache.forrest.plugin.output.themer</themer>
         <view-internal>@forrest.home@/build/plugins/@project.view.internal.plugin@</view-internal>
         <view-themes>@forrest.home@/build/plugins/@project.theme.plugin@/resources/views</view-themes>
         <theme-ext>.fv</theme-ext>

Modified: forrest/trunk/main/webapp/locationmap-structurer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-structurer.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Sun Oct 16 03:01:36 2005
@@ -107,12 +107,12 @@
       </select>
     </match>
     <!--  Aggregate the contract-templates requested by the view with cinclude.  -->
-    <match pattern="structurer-xsl-includes.xsl">
+    <!--<match pattern="structurer-xsl-includes.xsl">
       <select type="exists">
         <location src="{project:structurer}/resources/stylesheets/prepare.include.xsl" />
         <location src="{defaults:structurer}/resources/stylesheets/prepare.include.xsl" />
       </select>
-    </match>
+    </match>-->
     <!--  Aggregate the forrest:properties requested by the *.fv with cinclude.  -->
     <match pattern="structurer-properties-includes.xsl">
       <select type="exists">

Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Sun Oct 16 03:01:36 2005
@@ -58,11 +58,46 @@
         <location src="{defaults:themer}/resources/templates/noFt.ft" />
       </select>
     </match>
+    <match pattern="contract.xhtml.**">
+      <select type="exists">
+        <location src="cocoon://prepare.contract.xhtml.{1}" />
+      </select>
+    </match>
+    <match pattern="contract-property.xhtml.**">
+      <select type="exists">
+        <location src="cocoon://prepare.contract-property.xhtml.{1}" />
+      </select>
+    </match>
+    <match pattern="dataModel-xml-document-to-**.xsl">
+      <select type="exists">
+        <!-- FIXME 
+          to-xml should become xml 
+          document2 should become document-to-
+          after commiting -->
+        <location src="{project:skins-dir}{project:theme}/xslt/to-xml/document2{1}.xsl" />
+        <location src="{project:structurer}/resources/stylesheets/to-xml/document2{1}.xsl" />
+        <location src="{defaults:structurer}/resources/stylesheets/to-xml/document2{1}.xsl" />
+      </select>
+    </match>
+    <match pattern="dataModel-html-**.xsl">
+      <select type="exists">
+        <location src="{project:skins-dir}{project:theme}/xslt/html/{1}.xsl" />
+        <location src="{project:structurer}/resources/stylesheets/html/{1}.xsl" />
+        <location src="{defaults:structurer}/resources/stylesheets/html/{1}.xsl" />
+      </select>
+    </match>
         <!-- contracts have to be striped to their stylesheet for aggregation. -->
     <match pattern="contract-strip-xsl.xsl">
       <select type="exists">
         <location src="{project:structurer}/resources/stylesheets/contract-strip-xsl.xsl" />
         <location src="{defaults:structurer}/resources/stylesheets/contract-strip-xsl.xsl" />
+      </select>
+    </match>
+        <!-- contracts (e.g. xhtml) 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" />
+        <location src="{defaults:structurer}/resources/stylesheets/contract.property.xsl" />
       </select>
     </match>
   </locator>

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-structurer-install.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-structurer-install.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-structurer-install.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-structurer-install.xml Sun Oct 16 03:01:36 2005
@@ -19,7 +19,7 @@
 
 <howto>
  <header>
-  <title>How to install the views</title>
+  <title>How to install the views v2 (testing version)</title>
   <abstract>
     This How-To describes the setup of the plugins (needed to work with forrest:views and forrest:contracts) and a fresh seed site.
   </abstract>
@@ -30,12 +30,13 @@
 
 <warning>
 "Views" are 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.
+"whiteboard" section of the Forrest distribution. This HowTo is a good start but still needs more work.
 </warning>
-
+<warning> Views v2 are not usable in combination with the linkrewriter!!! There 
+  is a bug with commons-jxpath-1.2.jar and cocoon-linkrewriter-block.jar! 
+  </warning>
     <p>
-      Developers who want to get started with view development.
+      Developers who want to get started with view v2 development.
     </p>
   </audience>
   
@@ -47,15 +48,14 @@
 
   <prerequisites title="Prerequisites">
     <ul>
-      <li>Need the SVN trunk version of Forrest for using views because it is in an early stage.</li>
+      <li>Need the SVN trunk version of Forrest for using views v2 because it is in an early stage.</li>
       <li>Read <a href="site:v0.80//howto/buildPlugin">How to Build a Plugin</a>
         especially the section about using Forrest's own Ant.</li>
     </ul>
 <warning>
 Need a recent version of SVN trunk. If you had a working site using the old
-views development in trunk, and don't want to use the new views plugins,
-then use r292708 (see
-<a href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112839617103846">mail</a>).
+views v1 (stable version) development in trunk, and don't want to use the new views v2 plugins,
+then use <a href="site:howto/view/install">how to install v1</a>.
 </warning>
   </prerequisites>
 
@@ -76,23 +76,26 @@
 svn up
 cd whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/
 ant local-deploy
-cd ../org.apache.forrest.plugin.output.themes/
+cd ../org.apache.forrest.plugin.output.themer/
 ant local-deploy
       </source>
       <p>
-        Alternatively, run the script <code>etc/views.sh</code>
+        Alternatively, run the script <code>etc/structurer.sh</code> after you did an update.
       </p>
     </section>
     <section id="jxpath">
       <title>Upgrade the JXPath library</title>
       <p> 
-        Replace lib/core/commons-jxpath-20030909.jar with commons-jxpath-1.2.jar
+        Replace lib/core/commons-jxpath-20030909.jar with commons-jxpath-1.2.jar (you can find it in a cocoon distribution 
+        or on the jarkata website).
       </p> 
-<note>
+<warning>
 That will introduce Issue
 <a href="http://issues.apache.org/jira/browse/FOR-675">FOR-675</a>
-- please help to fix it.
-</note>
+- please help to fix it. This issue prevent that the linkrewritting is working (site:something will *not* be rewritten).
+Besides the plugin can only be used in "forrest run" mode (*without* linkrewriting!!!). If you do need the linkrewriter then
+use views v1.
+</warning>
     </section>
     <section id="newSeed">
       <title>Seed a new project</title>
@@ -101,31 +104,21 @@
       </p>
       <source>
 cd ~/src/newSeed
-forrest seed
+forrest seed-v2
       </source>
     </section>
     <section id="forrestProperties">
-      <title>Modifying forrest.properties</title>
+      <title>Modifying forrest.properties (if you not use the seed-v2 target)</title>
       <p>
         Tell forrest that we are using the view plugins. Edit
         forrest.properties to add the required plugins:
       </p>
       <source>
-project.required.plugins=org.apache.forrest.plugin.output.themes,org.apache.forrest.plugin.internal.structurer
-      </source>
-      <p>
-	     Change the project skin to leather-dev. The reason is that the plugins are still
-       not independent from the "old fashion skins".  
-      </p>
-      <note>We are exchanging only
-	     site2xhtml.xsl of leather-dev skin with the plugins, and some contracts are based
-	     on e.g. document2html.xsl output of leather-dev.</note>
-     <source>
-project.skin=leather-dev
+project.required.plugins=org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.structurer
       </source>
     </section>
     <section id="testing">
-      <title>Test your new view based project</title>
+      <title>Test your new view v2 based project</title>
       <p> 
         Now you have finished the preparation and the setup to finally do
       </p>
@@ -137,6 +130,7 @@
     </section>
     <section id="availableContracts">
 	    <title>Available contracts</title>
+      <fixme>thorsten: Create this list internally and delete this paragraph about installing another plugin!</fixme>
 	    <p> 
 	     To start working with views, you need to know which contracts you can use. 
 	     For this we will install another plugin <code>org.apache.forrest.plugin.input.viewHelper.xhtml.ls</code>.

Modified: forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-view-install.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-view-install.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-view-install.xml (original)
+++ forrest/trunk/site-author/content/xdocs/docs_0_80/howto/howto-view-install.xml Sun Oct 16 03:01:36 2005
@@ -19,7 +19,7 @@
 
 <howto>
  <header>
-  <title>How to install the views (deprecated)</title>
+  <title>How to install the views v1 (to be deprecated)</title>
   <abstract>
     This How-To describes the setup of the plugins (needed to work with forrest:views and forrest:contracts) and a fresh seed site.
   </abstract>
@@ -34,33 +34,33 @@
 </warning>
 
 <warning>
-This document relates to an early development version of "views".
+This document relates to an early development version of "views" (v1).
 Please use the current development instead. Start at
 <a href="site:howto/dispatcher/install">howto-structurer-install</a>.
 </warning>
 
     <p>
-      Developers who are using the old version of "views" development.
+      Developers who are using the old version of "views v1" development.
     </p>
   </audience>
   
   <purpose title="Purpose">
     <p>
-      To help with installing views. This is the "getting started" setup guide.
+      To help with installing views v1. This is the "getting started" setup guide.
     </p>
   </purpose>
 
   <prerequisites title="Prerequisites">
     <ul>
-      <li>Need the SVN trunk version of Forrest for using views because it is in an early stage.</li>
+      <li>Need the SVN trunk version of Forrest for using views v1 because it is in an early stage.</li>
       <li>Read <a href="site:v0.80//howto/buildPlugin">How to Build a Plugin</a>
         especially the section about using Forrest's own Ant.</li>
     </ul>
 <warning>
 Need a recent version of SVN trunk. If you had a working site using the old
-views development in trunk, and don't want to use the new views plugins,
-then use at least version r292708 (see
-<a href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112839617103846">mail</a>).
+views v1 development in trunk, and don't want to use the new views v2 plugins (see
+<a href="http://marc.theaimsgroup.com/?l=forrest-dev&amp;m=112839617103846">mail</a>). We nailed 
+the views v1 plugins to a stable version, just follow this howto and you will have no problems.
 </warning>
   </prerequisites>
 

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/dataModel.xmap Sun Oct 16 03:01:36 2005
@@ -2,13 +2,13 @@
 <!--
   Copyright 1999-2004 The Apache Software Foundation or its licensors,
   as applicable.
-
+  
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
+  
+  http://www.apache.org/licenses/LICENSE-2.0
+  
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,171 +17,109 @@
 -->
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:pipes default="caching">
-      <map:pipe name="caching" 
-        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline"/>
-      <map:pipe name="noncaching" 
-        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline"/>
-    </map:pipes>
-    <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists" 
-        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
-    </map:selectors>
-    <map:generators default="file">
-      <map:generator name="traverse" 
-        src="org.apache.cocoon.generation.TraversableGenerator" 
-        logger="sitemap.generator.traverse" label="content" pool-max="16" />
-      <map:generator name="directory" 
-        src="org.apache.cocoon.generation.DirectoryGenerator" />
-      <!--map:generator name="jx" logger="sitemap.generator.jx" 
-        src="org.apache.cocoon.template.JXTemplateGenerator" 
-        label="content,data" pool-max="16">
-      </map:generator-->
-      <map:generator name="jx" logger="sitemap.generator.jx" 
-        src="org.apache.cocoon.generation.JXTemplateGenerator" 
-        label="content,data" pool-max="16">
-      </map:generator>
-    </map:generators>
-    <map:transformers default="xslt">
-      <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16" 
-        src="org.apache.cocoon.transformation.JXTemplateTransformer"/>
-      <map:transformer logger="sitemap.transformer.jpath" name="jpath" 
-        src="org.apache.cocoon.transformation.JPathTransformer"/>
-      <map:transformer name="cinclude" 
-        src="org.apache.cocoon.transformation.CIncludeTransformer"/>
-      <map:transformer name="xinclude" 
-        src="org.apache.cocoon.transformation.XIncludeTransformer"/>
-    </map:transformers>
-    <map:serializers default="xml">
-      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html" 
-        name="xhtml" pool-grow="2" pool-max="64" pool-min="2" 
-        src="org.apache.cocoon.serialization.XMLSerializer">
-        <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
-        <doctype-system> 
-          http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
-        <encoding>UTF-8</encoding>
-      </map:serializer>
-      <map:serializer name="text" 
-        src="org.apache.cocoon.serialization.TextSerializer" 
-        mime-type="text/plain" logger="sitemap.serializer.text" />
-    </map:serializers>
-    <map:actions>
-      <map:action name="fallbackResolverAction" 
-        src="org.apache.forrest.plugin.internal.view.acting.FallbackResolverAction"/>
-    </map:actions>
+    <map:pipes default="caching"/>
+    <map:generators default="file" />
+    <map:transformers default="xslt" />
+    <map:serializers default="xml" />
   </map:components>
-  <map:resources>
-    <map:resource name="skinit">
-      <map:select type="exists">
-        <map:when 
-          test="{project:skins-dir}{project:theme}/xslt/html/{type}.xsl">
-          <map:transform 
-            src="{project:skins-dir}{project:theme}/xslt/html/{type}.xsl">
-            <map:parameter name="notoc" value="{notoc}"/>
-            <!-- FIXME: do we need this anymore? -->
-            <!-- For backwards-compat with 0.2 - 0.4 skins -->
-            <map:parameter name="isfaq" value="{notoc}"/>
-            <map:parameter name="nopdf" value="{nopdf}"/>
-            <map:parameter name="path" value="{path}"/>
-            <map:parameter name="config-file" value="{project:skinconf}"/>
-          </map:transform>
-        </map:when>
-        <map:otherwise>
-          <map:transform src="resources/stylesheets/html/{type}.xsl">
-            <map:parameter name="notoc" value="{notoc}"/>
-            <!-- For backwards-compat with 0.2 - 0.4 skins -->
-            <map:parameter name="isfaq" value="{notoc}"/>
-            <map:parameter name="nopdf" value="{nopdf}"/>
-            <map:parameter name="path" value="{path}"/>
-            <map:parameter name="config-file" value="{project:skinconf}"/>
-          </map:transform>
-        </map:otherwise>
-      </map:select>
-      <map:serialize/>
-    </map:resource>
-  </map:resources>
   <map:pipelines>
-  
+
     <!--
-  businessHelper
-  This is the model producing factory.
-  -->
+      businessHelper
+      This is the model producing factory.
+    -->
     <map:pipeline>
       <!-- intermediate format link rewritten-->
       <map:match pattern="**.source.rewritten.xml">
-        <map:generate src="cocoon://{1}{2}.xml"/>
-        <map:transform type="idgen"/>
-        <map:transform type="xinclude"/>
-        <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:transform 
+        <map:generate src="cocoon://{1}.xml" />
+        <map:transform type="idgen" />
+        <map:transform type="xinclude" />
+        <map:transform type="linkrewriter"
+          src="cocoon://structurer-linkmap.{1}" />
+        <map:transform
           src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
-        <map:serialize/>
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <!-- HTML rendered from intermediate format -->
       <map:match pattern="**.body.xml">
-        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="document2html"/>
-          <map:parameter name="path" value="{1}{2}.html"/>
-          <map:parameter name="notoc" value="false"/>
-        </map:call>
+        <map:generate src="cocoon://{1}.xml" />
+        <map:transform src="{lm:dataModel-html-document2html.xsl}">
+          <map:parameter name="path" value="{1}.html" />
+        </map:transform>
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <!-- TOC from source.rewritten-->
       <map:match pattern="**.toc.xml">
-        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="document2toc"/>
-          <map:parameter name="path" value="{1}{2}.html"/>
-          <map:parameter name="notoc" value="false"/>
-        </map:call>
+        <map:generate src="cocoon:/{1}.source.rewritten.xml" />
+        <map:transform src="{lm:dataModel-xml-document-to-toc.xsl}" />
+        <map:serialize />
       </map:match>
-       <!-- abstract from source.rewritten-->
+    </map:pipeline>
+    <map:pipeline>
       <map:match pattern="**.abstract.xml">
-        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="document2abstract"/>
-          <map:parameter name="path" value="{1}{2}.html"/>
-          <map:parameter name="notoc" value="false"/>
-        </map:call>
+        <map:generate src="cocoon://{1}.xml" />
+        <map:transform
+          src="{lm:dataModel-xml-document-to-abstract.xsl}" />
+        <map:serialize />
       </map:match>
-       <!-- authors from source.rewritten-->
+    </map:pipeline>
+    <map:pipeline>
       <map:match pattern="**.authors.xml">
-        <map:generate src="cocoon:/{1}{2}.source.rewritten.xml"/>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="document2authors"/>
-          <map:parameter name="path" value="{1}{2}.html"/>
-          <map:parameter name="notoc" value="false"/>
-        </map:call>
+        <map:generate src="cocoon://{1}.xml" />
+        <map:transform src="{lm:dataModel-xml-document-to-authors.xsl}" />
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
+      <map:match pattern="**.title.xml">
+        <map:generate src="cocoon://{1}.xml" />
+        <map:transform src="{lm:dataModel-xml-document-to-title.xsl}" />
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <!-- navigation for the current request -->
       <map:match pattern="*.navigation.xml">
         <map:aggregate element="navigation">
-          <map:part src="cocoon:/tab-{1}.html" element="tab"/>
-          <map:part src="cocoon:/menu-{1}.html" element="menu"/>
+          <map:part src="cocoon:/tab-{1}.html" element="tab" />
+          <map:part src="cocoon:/menu-{1}.html" element="menu" />
         </map:aggregate>
-        <map:serialize/>
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <map:match pattern="**/*.navigation.xml">
         <map:aggregate element="navigation">
-          <map:part src="cocoon:/{1}/tab-{2}.html" element="tab"/>
-          <map:part src="cocoon:/{1}/menu-{2}.html" element="menu"/>
+          <map:part src="cocoon:/{1}/tab-{2}.html" element="tab" />
+          <map:part src="cocoon:/{1}/menu-{2}.html" element="menu" />
         </map:aggregate>
-        <map:serialize/>
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <!-- navigation for the current request PART menu-->
       <map:match pattern="**book-*.html">
         <map:mount uri-prefix="" src="menu.xmap" check-reload="yes" />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <map:match pattern="**menu-*.html">
-        <map:generate src="cocoon:/{1}book-{2}.html"/>
-        <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:transform 
+        <map:generate src="cocoon:/{1}book-{2}.html" />
+        <map:transform type="linkrewriter"
+          src="cocoon://{1}linkmap-{2}.html" />
+        <map:transform
           src="{forrest:stylesheets}/declare-broken-site-links.xsl" />
-        <map:call resource="skinit">
-          <map:parameter name="type" value="book2menu"/>
-          <map:parameter name="path" value="{1}{2}.html"/>
-        </map:call>
+        <map:transform src="{lm:dataModel-html-book2menu.xsl}">
+          <map:parameter name="path" value="{1}{2}.html" />
+        </map:transform>
+        <map:serialize />
       </map:match>
+    </map:pipeline>
+    <map:pipeline>
       <!-- navigation for the current request PART tab-->
       <map:match pattern="**tab-*.html">
         <map:mount uri-prefix="" src="tabs.xmap" check-reload="yes" />

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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -148,8 +148,8 @@
 -->
     <map:pipeline>
       <!-- themer interface FIXME thorsten finish the xmap-->
-      <!-- <map:mount uri-prefix="" src="themer.xmap" check-reload="yes"
-        pass-through="true" /> -->
+      <map:mount uri-prefix="" src="themer.xmap" check-reload="yes"
+        pass-through="true" /> 
     </map:pipeline>
 
     <!--
@@ -191,22 +191,7 @@
         <map:serialize />
       </map:match>
     </map:pipeline>
-    <map:pipeline>
-      <!--
-        Aggregate the contract-templates requested by the view with cinclude.
-        The result is a stylesheet with all needed xsl:templates.
-        {1} - output format
-        {2} - requested url
-      -->
-      <map:match pattern="prepare.structurer-xsl.*.**">
-        <map:generate src="{lm:structurer.{2}}" />
-        <map:transform src="{lm:structurer-xsl-includes.xsl}">
-          <map:parameter name="format" value="{1}" />
-        </map:transform>
-        <map:transform type="cinclude" />
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
+    
     <map:pipeline>
       <!--
         Aggregate the forrest:properties requested by the *.fv.
@@ -226,7 +211,8 @@
     <map:pipeline>
     <!--
         Aggregate all contracts-templates requested by the view.
-        Create a xsl that can be used for the last step of the transformation of the view.
+        The result is a stylesheet with all needed xsl:templates.
+        Creates all xsl that can be used for the last step of the transformation.
         {1} - format
         {2} - requested url
       -->
@@ -243,31 +229,18 @@
         <map:serialize />
       </map:match>
     </map:pipeline>
-
-    <map:pipeline>
-      <!-- DO NOT USE ANYMORE
-        FIXME: Finish rewriting move to lm ->  del if finished-->
-      <map:match pattern="prepare.view.**">
-        <map:generate src="cocoon:/prepare.structurer.{1}" />
-        <map:serialize />
-      </map:match>
-      <map:match pattern="prepare.view-nugget.**">
-        <map:generate src="cocoon:/prepare.structurer.{1}" />
-        <map:serialize />
-      </map:match>
-      <map:match pattern="prepare.include.*.**">
-        <map:generate src="cocoon:/prepare.structurer-xsl.{1}.{2}" />
-        <map:serialize />
-      </map:match>
-      <map:match pattern="prepare.properties.*.**">
-        <map:generate
-          src="cocoon:/prepare.structurer-properties.{1}.{2}" />
-        <map:serialize />
-      </map:match>
-      <map:match pattern="getStylesheet.*.**">
-        <map:generate
-          src="cocoon:/structurer-xsl.{1}.{2}" />
-        <map:serialize />
+<map:pipeline>
+      <!--
+        Last processing step. 
+        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:parameter name="path" value="{0}" />
+        </map:transform>
+        <!-- <map:transform src="resources/stylesheets/strip_namespaces.xsl" /> -->
+        <map:serialize type="xhtml" />
       </map:match>
     </map:pipeline>
   </map:pipelines>

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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -36,6 +36,6 @@
   
   <xsl:param name="format"/>
   <xsl:template match="/">
-    <xsl:copy-of select="forrest:contract/forrest:template[@format=$format]/xsl:stylesheet/*"/>
+    <xsl:copy-of select="forrest:contract/forrest:template[@format=$format]/xsl:stylesheet"/>
   </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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -29,7 +29,7 @@
         <c:include>
           <xsl:attribute name="src">
             <xsl:value-of 
-              select="concat('cocoon://get.contract-property.',@name,'.', $format)"/>
+              select="concat('cocoon://prepare.contract-property.', $format,'.', @name)"/>
           </xsl:attribute>
         </c:include>
 	    </xsl:for-each>

Modified: 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/prepare.xhtml.xsl?rev=322463&r1=322462&r2=322463&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/prepare.xhtml.xsl Sun Oct 16 03:01:36 2005
@@ -24,14 +24,27 @@
     <xsl:param name="forrestContext" select="'test'"/>
     <xsl:key name="head-template" match="forrest:property[@format='xhtml']" use="@name" />
     <xsl:key name="css-includes" match="forrest:css" use="@url" />
+    <xsl:key name="contract-name" match="forrest:contract" use="@name" />
     <xsl:template match="/">
-    	<!--Create the final stylesheet (alias:) resources/stylesheets/structurer-tiles-root-strip.xsl -->
+      <!--Create the final stylesheet (alias:) resources/stylesheets/structurer-tiles-root-strip.xsl -->
         <alias:stylesheet version="1.0">
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/site2xhtml.xsl"/> 
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/dotdots.xsl"/>
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/pathutils.xsl"/>
             <alias:import href="file:{$forrestContext}/skins/common/xslt/html/renderlogo.xsl"/>
-            <alias:include href="cocoon://prepare.include.xhtml.{$request}"/>
+            <!--NOTE:
+              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]">
+              <xsl:sort select="@name" />
+              <alias:include>
+                <xsl:attribute name="href">
+                  <xsl:value-of 
+                    select="concat('cocoon://prepare.contract.xhtml.', @name)"/>
+                </xsl:attribute>
+              </alias:include>  
+            </xsl:for-each>
             <alias:param name="path"/>
             <xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment>
             <alias:template name="getHead">
@@ -46,18 +59,18 @@
             <alias:template name="getBody">
                 <xsl:apply-templates select="/*/forrest:views/forrest:view"/>
             </alias:template>
-        	<!--default entry point into the presentation model 'site'-->
+          <!--default entry point into the presentation model 'site'-->
             <alias:template match="/">
                 <html>
                     <head>
-                    	<!--Test whether there is an own css implemention requested by the view-->
-                    	<!--*No* forrest:css found in the view-->
+                      <!--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)">
                             <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-->
+                      <!-- 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>

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl?rev=322463&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl Sun Oct 16 03:01:36 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+This stylesheet contains templates for converting documentv11 to HTML.  See the
+imported document2html.xsl for details.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!--  Templates for "toc" mode.  This will generate a complete
+        Table of Contents for the document.  This will then be used
+        by the site2xhtml to generate a Menu ToC and a Page ToC -->
+  <xsl:template match="document">
+    <xsl:if test="header/abstract">
+      <div class="abstract">
+        <xsl:value-of select="header/abstract"/>
+      </div>
+    </xsl:if>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2abstract.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl?rev=322463&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl Sun Oct 16 03:01:36 2005
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+This stylesheet contains templates for converting documentv11 to HTML.  See the
+imported document2html.xsl for details.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!--  Templates for "toc" mode.  This will generate a complete
+        Table of Contents for the document.  This will then be used
+        by the site2xhtml to generate a Menu ToC and a Page ToC -->
+  <xsl:template match="document">
+    <xsl:choose>
+      <xsl:when test="header/title">
+        <xsl:copy-of select="header/title"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <title>*No* title found</title>
+      </xsl:otherwise>
+    </xsl:choose>
+
+  </xsl:template>
+</xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/to-xml/document2title.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml?rev=322463&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml Sun Oct 16 03:01:36 2005
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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">
+<document> 
+  <header> 
+    <title>forrest:views - x formats, one config</title>
+    <abstract>This plugin depends on a ViewHelper and a BusinessHelper implementation.</abstract> 
+  </header> 
+  <body> 
+    <section>
+      <title>How it works </title>
+      <source>
+This plugin has three components:
+  1. viewHelper - delivers contracts in form of xsl:templates
+  2. businessHelper - delivers content that is used in the contracts
+  3. views - prepares and transforms the requested contracts (viewHelper) 
+     and populate them with the content (businessHelper)
+
+1. viewHelper
+  This is the template producing factory.
+
+a. <![CDATA[<map:match pattern="resolve.contract.*.*">]]> -> Resolving factory
+Project implementation of templates have priority before default ones.
+If no implementation can be found we use the noFt (~ - no
+forrest:template) implementation.-> this match is implemented in the viewHelper plugin
+
+b. <![CDATA[<map:match pattern="get.contract.*.*">]]>-> this match is implemented in the viewHelper plugin
+Get the xsl:templates of the requested contract and specific format.
+
+c. <![CDATA[<map:match pattern="get.contract-property.*">]]>-> this match is implemented in the viewHelper plugin
+Get the forrest:properties of the requested contract. 
+This will determine which templates (css, head, body) we have to call
+later on
+
+GENERAL:
+Contracts are stored in forrest:templates ({contract-name}.ft) please
+have a look on the templates/*.ft that the viewHelper implementation contain to get
+an idea how your own implementation have to look like.
+
+
+2. businessHelper
+  This is the content producing factory.
+
+NOTE: <![CDATA[<map:match pattern="*.page">]]>
+  The current factory uses the models the skin (e.g. document2xhtml.xsl from pelt [default skin]).
+  It is only exchanging the last model of the models the skin is producing (site2xhtml.xsl) till now.
+  This will have to be changed in the future.
+
+3. views
+  prepares the requested contracts viewHelper and dispatches
+the corresponding businessHelper.
+
+a.  <![CDATA[<map:match pattern="prepare.view.*">]]> -> View config resolver
+File specific views have priority before default ones.
+If no view can be found in the project we use the default one of the
+views plugin.
+
+b.  <![CDATA[<map:match pattern="prepare.include.*.**"> ]]>
+Aggregate the contract-templates requested by the view with xinclude.
+The result is a stylesheet with all needed xsl:templates.
+
+c. <![CDATA[<map:match pattern="prepare.properties.*.*">]]>
+Aggregate the forrest:properties requested by the *.fv.
+The result is an aggregation of properties which defines the templates
+to be call.
+
+d. <![CDATA[<map:match pattern="prepare.xhtml.*">]]>
+Aggregate all contracts-templates requested by the view.
+Create a xsl that can be used for the last step of the transformation of
+the view.
+
+e. <![CDATA[<map:match pattern="*.html"> ]]>-> Last processing step. 
+Here we are overriding the default skin generation. 
+-> this match is implemented in the viewHelper plugin
+
+GENERAL:
+Views are stored in forrest:view ({file-name}.fv) please have look on
+plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/default.fv do
+get an idea how your own implementation have to look like.
+
+      </source>
+    </section>
+    <section>
+      <title>Resume</title>
+      <source>
+The views plugin can be seen as prototype for the next generation
+skinning of forrest. It is still in early stage but with extracting the businessHelper we
+hope to make it easier for all devs (not only committer) to get the idea
+and enable them to enhance the design of this plugin and their implementation.
+
+Some basic and simple hints:
+a) If you want another implementation of a contract then create a folder
+"templates" in ${project.resources-dir} and it will be matched before
+the standard implementation. 
+
+e.g. feedback contract:
+<![CDATA[
+<forrest:contract name="feedback" type="nugget"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<description>
+This function will output the html feedback information.
+</description>
+
+<forrest:template
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+format="xhtml" name="feedback" inputFormat="xsl" body="true"
+head="false" css="true">
+
+<xsl:stylesheet version="1.1" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:jx="http://apache.org/cocoon/templates/jx/1.0">
+
+<xsl:template name="feedback-css">
+#feedback {
+    color: black;
+    background: #CFDCED;
+    text-align:center;
+    margin-top: 5px;
+}
+#feedback #feedbackto {
+    font-size: 90%;
+    color: black;
+}</xsl:template>
+
+<xsl:template name="feedback-body">
+<div id="feedback"> Modified project implementation
+<xsl:value-of select="$config/feedback"/>
+<xsl:choose>
+<xsl:when test="$config/feedback/@href and
+not($config/feedback/@href='')">
+  <a id="feedbackto">
+    <xsl:attribute name="href">
+      <xsl:value-of select="$config/feedback/@href"/>
+      <xsl:value-of select="$path"/>
+    </xsl:attribute>
+    <xsl:value-of select="$config/feedback/@to"/>
+  </a>
+</xsl:when>
+<xsl:otherwise>
+  <xsl:value-of select="$config/feedback/@to"/>
+</xsl:otherwise>
+</xsl:choose>
+</div>
+</xsl:template>
+</xsl:stylesheet>
+</forrest:template>
+</forrest:contract>
+]]>
+The @attributes (body="true" head="false" css="true") of the 
+forrest:template defining which parts of the html page (head, head-css
+and body) we have to render. The xsl:templates are following the simple
+naming convention {@name}-(css|head|body).
+
+
+b. If you want a default view for your project then copy the default.fv
+from the viewHelper implementation to your ${project.conf-dir} and modify this file. When
+you want another view for a specific file (e.g. ${project.xdocs-dir}/index.html) then copy
+the default.fv to your ${project.xdocs-dir} and renamed it to 
+${project.xdocs-dir}/index.fv.</source>
+    </section>
+  </body>
+</document>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/howItWork.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml?rev=322463&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml Sun Oct 16 03:01:36 2005
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  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">
+<document> 
+  <header> 
+    <title>forrest:views - x output formats, one config</title>
+    <abstract>This plugin depends on a ViewHelper and a BusinessHelper implementation.</abstract> 
+  </header> 
+  <body> 
+    <section>
+      <title>view</title>
+      <p>Together with the ViewHelper and the BusinessHelper (to be implemented) 
+        plugin this plugin is following the <a href="ext:sun/j2ee/patterns/dispatcherView">DispatcherView pattern</a> 
+        and building the final view which will be delivered to the client. This implementation follows exactly the pattern shown on 
+          <a href="ext:corej2eepatterns/patterns/dispatcherView">corej2eepatterns.com</a>
+        </p><p>
+        A view will be configured by a config file 
+        which basically contains the following tags (it is still evolving): </p>
+<source><![CDATA[<forrest:view type="xhtml">
+  <forrest:css url="default.css"/>
+  <forrest:contract name="meta"/>
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>]]></source>
+<p>The view tag's @type determines the final output format. The idea is to
+configure different output formats within a forrest:views. That means a forrest:views 
+can contain n different "forrest:view" configurations for n different formats. <br/>
+In short: x formats, one config. :)</p>
+<source><![CDATA[<forrest:views
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+<forrest:view type="xhtml">
+  <forrest:css url="default.css"/>
+  <forrest:contract name="meta"/>
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>
+<forrest:view type="fo">
+  <forrest:hook name="container">
+   <forrest:contract name="feedback"/>
+  </forrest:hook />
+</forrest:view>
+/forrest:views>]]></source>
+</section>
+<section>
+  <title>viewHelper</title>
+  <p>viewHelper class/implementation - a class/implementation which will
+access the presentation model and transform its models. In other words
+it is a presentation producing factory.
+</p>
+<note>The <![CDATA[<forrest:contract name="nav-main"/>]]> expects a certain model
+(now produced by leather-dev - tab2menu.xsl) to transform it. In the
+future this dependency will be on a businessHelper implementation that
+has to be defined in the view. For now it depends on leather-dev. I
+guess leather-dev is still not dead till the businessHelper plugin comes
+(which will implement the businessHelper of leather-dev). ;-)</note>
+<p>
+Each forrest:css will be transformed into a <![CDATA[<link rel="stylesheet" type="text/css" url="{$root}skin/{url}">]]> tag (in html
+output [only format that has an implementation]). 
+This tags are designed to help <strong>web-designers</strong> to freely implemend their own css-implementations for a view.
+</p>
+<p>
+Each forrest:hook will be transformed into a <![CDATA[<div/>]]> tag (in html
+output [only format that has an implementation]). 
+This tags are designed to help <strong>web-designers</strong> to freely move
+around and group contracts into design container.
+</p>
+<p>Each forrest:contract will dispatch a xml file (ViewHelper) that contains
+xsl:stylesheets (for now, but other implementations to transform the presentation
+ model are/should be possible) for the different output formats of a contract.
+  For html, the only format that we have implemented so far, we
+have three different kind of templates:</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-css/>]]><br/>
+Here the contract specific css will be stored.
+</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-head/>]]><br/>
+Here goes everything that belongs in the html head. e.g. scripts.
+</p><p>
+<![CDATA[<xsl:templates name="{contract/@name}-body/>]]><br/>
+Everything that belongs into the body.
+  </p>
+  </section>
+  <section>
+    <title>BusinessHelper </title>
+    <p><strong>businessHelper class/implementation </strong>- a class/implementation which will
+access businessServices to produce models for the presentation model. In
+other word it is a data producing factory.
+</p>
+<note>Right now we are using the default forrest businessHelper (defined
+by the skin you are using). There are contracts that depend on a
+businessHelper implementation of leather-dev (tab2menu.xsl, site2xhtml.xsl,...). 
+We will create a businessHelper plugin to overcome this problem.</note>
+  <p>Right now it is implemented for the forrest way of producing the models
+for the view but we will create an independent BusinessHelper to
+access all BusinessServices you may have in your application. </p>
+    </section>
+    <section>
+      <title>links</title>
+      <note>There are/were lots of mails on the dev-list. Please, search the list</note>
+      <p>Background mailings around the views concept</p>
+      <ul>
+        <li><a href="ext:mailings/dev/pInfra">[RT] plugin infrastructure</a> </li>
+        <li><a href="ext:mailings/dev/ftLeather">[RT] Forrest templates for second generation skining - towards Corium</a> </li>
+      </ul>
+
+    </section>
+  </body>
+</document>
\ No newline at end of file

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/how/index.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/site.xml?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/src/documentation/content/xdocs/site.xml Sun Oct 16 03:01:36 2005
@@ -34,7 +34,7 @@
 
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.internal.views"/>
-  	<howItWorks label="howItWorks" href="howItWork.html" description="howItWorks"/>
+  	<howItWorks label="howItWorks" href="how/howItWork.html" description="howItWorks"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/tabs.xmap Sun Oct 16 03:01:36 2005
@@ -38,35 +38,6 @@
       <map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
     </map:actions>
   </map:components>
-  <map:resources>
-    <map:resource name="skinit">
-      <map:select type="exists">
-        <map:when test="{project:skins-dir}/xslt/html/{type}.xsl">
-          <map:transform 
-            src="{project:skins-dir}{forrest:skin}/xslt/html/{type}.xsl">
-            <map:parameter name="notoc" value="{notoc}"/>
-            <!-- FIXME: do we need this anymore? -->
-            <!-- For backwards-compat with 0.2 - 0.4 skins -->
-            <map:parameter name="isfaq" value="{notoc}"/>
-            <map:parameter name="nopdf" value="{nopdf}"/>
-            <map:parameter name="path" value="{path}"/>
-            <map:parameter name="config-file" value="{project:skinconf}"/>
-          </map:transform>
-        </map:when>
-        <map:otherwise>
-          <map:transform src="resources/stylesheets/html/{type}.xsl">
-            <map:parameter name="notoc" value="{notoc}"/>
-            <!-- For backwards-compat with 0.2 - 0.4 skins -->
-            <map:parameter name="isfaq" value="{notoc}"/>
-            <map:parameter name="nopdf" value="{nopdf}"/>
-            <map:parameter name="path" value="{path}"/>
-            <map:parameter name="config-file" value="{project:skinconf}"/>
-          </map:transform>
-        </map:otherwise>
-      </map:select>
-      <map:serialize/>
-    </map:resource>
-  </map:resources>
   <map:pipelines>
     <map:pipeline >
       <map:match pattern="**tab-*.html">
@@ -94,10 +65,10 @@
           </map:when>
         </map:select>
         <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.html"/>
-        <map:call resource="skinit">
-          <map:parameter name="type" value="tab2menu"/>
+        <map:transform src="{lm:dataModel-html-tab2menu.xsl}">
           <map:parameter name="path" value="{1}{2}.html"/>
-        </map:call>
+        </map:transform>
+        <map:serialize />
       </map:match>
     </map:pipeline>
   </map:pipelines>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap Sun Oct 16 03:01:36 2005
@@ -33,92 +33,41 @@
 
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
-    <map:pipes default="caching">
-      <map:pipe name="caching"
-        src="org.apache.cocoon.components.pipeline.impl.CachingProcessingPipeline" />
-      <map:pipe name="noncaching"
-        src="org.apache.cocoon.components.pipeline.impl.NonCachingProcessingPipeline" />
-    </map:pipes>
-    <map:selectors>
-      <map:selector logger="sitemap.selector.exists" name="exists"
-        src="org.apache.forrest.sourceexists.SourceExistsSelector" />
-    </map:selectors>
-    <map:generators default="file">
-      <map:generator name="traverse"
-        src="org.apache.cocoon.generation.TraversableGenerator"
-        logger="sitemap.generator.traverse" label="content"
-        pool-max="16" />
-      <map:generator name="directory"
-        src="org.apache.cocoon.generation.DirectoryGenerator" />
-      <!--map:generator name="jx" logger="sitemap.generator.jx" 
-        src="org.apache.cocoon.template.JXTemplateGenerator" 
-        label="content,data" pool-max="16"-->
-      <map:generator name="jx" logger="sitemap.generator.jx"
-        src="org.apache.cocoon.generation.JXTemplateGenerator"
-        label="content,data" pool-max="16" />
-
-    </map:generators>
-    <map:transformers default="xslt">
-      <map:transformer logger="sitemap.transformer.jx" name="jx"
-        pool-max="16"
-        src="org.apache.cocoon.transformation.JXTemplateTransformer" />
-      <map:transformer logger="sitemap.transformer.jpath" name="jpath"
-        src="org.apache.cocoon.transformation.JPathTransformer" />
-      <map:transformer name="cinclude"
-        src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="xinclude"
-        src="org.apache.cocoon.transformation.XIncludeTransformer" />
-      <!-- Rewrites links, e.g. transforming href="site:index" to href="../index.html" -->
-      <!-- See http://forrest.apache.org/docs/sitemap-ref.html#linkrewriting_impl -->
-      <map:transformer name="linkrewriter"
-        logger="sitemap.transformer.linkrewriter"
-        src="org.apache.cocoon.transformation.LinkRewriterTransformer">
-        <link-attrs>uri</link-attrs>
-        <schemes>lm</schemes>
-        <input-module name="lm" />
-      </map:transformer>
-
-    </map:transformers>
-    <map:serializers default="xml">
-      <map:serializer logger="sitemap.serializer.xhtml"
-        mime-type="text/html" name="xhtml" pool-grow="2" pool-max="64"
-        pool-min="2"
-        src="org.apache.cocoon.serialization.XMLSerializer">
-        <doctype-public>
-          -//W3C//DTD XHTML 1.0 Strict//EN
-        </doctype-public>
-        <doctype-system>
-          http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd
-        </doctype-system>
-        <encoding>UTF-8</encoding>
-      </map:serializer>
-      <map:serializer name="text"
-        src="org.apache.cocoon.serialization.TextSerializer"
-        mime-type="text/plain" logger="sitemap.serializer.text" />
-    </map:serializers>
-    <map:actions>
-      <map:action name="fallbackResolverAction"
-        src="org.apache.forrest.plugin.internal.view.acting.FallbackResolverAction" />
-    </map:actions>
+    <map:pipes default="caching"/>
+    <map:generators default="file"/>
+    <map:transformers default="xslt"/>
+    <map:serializers default="xml"/>
   </map:components>
   <map:pipelines>
-    <map:pipeline>
-      <map:match pattern="resolve.contract.*.**">
-        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
+      <!-- prepare the xsl:templates of the requested contract.
+        {1} format to deliver
+        {2} contract name  -->
     <map:pipeline>
       <map:match pattern="prepare.contract.*.**">
         <map:generate src="{lm:resolve.contract.{1}.{2}}" />
         <map:transform src="{lm:contract-strip-xsl.xsl}">
-          <!--Which output format?-->
-          <map:parameter name="format" value="xhtml" />
+          <map:parameter name="format" value="{1}" />
         </map:transform>
         <map:transform type="i18n">
           <map:parameter name="locale" value="{request:locale}" />
         </map:transform>
-        <map:serialize type="xml" />
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+      <!--
+        Get the forrest:properties of the requested contract. 
+        This will determine which templates (head, body) we have to call later on
+        {1} format to deliver
+        {2} contract name
+      -->
+    <map:pipeline>
+      <map:match pattern="prepare.contract-property.*.**">
+        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
+        <map:transform
+          src="{lm:contract-property.xsl}">
+          <map:parameter name="format" value="{1}" />
+        </map:transform>
+        <map:serialize />
       </map:match>
     </map:pipeline>
   </map:pipelines>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/forrest.properties?rev=322463&r1=322462&r2=322463&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/forrest.properties (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/forrest.properties Sun Oct 16 03:01:36 2005
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.output.themes,org.apache.forrest.plugin.internal.view,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf
+project.required.plugins=org.apache.forrest.plugin.output.themer,org.apache.forrest.plugin.internal.view,org.apache.forrest.plugin.input.projectInfo,org.apache.forrest.plugin.output.pdf

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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -38,8 +38,7 @@
     <map:transformers default="xslt">
       <map:transformer name="cinclude"
         src="org.apache.cocoon.transformation.CIncludeTransformer" />
-      <map:transformer name="xinclude"
-        src="org.apache.cocoon.transformation.XIncludeTransformer" />
+      
       <map:transformer name="i18n"
         src="org.apache.cocoon.transformation.I18nTransformer">
         <catalogues default="contracts">
@@ -72,109 +71,18 @@
   </map:components>
     
   <map:pipelines>
-    
-    <map:pipeline>
-      <map:match pattern="prepare.contract.*.**">
-        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
-        <map:transform src="{lm:contract-strip-xsl.xsl}">
-          <!--Which output format?-->
-          <map:parameter name="format" value="xhtml" />
-        </map:transform>
-        <map:transform type="i18n">
-          <map:parameter name="locale" value="{request:locale}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-    
     <map:pipeline>
-      <map:match pattern="test.**">
+      <map:match pattern="test.**.*">
         <map:generate src="status.xml" />
         <map:transform src="resources/stylesheets/temp.xsl">
           <map:parameter name="test"
-            value="{lm:resolve.contract.xhtml.{1}}" />
+            value="{lm:contract-property.{2}.{1}}" />
         </map:transform>
         <map:serialize />
       </map:match>
     </map:pipeline>
-    <map:pipeline>
       <!-- DO NOT USE ANYMORE
-        FIXME: Finish rewriting move to lm ->  del if finished-->
-      <map:match pattern="get.contract.*.xhtml">
-        <map:generate src="cocoon:/prepare.contract.xhtml.{1}" />
-        <map:serialize />
-      </map:match>
-      <map:match pattern="resolve.contract.*.**">
-        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
-        <!--
- <map:pipeline>
-      <map:match pattern="test.**">
-        <map:generate src="status.xml" type="jx" />
-        <map:transform src="resources/stylesheets/temp.xsl">
-          <map:parameter name="test"
-            value="{lm:structurer-xsl-final-xhtml.xsl}" />
-        </map:transform>
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
-    -->
-    <!--
-      This plugin provides a theme implementation based on views
-    -->
-    <!--
-      common skining
-      This is the template producing factory.
-    -->
-    <map:pipeline >
-      <!--IMPLEMENTATION
-        Get the xsl:templates of the requested contract.
-        {html} format to deliver
-        {2} contract name-->
-<!--       <map:match pattern="get.contract.*.xhtml">
-        <map:generate src="cocoon:/resolve.contract.xhtml.{1}" />
-        <map:transform src="resources/stylesheets/contract.xsl">
-          <map:parameter name="format" value="xhtml" />
-        </map:transform>
-        <map:transform type="i18n">
-          <map:parameter name="locale" value="{request:locale}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match> -->
-      <!--
-        Get the forrest:properties of the requested contract. 
-        This will determine which templates (css, head, body) we have to call later on
-        {1} format to deliver
-        {2} contract name
-      -->
-      <map:match pattern="get.contract-property.*.xhtml">
-        <map:generate src="cocoon:/resolve.contract.xhtml.{1}" />
-        <map:transform
-          src="resources/stylesheets/contract.property.xsl">
-          <!--Which output format?-->
-          <map:parameter name="format" value="xhtml" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-    <!--
-      Get the css of the requested contract {1}. 
-    -->
-    <!--   <map:match pattern="get.contract-css.*">
-      <map:generate src="cocoon:/resolve.contract.xhtml.{1}"/>
-      <map:transform src="resources/stylesheets/contract.css.xsl"/>
-      <map:serialize type="txt"/>
-      </map:match>-->
-    <!--FIXME:END-->
-    <!--
-      FIXME:
-      The next pipes have to be refactored and then to go into an input plugin
-      e.g. resources/templates -> should become 
-      first {project:view-skin}/templates 
-      then {project:skin}/templates
-    -->
+        FIXME: Finish rewriting move to lm ->  {lm:contract.{1}.{2}}del if finished-->
     <!--FIXME:START-->
     <!-- ls.fbits 
       list the default fbits-->
@@ -204,37 +112,10 @@
 
     <map:pipeline>
       <!--
-        Debug pipes - JTidy output
-      -->
-      <map:match pattern="*.tidy">
-        <map:generate type="html" src="cocoon:/{1}.html" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <map:match pattern="**/*.tidy">
-        <map:generate type="html" src="cocoon:/{1}/{2}.html" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <!--
         Last processing step. 
         Here we are overriding the default skin generation.
       -->
-      <map:match pattern="*.html">
-        <map:generate src="cocoon://prepare.view-nugget.{1}" />
-        <map:transform src="cocoon://getStylesheet.xhtml.{1}">
-          <map:parameter name="path" value="{0}" />
-        </map:transform>
-        <map:transform src="resources/stylesheets/strip_namespaces.xsl"/>
-        <map:serialize type="xhtml" />
-      </map:match>
-      <map:match pattern="**/*.html">
-        <map:generate src="cocoon://prepare.view-nugget.{1}/{2}" />
-        <map:transform src="cocoon://getStylesheet.xhtml.{1}/{2}">
-          <map:parameter name="path" value="{0}" />
-        </map:transform>
-        <map:transform src="resources/stylesheets/strip_namespaces.xsl" />
-        <map:serialize type="xhtml" />
-      </map:match>
-      <!-- -->
+      
       <map:match pattern="**.js">
         <map:mount uri-prefix="" src="resources.xmap"
           check-reload="yes" />

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl?rev=322463&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl (added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl Sun Oct 16 03:01:36 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2005 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  
+  <xsl:strip-space elements="forrest:properties"/>
+  <xsl:param name="test"/>
+  
+  <xsl:template match="/">
+    <p> XXX<xsl:value-of select="$test"/>xxx</p>
+  </xsl:template>
+  
+  <!--<xsl:template match="forrest:property[@name=$contract]">
+    <xsl:comment> properties <xsl:value-of select="$contract"/> </xsl:comment>
+    <xsl:copy-of select="*"/>
+  </xsl:template>
+  
+  <xsl:template match="forrest:property"/>-->
+
+</xsl:stylesheet>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/stylesheets/temp.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -25,19 +25,23 @@
   <usage><![CDATA[<forrest:contract name="content-title">
   <forrest:properties contract="content-title">
     <forrest:property name="content-title" nugget="get.body">
-      <url>#{$cocoon/parameters/getRequest}.body.xml</url>
+      <url>#{$cocoon/parameters/getRequest}.title.xml</url>
     </forrest:property>
   </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="false">
+    format="xhtml" 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-body" 
-        match="div[@id='content']/h1[position()=1]">
+      <xsl:template name="content-title-head" >
         <xsl:param name="content-title"/>
         <xsl:comment>+ |start content-title +</xsl:comment>
-        <xsl:copy-of select="$content-title/div[@id='content']/h1[position()=1]"/>
-        <xsl:copy-of select="$content-title/div[@id='content']/h3[position()=1]"/>
+        <xsl:copy-of select="$content-title"/>
+        <xsl:comment>+ |end content-title +</xsl:comment>
+      </xsl:template>
+      <xsl:template name="content-title-body" >
+        <xsl:param name="content-title"/>
+        <xsl:comment>+ |start content-title +</xsl:comment>
+        <h1><xsl:value-of select="$content-title"/></h1>
         <xsl:comment>+ |end content-title +</xsl:comment>
       </xsl:template>
     </xsl:stylesheet>

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=322463&r1=322462&r2=322463&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 Sun Oct 16 03:01:36 2005
@@ -59,9 +59,9 @@
         <forrest:contract name="branding-tagline">
           <forrest:properties contract="branding-tagline">
             <forrest:property name="branding-tagline-name">new 
-              seed</forrest:property>
+              seed v2</forrest:property>
             <forrest:property name="branding-tagline-tagline">powered by 
-              forrest:views</forrest:property>
+              forrest:views v2</forrest:property>
           </forrest:properties>
         </forrest:contract>
         <forrest:hook class="logo">
@@ -212,7 +212,7 @@
           <forrest:contract name="content-title">
             <forrest:properties contract="content-title">
               <forrest:property name="content-title" nugget="get.body">
-                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.body.xml"/>
+                <jx:import uri="cocoon://#{$cocoon/parameters/getRequest}.title.xml"/>
               </forrest:property>
             </forrest:properties>
           </forrest:contract>
@@ -269,7 +269,8 @@
             </forrest:properties>
           </forrest:contract>
         </forrest:hook>
-        <forrest:contract name="siteinfo-compliance-links"/>
+        <!--FIXME thorsten turned this off while developing (no internet connection)
+          <forrest:contract name="siteinfo-compliance-links"/>-->
         <forrest:contract name="siteinfo-credits">
           <forrest:properties contract="siteinfo-credits">
             <forrest:property name="box-location">credit</forrest:property>



Mime
View raw message