You are viewing a plain text version of this content. The canonical link for it is here.
Posted to svn@forrest.apache.org by th...@apache.org on 2005/07/19 20:01:40 UTC
svn commit: r219734 - in /forrest/trunk/whiteboard/plugins:
org.apache.forrest.plugin.internal.view/internal.xmap
org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Author: thorsten
Date: Tue Jul 19 11:01:39 2005
New Revision: 219734
URL: http://svn.apache.org/viewcvs?rev=219734&view=rev
Log:
Fixed the way I included stylesheet from the forrest core in the views. The problem was that I called via cocoon:// and the included stylesheets would have been resolved relative to the cocoon:// include.
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap?rev=219734&r1=219733&r2=219734&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/internal.xmap Tue Jul 19 11:01:39 2005
@@ -18,6 +18,12 @@
<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>
@@ -82,7 +88,7 @@
3. views
prepares and transforms the requested contracts (viewHelper) and populate them with the content (businessHelper).
-->
- <map:pipeline>
+ <map:pipeline type="noncaching">
<!--Refactor for dir-->
<map:match pattern="viewLocationmap.xml">
<map:generate type="traverse" src="{project:content.xdocs}">
@@ -181,6 +187,7 @@
</map:aggregate>
<map:transform src="resources/stylesheets/prepare.{1}.xsl" >
<map:parameter name="request" value="{2}"/>
+ <map:parameter name="forrestContext" value="{forrest:context}"/>
</map:transform>
<map:transform type="xinclude"/>
<map:serialize type="xml"/>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl?rev=219734&r1=219733&r2=219734&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.view/resources/stylesheets/prepare.xhtml.xsl Tue Jul 19 11:01:39 2005
@@ -19,13 +19,14 @@
<xsl:stylesheet version="1.0" xmlns:alias="http://www.w3.org/1999/XSL/TransformAlias" xmlns:forrest="http://apache.org/forrest/templates/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:namespace-alias result-prefix="xsl" stylesheet-prefix="alias"/>
<xsl:param name="request"/>
+ <xsl:param name="forrestContext" select="'test'"/>
<xsl:template match="/">
<!--Create the final stylesheet (alias:)-->
<alias:stylesheet version="1.0">
- <alias:import href="cocoon://commonSite2xhtml"/>
- <alias:import href="cocoon://dotdots"/>
- <alias:import href="cocoon://pathutils"/>
- <alias:import href="cocoon://renderlogo"/>
+ <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}"/>
<alias:param name="path"/>
<xsl:comment>All xhtml head elements requested by the forrest:template</xsl:comment>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap?rev=219734&r1=219733&r2=219734&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.viewHelper.xhtml/output.xmap Tue Jul 19 11:01:39 2005
@@ -124,6 +124,7 @@
<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"/>
@@ -172,6 +173,7 @@
</map:transform>
<map:serialize type="xml"/>
</map:match>
+ </map:pipeline>
<!--
Get the css of the requested contract {1}.
-->
@@ -214,28 +216,6 @@
</map:match>
</map:pipeline>
- <!--FIXME:END-->
-
- <!--
- Get some util-templates from the common skin.
- -->
- <map:match pattern="commonSite2xhtml">
- <map:generate src="{forrest:context}/skins/common/xslt/html/site2xhtml.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="dotdots">
- <map:generate src="{forrest:context}/skins/common/xslt/html/dotdots.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="pathutils">
- <map:generate src="{forrest:context}/skins/common/xslt/html/pathutils.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
- <map:match pattern="renderlogo">
- <map:generate src="{forrest:context}/skins/common/xslt/html/renderlogo.xsl"/>
- <map:serialize type="xml"/>
- </map:match>
- </map:pipeline>
<map:pipeline>
<!--
Debug pipes - JTidy output