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/03/16 08:53:06 UTC
svn commit: r157722 - in
forrest/trunk/plugins/org.apache.forrest.plugin.fbits: output.xmap
resources/stylesheets/templates/transform.ft.xsl
Author: thorsten
Date: Tue Mar 15 23:53:04 2005
New Revision: 157722
URL: http://svn.apache.org/viewcvs?view=rev&rev=157722
Log:
activated the dynmacic includes
Modified:
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap
forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/templates/transform.ft.xsl
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap?view=diff&r1=157721&r2=157722
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/output.xmap Tue Mar 15 23:53:04 2005
@@ -30,6 +30,28 @@
<map:transformer name="xinclude"
src="org.apache.cocoon.transformation.XIncludeTransformer"/>
</map:transformers>
+ <map:serializers>
+ <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">
+ <!--+
+ | You can choose from Strict, Transitional, or Frameset XHTML.
+ | For Strict XHTML set doctype to:
+ | <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>
+ | For Transitional XHTML set doctype to:
+ | <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+ | <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+ | For Frameset XHTML set doctype to:
+ | <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
+ | <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
+ |
+ | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
+ | XHTML DTD simultaneously, you can define several XHTML serializers.
+ +-->
+ <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:serializers>
</map:components>
<map:pipelines>
@@ -124,24 +146,21 @@
<map:part src="cocoon:/prepare.view.{1}" />
<map:part src="cocoon:/prepare.meta.{1}" />
</map:aggregate>
- <map:transform src="resources/stylesheets/templates/prepare.include.xhtml.xsl" >
- <map:parameter name="request" value="{1}"/>
- </map:transform>
- <map:serialize type="xml"/>
<map:transform src="resources/stylesheets/templates/transform.ft.xsl" >
<map:parameter name="path" value="{path}"/>
+ <map:parameter name="request" value="{1}"/>
<map:parameter name="config-file" value="{project:skinconf}"/>
</map:transform>
- <map:serialize type="html"/>
+ <map:serialize type="xhtml"/>
</map:match>
</map:pipeline>
-
- <!--Old stuff-->
-<!--
+ <!--
+ <!-#-Old stuff-#->
+<!-#-
[poc] - Proof of concept pipeline
you can transform xsl
- -->
+ -#->
<map:pipeline>
<map:match pattern="x">
<map:generate src="cocoon:/x-src"/>
@@ -149,48 +168,48 @@
<map:serialize type="xml" />
</map:match>
</map:pipeline>
-<!--
+<!-#-
[poc] - Proof of concept pipeline src
you can transform xsl input xsl
- -->
+ -#->
<map:pipeline>
<map:match pattern="x-src">
<map:generate src="resources/stylesheets/test.xsl"/>
<map:serialize type="xml" />
</map:match>
</map:pipeline>
-<!--
+<!-#-
contract-transformer
- -->
+ -#->
<map:pipeline>
<map:match pattern="get.fbits.*">
<map:generate type="jx" src="fbits-xsl/c-{1}-fct.xsl"/>
- <!--<map:transform src="resources/stylesheets/contract.xsl"/>-->
+ <!-#-<map:transform src="resources/stylesheets/contract.xsl"/>-#->
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--
+<!-#-
1. check all aviable fct -> ls.fbits
2. check which fct are needed -> is be controlled by the forrest:templates
3. check where to place them
4. output the xhtml
--->
+-#->
-<!-- ls.fbits
- list the default fbits-->
+<!-#- ls.fbits
+ list the default fbits-#->
<map:pipeline>
<map:match pattern="ls.fbits">
<map:generate type="directory" src="fbits-xsl">
<map:parameter name="depth" value="1"/>
- <!-- sorted alphabetically -->
+ <!-#- sorted alphabetically -#->
<map:parameter name="reverse" value="false"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--ls.fbits.l
+<!-#-ls.fbits.l
transform this dir-list and add more information
output e.g.
@@ -202,7 +221,7 @@
<realpath>/home/thorsten/apache/cocoon-2.1.5.1/build/webapp/leather/fct-bits/c-fontsize-fct.xml</realpath>
</contract>
</contracts>
--->
+-#->
<map:pipeline>
<map:match pattern="ls.fbits.l">
<map:generate src="cocoon:/ls.fbits"/>
@@ -213,9 +232,9 @@
</map:match>
</map:pipeline>
-<!--
+<!-#-
load main forrest:view
- -->
+ -#->
<map:pipeline>
<map:match pattern="view">
<map:generate src="src/documentation/leather.ft"/>
@@ -223,9 +242,9 @@
</map:match>
</map:pipeline>
- <!-- XSL
+ <!-#- XSL
2. check which fct are needed and include them in the output
--->
+-#->
<map:pipeline>
<map:match pattern="view.fbits">
@@ -235,11 +254,11 @@
</map:aggregate>
<map:transform src="resources/stylesheets/view.filter.xsl"/>
<map:transform type="xinclude"/>
- <!--<map:transform src="resources/stylesheets/contract.xsl"/>-->
+ <!-#-<map:transform src="resources/stylesheets/contract.xsl"/>-#->
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--POINTER-->
+<!-#-POINTER-#->
<map:pipeline>
<map:match pattern="ft.get">
<map:aggregate element="filter">
@@ -248,7 +267,7 @@
</map:aggregate>
<map:transform src="resources/stylesheets/ft-filter.xsl"/>
<map:transform type="xinclude"/>
- <!--<map:transform src="resources/stylesheets/contract.xsl"/>-->
+ <!-#-<map:transform src="resources/stylesheets/contract.xsl"/>-#->
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
@@ -260,22 +279,22 @@
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--old "training" pipes-->
+<!-#-old "training" pipes-#->
-<!-- XML
+<!-#- XML
1. check all aviable fct
--->
+-#->
<map:pipeline>
<map:match pattern="contracts-dir-fbits.get">
<map:generate type="directory" src="fbits">
<map:parameter name="depth" value="1"/>
- <!-- sorted alphabetically -->
+ <!-#- sorted alphabetically -#->
<map:parameter name="reverse" value="false"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--
+<!-#-
transform this dir-list
output e.g.
<contracts>
@@ -286,7 +305,7 @@
<realpath>/home/thorsten/apache/cocoon-2.1.5.1/build/webapp/leather/fct-bits/c-fontsize-fct.xml</realpath>
</contract>
</contracts>
--->
+-#->
<map:pipeline>
<map:match pattern="contracts.get">
<map:generate src="cocoon:/contracts-dir-fbits.get"/>
@@ -297,9 +316,9 @@
</map:match>
</map:pipeline>
-<!-- XML
+<!-#- XML
2. check which fct are needed
--->
+-#->
<map:pipeline>
<map:match pattern="filter.get">
<map:aggregate element="filter">
@@ -308,13 +327,13 @@
</map:aggregate>
<map:transform src="resources/stylesheets/filter.xsl"/>
<map:transform type="xinclude"/>
- <!--<map:transform src="resources/stylesheets/contract.xsl"/>-->
+ <!-#-<map:transform src="resources/stylesheets/contract.xsl"/>-#->
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-<!--f:t directly transformed to div id="@name"-->
+<!-#-f:t directly transformed to div id="@name"-#->
<map:pipeline>
<map:match pattern="ft.div.get">
<map:generate src="src/documentation/ft-leather.xml"/>
@@ -325,17 +344,17 @@
</map:match>
</map:pipeline>
- <!--just brainstroming pipe-->
+ <!-#-just brainstroming pipe-#->
<map:pipeline>
<map:match pattern="contracts-dir-nuggets.get">
<map:generate type="directory" src="nuggets">
<map:parameter name="depth" value="1"/>
- <!-- sorted alphabetically -->
+ <!-#- sorted alphabetically -#->
<map:parameter name="reverse" value="false"/>
</map:generate>
<map:serialize type="xml"/>
</map:match>
</map:pipeline>
-
+ -->
</map:pipelines>
</map:sitemap>
Modified: forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/templates/transform.ft.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/templates/transform.ft.xsl?view=diff&r1=157721&r2=157722
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/templates/transform.ft.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.fbits/resources/stylesheets/templates/transform.ft.xsl Tue Mar 15 23:53:04 2005
@@ -21,29 +21,29 @@
xmlns:forrest="http://apache.org/forrest/templates/1.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:alias="http://www.w3.org/1999/XSL/TransformAlias"
- xmlns:saxon="http://saxon.sf.net/"
- extension-element-prefixes="saxon"
+ xmlns:dyn="http://exslt.org/dynamic"
+ extension-element-prefixes="dyn"
>
<xsl:namespace-alias stylesheet-prefix="alias" result-prefix="xsl"/>
<!--FIXME Need to make sure all variables are matched!!!-->
<xsl:param name="config-file"/>
<xsl:param name="path"/>
+ <xsl:param name="request"/>
<xsl:variable name="config" select="document($config-file)/skinconfig"/>
-
- <!--<xsl:include href="cocoon:/prepare.include.{$request}"/>
- <xsl:include href="cocoon:/prepare.xhtml.{$request}"/>-->
+
+ <xsl:include href="cocoon:/prepare.include.dyn:evaluate($request)"/>
+ <xsl:include href="cocoon:/prepare.xhtml.dyn:evaluate($request)"/>
<xsl:template match="/">
- <html>
+ <xhtml>
<head>
<xsl:call-template name="getHead"/>
</head>
<body onload="init()">
- <h1><xsl:value-of select="$request"/> </h1>
<xsl:call-template name="getBody"/>
</body>
- </html>
+ </xhtml>
</xsl:template>
</xsl:stylesheet>