forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r321062 - in /forrest/trunk: main/webapp/ whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/ whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ whiteboard/plugins/org.apache.forrest.plugin...
Date Fri, 14 Oct 2005 09:40:27 GMT
Author: thorsten
Date: Fri Oct 14 02:40:09 2005
New Revision: 321062

URL: http://svn.apache.org/viewcvs?rev=321062&view=rev
Log:
Added missing files from my last commit (sorry for any problems).
Added {project:stucturer} matches before the default ones that the user can define his/her
implementations without having to patch forrest core.
Started to clean the themer - IMO in the end the themer is a loose aggregations of contracts
and view-templates and hardly provide a xmap. 
Started to move interface pipelines to a themer.xmap in the structurer (but not activated).

Added:
    forrest/trunk/main/webapp/locationmap-themer.xml   (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
  (with props)
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/contract-strip-xsl.xsl
      - copied unchanged from r320774, forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/stylesheets/contract.xsl
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
  (with props)
Removed:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/resources/stylesheets/contract.xsl
Modified:
    forrest/trunk/main/webapp/locationmap-structurer.xml
    forrest/trunk/main/webapp/locationmap.xml
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/output.xmap

Modified: forrest/trunk/main/webapp/locationmap-structurer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-structurer.xml?rev=321062&r1=321061&r2=321062&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Fri Oct 14 02:40:09 2005
@@ -41,7 +41,7 @@
       can be found in the project, we use either the theme or the default one of the themes
plugin. -->
     <match pattern="resolve.structurer.**">
       <select type="exists">
-        <!-- File-based -->
+        <!-- project-based file-based -->
         <location src="{project:content.xdocs}{1}{project:theme-ext}" />
         <!-- @src="" workaround for action bug in the locationmap! -->
         <act type="RecursiveDirectoryTraversalAction" src="">
@@ -49,14 +49,22 @@
           <parameter value="{project:theme}" name="projectFallback"/>
           <parameter value="{project:theme-ext}" name="projectExtension"/>
           <parameter value="{project:content.xdocs}" name="projectDir"/>
-          <!--  Theme-based = directory-based / parent-directory based (recursively) -->
+          <!--  project-based theme-based = directory-based / parent-directory based (recursively)
-->
           <location src="{uri}" />
         </act>
-        <!-- Application theme-based -->
+        <!-- project-application-based theme-based -->
+        <location 
+          src="{project:themer}/resources/views/{project:theme}{project:theme-ext}" 
+          />
+        <!-- project-application-based default -->
+        <location 
+          src="{project:themer}/resources/views/{defaults:theme}{defaults:theme-ext}" 
+          />
+        <!-- forrest-application-based theme-based -->
         <location 
           src="{defaults:themer}/resources/views/{project:theme}{project:theme-ext}" 
           />
-        <!-- Application default -->
+        <!-- forrest-application-based default -->
         <location 
           src="{defaults:themer}/resources/views/{defaults:theme}{defaults:theme-ext}" 
           />
@@ -72,6 +80,8 @@
       <select type="exists">
         <location src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
         <location src="{project:resources}/templates/{1}.vt.xml" />
+        <location src="{project:themer}/resources/templates/{project:theme}/{1}.vt.xml"
/>
+        <location src="{project:themer}/resources/templates/{1}.vt.xml" />
         <location src="{defaults:themer}/resources/templates/{project:theme}/{1}.vt.xml"
/>
         <location src="{defaults:themer}/resources/templates/{1}.vt.xml" />
       </select>
@@ -92,24 +102,28 @@
     <!-- Some input need to be striped by their root element. -->
     <match pattern="root-strip.xsl">
       <select type="exists">
+        <location src="{project:structurer}/resources/stylesheets/root-strip.xsl" />
         <location src="{defaults:structurer}/resources/stylesheets/root-strip.xsl" />
       </select>
     </match>
     <!--  Aggregate the contract-templates requested by the view with cinclude.  -->
     <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>
     <!--  Aggregate the forrest:properties requested by the *.fv with cinclude.  -->
     <match pattern="structurer-properties-includes.xsl">
       <select type="exists">
+        <location src="{project:structurer}/resources/stylesheets/prepare.properties.xsl"
/>
         <location src="{defaults:structurer}/resources/stylesheets/prepare.properties.xsl"
/>
       </select>
     </match>
     <!--  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" />
       </select>
     </match>

Added: forrest/trunk/main/webapp/locationmap-themer.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=321062&view=auto
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (added)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Fri Oct 14 02:40:09 2005
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 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.
+-->
+
+<!-- Default Forrest locationmap for the structurer/themer -->
+
+<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
+
+  <components>
+    <matchers default="lm">
+      <matcher 
+        name="lm" 
+        src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+    </matchers>
+    <actions default="RecursiveDirectoryTraversalAction">
+      <action name="RecursiveDirectoryTraversalAction" 
+        src="org.apache.forrest.structurer.acting.RecursiveDirectoryTraversalAction"/>
+    </actions>
+    <selectors default="exists">
+          <selector name="exists" logger="sitemap.selector.exists"  
+                    src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+    </selectors>
+  </components>
+  
+  <locator>
+    <!-- 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.**">
+      <select type="exists">
+        <!-- project-based theme -->
+        <location src="{project:resources}/templates/{project:theme}/{1}.ft" />
+        <!-- project-based default fallback -->
+        <location src="{project:resources}/templates/{1}.ft" />
+        <!-- project-application-based theme -->
+        <location src="{project:themer}/resources/templates/{project:theme}/{1}.ft" />
+        <!--  project-application-based default fallback -->
+        <location src="{project:themer}/resources/templates/{1}.ft" />
+        <!-- forrest-application-based theme -->
+        <location src="{defaults:themer}/resources/templates/{project:theme}/{1}.ft" />
+        <!--  forrest-application-based default fallback -->
+        <location src="{defaults:themer}/resources/templates/{1}.ft" />
+        <!--  forrest-application-based no found -->
+        <location src="{defaults:themer}/resources/templates/noFt.ft" />
+      </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>
+  </locator>
+</locationmap>

Propchange: forrest/trunk/main/webapp/locationmap-themer.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/main/webapp/locationmap.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap.xml?rev=321062&r1=321061&r2=321062&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap.xml (original)
+++ forrest/trunk/main/webapp/locationmap.xml Fri Oct 14 02:40:09 2005
@@ -63,6 +63,10 @@
       <mount src="{forrest:context}/locationmap-structurer.xml"/>
     </select>
     
+    <select>
+      <mount src="{forrest:context}/locationmap-themer.xml"/>
+    </select>
+    
     <!--  FIXME: this should be part of a chaperon plugin -->
     <select>
       <mount src="{forrest:context}/locationmap-chaperon.xml"/>

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=321062&r1=321061&r2=321062&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
Fri Oct 14 02:40:09 2005
@@ -140,13 +140,18 @@
         pass-through="true" />
     </map:pipeline>
       <!-- linkmap -->
-<!-- FIXME: Temporary hack to get working again. Perhaps file is missing
-from yesterday's commit by thorsten.
+<!-- FIXME: Uncomment if jxpath is fixed.
     <map:pipeline>
       <map:mount uri-prefix="" src="linkmap.xmap" check-reload="yes"
         pass-through="true" />
     </map:pipeline>
 -->
+    <map:pipeline>
+      <!-- themer interface FIXME thorsten finish the xmap-->
+      <!-- <map:mount uri-prefix="" src="themer.xmap" check-reload="yes"
+        pass-through="true" /> -->
+    </map:pipeline>
+
     <!--
       structurer
       prepares and transforms the requested contracts (themes) and populate them with the
content (businessHelper).
@@ -183,17 +188,6 @@
           <map:parameter name="getRequest" value="{1}" />
         </map:transform>
         <map:transform src="{lm:root-strip.xsl}" />
-        <map:serialize />
-      </map:match>
-    </map:pipeline>
-    <map:pipeline>
-      <map:match pattern="test.*.**">
-        <map:generate src="{lm:structurer-properties.{1}.{2}}" type="jx" />
-        <map:serialize />
-        <map:transform src="resources/stylesheets/temp.xsl">
-          <map:parameter name="test"
-            value="{lm:prepare.structurer.{2}}" />
-        </map:transform>
         <map:serialize />
       </map:match>
     </map:pipeline>

Added: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap?rev=321062&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
Fri Oct 14 02:40:09 2005
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-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
+
+  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.
+-->
+<!-- =================================================
+'linkmap' pipeline.  A linkmap is a map from abstract ('site:index') to
+physical ('../index.html') links for the current page.
+
+Generates  :  Variant of site.xml with each @href being the link to that page from the current
page.
+Example URL:  http://localhost:8888/docs/community/linkmap-index.html (links for community/index.html)
+Used by    :  The linkrewriter transformer
+Uses       :  content/xdocs/site.xml
+
+See http://forrest.apache.org/docs/sitemap-ref.html#menu_xml_generation
+
+$Revision: 1.2 $
+==================================================== -->
+
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+  <map:components>
+    <map:generators default="file"/>
+    <map:serializers default="xml"/>
+    <map:transformers default="xslt"/>
+    <map:matchers default="wildcard"/>
+  </map:components>
+
+  <map:pipelines>
+    <map:pipeline>
+      <!-- Linkmap for regular pages -->
+      <map:match pattern="structurer-linkmap.**">
+        <map:generate src="cocoon://abs-linkmap" />
+        <map:transform src="{lm:transform.linkmap.linkmap-relativized}">
+          <map:parameter name="path" value="{1}" />
+          <map:parameter name="site-root" value="{conf:project-url}" />
+        </map:transform>
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+
+</map:sitemap>
+

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/linkmap.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 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=321062&view=auto
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
(added)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
Fri Oct 14 02:40:09 2005
@@ -0,0 +1,125 @@
+<?xml version="1.0"?>
+<!--
+  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
+  
+  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.
+-->
+
+<!-- forrest:structurer
+  ***********************
+  The structuring of the assembled page where all content is in place
+  and structured with forrest:hooks to provide hooks for theming.
+  
+  It is the job of a forrest:structurer to define this structure. The
+  structurer uses for this a couple of helper classes forrest:contracts,
+  forrest:hooks and forrest:properties. But there is more to a
+  forrest:structurer than just structure. 
+  
+  The structurer is not limited to a document but can request and
+  structure the content from multiple input sources. Far more actually
+  because it provides as well logical conditions for presentation formatting logic
+-->
+
+<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:components>
+  <map:pipelines>
+    <map:pipeline>
+      <map:match pattern="resolve.contract.*.**">
+        <map:generate src="{lm:resolve.contract.{1}.{2}}" />
+        <map:serialize />
+      </map:match>
+    </map:pipeline>
+    <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:pipelines>
+</map:sitemap>

Propchange: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/output.xmap?rev=321062&r1=321061&r2=321062&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themes/output.xmap Fri
Oct 14 02:40:09 2005
@@ -51,7 +51,7 @@
         <cache-at-startup>true</cache-at-startup>
       </map:transformer>
     </map:transformers>
-    <map:serializers>
+    <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"
@@ -70,7 +70,45 @@
         mime-type="text/plain" logger="sitemap.serializer.text" />
     </map:serializers>
   </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:generate src="status.xml" />
+        <map:transform src="resources/stylesheets/temp.xsl">
+          <map:parameter name="test"
+            value="{lm:resolve.contract.xhtml.{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.**">
@@ -90,102 +128,21 @@
       common skining
       This is the template producing factory.
     -->
-    <map:pipeline type="noncaching">
-      <!--
-        FIXME:
-        The next pipes have to be refactored and then to go into the view-interface (internal
plugin)
-        e.g. resources/templates/{1}.ft -> should become 
-        first {project:view-skin}/templates/{1}.ft 
-        then {project:skin}/templates/{1}.ft
-      -->
-      <!--FIXME:START-->
-      <!--
-        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.
-        {1} name of the contract-->
-      <map:match pattern="resolve.contract.xhtml.*">
-        <map:select type="exists">
-          <map:when
-            test="{project:resources}/templates/{project:theme}/{1}.ft">
-            <map:generate
-              src="{project:resources}/templates/{project:theme}/{1}.ft" />
-          </map:when>
-          <map:when test="{project:resources}/templates/{1}.ft">
-            <map:generate src="{project:resources}/templates/{1}.ft" />
-          </map:when>
-          <map:when test="{forrest:plugins}/templates/{1}.ft">
-            <map:generate src="{forrest:plugins}/templates/{1}.ft" />
-          </map:when>
-          <map:when test="resources/templates/{project:theme}/{1}.ft">
-            <map:generate
-              src="resources/templates/{project:theme}/{1}.ft" />
-          </map:when>
-          <map:when test="resources/templates/{1}.ft">
-            <map:generate src="resources/templates/{1}.ft" />
-          </map:when>
-          <map:otherwise>
-            <map:generate src="resources/templates/noFt.ft" />
-          </map:otherwise>
-        </map:select>
-        <map:serialize type="xml" />
-      </map:match>
-      <!--This activates forrest:call-templates includes into the view.
-        del-after refactor!
-        -->
-      <map:match pattern="prepare.view-templates.**">
-        <map:select type="exists">
-          <map:when
-            test="{project:resources}/templates/{project:theme}/{1}.vt.xml">
-            <map:generate
-              src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
-          </map:when>
-          <map:when test="{project:resources}/templates/{1}.vt.xml">
-            <map:generate
-              src="{project:resources}/templates/{1}.vt.xml" />
-          </map:when>
-          <map:when
-            test="resources/templates/{project:theme}/{1}.vt.xml">
-            <map:generate
-              src="resources/templates/{project:theme}/{1}.vt.xml" />
-          </map:when>
-          <map:when test="resources/templates/{1}.vt.xml">
-            <map:generate src="resources/templates/{1}.vt.xml" />
-          </map:when>
-          <!-- otherwiser no view Tiles not found -->
-        </map:select>
-        <map:transform
-          src="{defaults:view-internal}/resources/stylesheets/prepare.include.templates.xsl"
/>
-        <map:transform type="xinclude" />
-        <map:serialize type="xml" />
-      </map:match>
-      <!-- <!-#-INTERFACE
-        Get the xsl:templates of the requested contract.
-        {1} format to deliver
-        {2} contract name-#->
-        <map:match pattern="get.contract.*.*">
-        <map:generate src="cocoon:/resolve.contract.{2}"/>
-        <map:transform src="resources/stylesheets/contract.xsl">
-        <!-#-Which output format?-#->
-        <map:parameter name="format" value="{1}"/>
-        </map:transform>
-        <map:serialize type="xml"/>
-        </map:match>-->
+    <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:match pattern="get.contract.*.xhtml">
         <map:generate src="cocoon:/resolve.contract.xhtml.{1}" />
         <map:transform src="resources/stylesheets/contract.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:match> -->
       <!--
         Get the forrest:properties of the requested contract. 
         This will determine which templates (css, head, body) we have to call later on



Mime
View raw message