Propchange: forrest/trunk/whiteboard/
------------------------------------------------------------------------------
svn:mergeinfo = /forrest/branches/dispatcher_rewrite:700364-883333
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/build.xml Wed Dec 2 13:58:18 2009
@@ -16,17 +16,20 @@
limitations under the License.
-->
<project default="docs" basedir="." name="Forrest plugin build file">
- <property name="plugin-name" value="org.apache.forrest.plugin.internal.dispatcher"/>
- <property name="forrest.version" value="0.8"/>
- <property name="type" value="internal"/>
- <property name="plugin-version" value="0.1"/>
- <property name="description" value="Dispatcher - Second generation skinning."/>
- <property name="author" value="Apache Forrest Project"/>
- <property name="websiteURL" value="http://forrest.apache.org/pluginDocs/plugins_0_80/org.apache.forrest.plugin.internal.dispatcher/"/>
- <property name="downloadURL" value="http://forrest.apache.org/plugins/"/>
- <property name="publish" value="true"/>
- <import file="../build.xml"/>
-<!-- Add any additional installation work here in the build target, for example:
+ <property name="plugin-name"
+ value="org.apache.forrest.plugin.internal.dispatcher" />
+ <property name="forrest.version" value="0.9" />
+ <property name="type" value="internal" />
+ <property name="plugin-version" value="1.0" />
+ <property name="description"
+ value="Dispatcher - Second generation skinning." />
+ <property name="author" value="Apache Forrest Project" />
+ <property name="websiteURL"
+ value="http://forrest.apache.org/pluginDocs/plugins_0_90/org.apache.forrest.plugin.internal.dispatcher/" />
+ <property name="downloadURL" value="http://forrest.apache.org/plugins/" />
+ <property name="publish" value="true" />
+ <import file="../build.xml" />
+ <!-- Add any additional installation work here in the build target, for example:
<target name="build"
description="Extract the tools">
<unzip dest="${plugins.localDeploy-dir}/${plugin-name}/resources">
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap Wed Dec 2 13:58:18 2009
@@ -20,9 +20,11 @@
<map:pipes default="caching" />
<map:generators default="file" />
<map:transformers default="xslt">
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <map:transformer name="i18n"
+ src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="tabs">
- <catalogue id="tabs" name="tabs" location="{lm:project.translations}"/>
+ <catalogue id="tabs" name="tabs"
+ location="{lm:project.translations}" />
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -30,13 +32,13 @@
<map:serializers default="xml" />
</map:components>
<map:pipelines>
-<!--
+ <!--
businessHelper for the TABs. It needs to be in a separate sitemap for proper
i18n - the i18nTransformer can have only one default catalogue, and to avoid
having to state the catalogue on every key, we utilise a separate sitemap.
-->
<map:pipeline>
-<!-- navigation for the current request PART tab-->
+ <!-- navigation for the current request PART tab-->
<map:match pattern="**.tab.xml">
<map:select type="exists">
<map:when test="{properties:content.xdocs}tabs.xml">
@@ -68,7 +70,7 @@
<map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
</map:match>
<map:transform src="{lm:dataModel-html-tab-to-menu.xsl}">
-<!--<map:transform src="{lm:dataModel-html-tab2menu.xsl}">-->
+ <!--<map:transform src="{lm:dataModel-html-tab2menu.xsl}">-->
<map:parameter name="path" value="{1}{2}.html" />
</map:transform>
<map:serialize />
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap Wed Dec 2 13:58:18 2009
@@ -20,9 +20,11 @@
<map:pipes default="caching" />
<map:generators default="file" />
<map:transformers default="xslt">
- <map:transformer name="i18n" src="org.apache.cocoon.transformation.I18nTransformer">
+ <map:transformer name="i18n"
+ src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="menu">
- <catalogue id="menu" name="menu" location="{lm:project.translations}"/>
+ <catalogue id="menu" name="menu"
+ location="{lm:project.translations}" />
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
@@ -30,17 +32,17 @@
<map:serializers default="xml" />
</map:components>
<map:pipelines>
-<!--
+ <!--
businessHelper
This is the model producing factory.
-->
<map:pipeline>
-<!-- intermediate format link rewritten-->
+ <!-- intermediate format link rewritten-->
<map:match pattern="**.source.rewritten.xml">
<map:generate src="cocoon://{1}.xml" />
<map:transform type="idgen" />
<!-- Start fix for FOR-1088 -->
- <map:transform src="{lm:transform.xml.xml-xpointer-attributes}"/>
+ <map:transform src="{lm:transform.xml.xml-xpointer-attributes}" />
<!-- End fix for FOR-1088 -->
<map:transform type="xinclude" />
<map:match pattern="**/*.source.rewritten.xml">
@@ -49,12 +51,12 @@
<map:match pattern="*.source.rewritten.xml">
<map:transform type="linkrewriter" src="cocoon://linkmap-{1}" />
</map:match>
- <map:transform src="{lm:transform.html.broken-links}"/>
+ <map:transform src="{lm:transform.html.broken-links}" />
<map:serialize />
</map:match>
</map:pipeline>
<map:pipeline>
-<!-- HTML rendered from intermediate format -->
+ <!-- HTML rendered from intermediate format -->
<map:match pattern="**.body.xml">
<map:generate src="cocoon:/{1}.source.rewritten.xml" />
<map:transform src="{lm:dataModel-html-document-to-html.xsl}">
@@ -64,7 +66,7 @@
</map:match>
</map:pipeline>
<map:pipeline>
-<!-- TOC from source.rewritten-->
+ <!-- TOC from source.rewritten-->
<map:match pattern="**.toc.xml">
<map:generate src="cocoon:/{1}.source.rewritten.xml" />
<map:transform src="{lm:dataModel-xml-document-to-toc.xsl}" />
@@ -74,16 +76,14 @@
<map:pipeline>
<map:match pattern="**.abstract.xml">
<map:generate src="cocoon://{1}.xml" />
- <map:transform
- src="{lm:dataModel-xml-document-to-abstract.xsl}" />
+ <map:transform src="{lm:dataModel-xml-document-to-abstract.xsl}" />
<map:serialize />
</map:match>
</map:pipeline>
<map:pipeline>
<map:match pattern="**.notice.xml">
<map:generate src="cocoon://{1}.xml" />
- <map:transform
- src="{lm:dataModel-xml-document-to-notice.xsl}" />
+ <map:transform src="{lm:dataModel-xml-document-to-notice.xsl}" />
<map:serialize />
</map:match>
</map:pipeline>
@@ -102,7 +102,7 @@
</map:match>
</map:pipeline>
<map:pipeline>
-<!-- navigation for the current request -->
+ <!-- navigation for the current request -->
<map:match pattern="**.navigation.xml">
<map:aggregate element="navigation">
<map:part src="cocoon:/{1}.tab.xml" element="tab" />
@@ -128,10 +128,11 @@
</map:match>
</map:pipeline>
<map:pipeline>
-<!-- navigation for the current request PART tab: relegated to a separate
+ <!-- navigation for the current request PART tab: relegated to a separate
sitemap to allow proper i18n. -->
<map:match pattern="**.tab.xml">
- <map:mount uri-prefix="" src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/dataModel-tabs.xmap" check-reload="yes" />
+ <map:mount uri-prefix="" src="dataModel-tabs.xmap"
+ check-reload="yes" />
</map:match>
</map:pipeline>
<map:pipeline>
@@ -139,34 +140,32 @@
<map:match pattern="**/*.book.xml">
<map:select type="exists">
<map:when test="{properties:content.xdocs}{1}/book.xml">
-<!-- If a hand-created book.xml exists, use it -->
+ <!-- If a hand-created book.xml exists, use it -->
<map:parameter name="url"
- value="{properties:content.xdocs}{1}/book.xml" />
+ value="{properties:content.xdocs}{1}/book.xml" />
<map:generate src="{properties:content.xdocs}{1}/book.xml" />
</map:when>
<map:otherwise>
-<!-- If no book.xml, generate it from the linkmap. -->
+ <!-- If no book.xml, generate it from the linkmap. -->
<map:generate src="cocoon:/{1}/menulinks-{2}" />
-<!-- The above generates the subset of the linkmap relevant to our directory. -->
- <map:transform
- src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
+ <!-- The above generates the subset of the linkmap relevant to our directory. -->
+ <map:transform src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
</map:otherwise>
</map:select>
</map:match>
<map:match pattern="*.book.xml">
<map:select type="exists">
<map:when test="{properties:content.xdocs}/book.xml">
-<!-- If a hand-created book.xml exists, use it -->
+ <!-- If a hand-created book.xml exists, use it -->
<map:parameter name="url"
- value="{properties:content.xdocs}/book.xml" />
+ value="{properties:content.xdocs}/book.xml" />
<map:generate src="{properties:content.xdocs}/book.xml" />
</map:when>
<map:otherwise>
-<!-- If no book.xml, generate it from the linkmap. -->
+ <!-- If no book.xml, generate it from the linkmap. -->
<map:generate src="cocoon:/menulinks-{1}" />
-<!-- The above generates the subset of the linkmap relevant to our directory. -->
- <map:transform
- src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
+ <!-- The above generates the subset of the linkmap relevant to our directory. -->
+ <map:transform src="{forrest:forrest.stylesheets}/site-to-book.xsl" />
</map:otherwise>
</map:select>
</map:match>
@@ -176,7 +175,7 @@
<map:act type="locale">
<map:transform src="{lm:transform.book.book-i18n}" />
<map:transform type="i18n">
-<!-- We can use a default locale attribute or Request Parameter
+ <!-- We can use a default locale attribute or Request Parameter
<map:parameter name="locale" value="{properties:forrest.locale}"/>
<map:parameter name="locale" value="{lang}{country}{variant}"-->
<map:parameter name="locale" value="{locale}" />
@@ -189,17 +188,15 @@
<map:match pattern="**menulinks-*">
<map:generate src="cocoon://site.navigation.links.xml" />
<map:transform type="xinclude" />
- <map:transform
- src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" />
+ <map:transform src="{forrest:forrest.stylesheets}/absolutize-linkmap.xsl" />
<map:select type="config">
- <map:parameter name="value" value="{properties:forrest.menu-scheme}" />
+ <map:parameter name="value"
+ value="{properties:forrest.menu-scheme}" />
<map:when test="tab_attributes">
- <map:transform
- src="{forrest:forrest.stylesheets}/site-to-site-normalizetabs.xsl" />
- <map:transform
- src="{forrest:forrest.stylesheets}/normalizehrefs.xsl" />
- <map:transform
- src="{forrest:forrest.stylesheets}/site-to-site-selectnode.xsl">
+ <map:transform src="{forrest:forrest.stylesheets}/site-to-site-normalizetabs.xsl" />
+ <map:transform src="{forrest:forrest.stylesheets}/normalizehrefs.xsl" />
+ <map:transform src="{forrest:forrest.stylesheets}/site-to-site-selectnode.xsl">
+
<map:parameter name="path" value="{1}{2}.html" />
</map:transform>
</map:when>
@@ -209,8 +206,8 @@
</map:transform>
</map:when>
</map:select>
- <map:transform
- src="{forrest:forrest.stylesheets}/relativize-linkmap.xsl">
+ <map:transform src="{forrest:forrest.stylesheets}/relativize-linkmap.xsl">
+
<map:parameter name="path" value="{1}{2}.html" />
</map:transform>
<map:serialize type="xml" />
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/default.plugin.properties.xml Wed Dec 2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -16,16 +16,16 @@
limitations under the License.
-->
<properties>
- <property name="dispatcher.theme" value="pelt"/>
- <property name="dispatcher.fallback.theme" value="common"/>
- <property name="dispatcher.theme-ext" value=".fv"/>
- <property name="dispatcher.fallback.theme-ext" value=".fv"/>
- <property name="dispatcher.contract-ext" value=".ft"/>
- <property name="dispatcher.panel-ext" value=".panel.xml"/>
- <property name="dispatcher.themer" value="org.apache.forrest.themes.core"/>
- <property name="dispatcher.home" value="org.apache.forrest.plugin.internal.dispatcher"/>
+ <property name="dispatcher.theme" value="pelt" />
+ <property name="dispatcher.fallback.theme" value="common" />
+ <property name="dispatcher.theme-ext" value=".structurer.xml" />
+ <property name="dispatcher.fallback.theme-ext" value=".structurer.xml" />
+ <property name="dispatcher.contract-ext" value=".contract.xml" />
+ <property name="dispatcher.panel-ext" value=".panel.xml" />
+ <property name="dispatcher.home"
+ value="org.apache.forrest.plugin.internal.dispatcher" />
<property name="dispatcher.caching" value="on" />
-<!--SVG example for project/group logo-->
- <property name="group-name" value="group"/>
- <property name="project-name" value="project"/>
+ <!--SVG example for project/group logo-->
+ <property name="group-name" value="group" />
+ <property name="project-name" value="project" />
</properties>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/foo.xml Wed Dec 2 13:58:18 2009
@@ -15,4 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<foo/>
+<foo />
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/internal.xmap Wed Dec 2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -29,7 +29,8 @@
structure the content from multiple input sources. Far more actually
because it provides as well logical conditions for presentation formatting logic
-->
-<!DOCTYPE map:sitemap [
+<!DOCTYPE map:sitemap
+[
<!ENTITY % symbols-project
PUBLIC "-//Apache Forrest//ENTITIES Symbols Project v1.0//EN"
"symbols-project-v10.ent">
@@ -42,69 +43,119 @@
<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
<map:components>
<map:generators default="file">
- <map:generator label="content" logger="sitemap.generator.xpathdirectory"
- name="xpathdirectory"
- src="org.apache.cocoon.generation.XPathDirectoryGenerator"/>
- <map:generator name="directory"
- src="org.apache.cocoon.generation.DirectoryGenerator" />
- <map:generator name="jx" logger="sitemap.generator.jx"
- src="org.apache.cocoon.template.JXTemplateGenerator"
- label="content,data" pool-max="16" />
- <map:generator name="text"
- src="org.apache.cocoon.generation.TextGenerator">
+ <map:generator label="content" logger="sitemap.generator.xpathdirectory"
+ name="xpathdirectory"
+ src="org.apache.cocoon.generation.XPathDirectoryGenerator" />
+ <map:generator name="directory"
+ src="org.apache.cocoon.generation.DirectoryGenerator" />
+ <map:generator name="jx" logger="sitemap.generator.jx"
+ src="org.apache.cocoon.template.JXTemplateGenerator" label="content,data"
+ pool-max="16" />
+ <map:generator name="text"
+ src="org.apache.cocoon.generation.TextGenerator">
<parameter name="localizable" value="true" />
</map:generator>
</map:generators>
<map:transformers default="xslt">
- <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16"
- src="org.apache.cocoon.template.JXTemplateTransformer" />
- <map:transformer logger="sitemap.transformer.jpath" name="jpath"
- src="org.apache.cocoon.transformation.JPathTransformer" />
- <map:transformer name="dispatcher"
- src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer"
- />
- <map:transformer name="i18n"
- src="org.apache.cocoon.transformation.I18nTransformer">
+ <map:transformer logger="sitemap.transformer.jx" name="jx" pool-max="16"
+ src="org.apache.cocoon.template.JXTemplateTransformer" />
+ <map:transformer logger="sitemap.transformer.jpath" name="jpath"
+ src="org.apache.cocoon.transformation.JPathTransformer" />
+ <map:transformer name="dispatcher"
+ src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+ <!--+
+ | If you want to use inline xml for contract properties be aware that setting
+ | this properties to true will have negative influence on performance since
+ | this feature needs to use DOM parsing!
+ |
+ | We strongly recommend to rewrite your contracts and structurer to use simple
+ | string for the properties.
+ |
+ | The default is set to "false".
+ +-->
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being true -->
+ <allowXml>true</allowXml>
+ <!--+
+ | If you want to change the uri prefix of the contracts.
+ | This may be interesting if you work with a contract repository rather then
+ | with the ones from the themer plugin.
+ |
+ | The default is "cocoon://resolve.contract".
+ +-->
+ <!--<contractUriPrefix>cocoon://resolve.contract.</contractUriPrefix>-->
+ <!--+
+ | You can use either limited of full xpath support for the injection of contract
+ | result data. We currently provide the basic support with a plain StAX implementation
+ | and the enhanced support with AXIOM.
+ |
+ | The default is "basic".
+ +-->
+ <!--<xpathSupport>enhanced</xpathSupport>-->
+ <!--+
+ | DOWNGRADE COMPATIBLE
+ | When using tags such as <forrest:property name="theme" value="pelt"/>
+ | and if you set this property to false, you will get the whole tag in your contract.
+ | If you set it to true we will pass a simple string to the transformation
+ | in the form of key=@name, value=@value
+ |
+ | The default is "true".
+ +-->
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being false -->
+ <shrink>false</shrink>
+ </map:transformer>
+ <!-- Enhanced xpath support of the dispatcher enabled for
+ formats such as fo which depend on namespaces -->
+ <map:transformer name="dispatcherEnhanced"
+ src="org.apache.forrest.dispatcher.transformation.DispatcherTransformer">
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being true -->
+ <allowXml>true</allowXml>
+ <xpathSupport>enhanced</xpathSupport>
+ <!-- Until we have migrated all contract to work with plain strings
+ we need this being true -->
+ <shrink>false</shrink>
+ </map:transformer>
+ <map:transformer name="i18n"
+ src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="contracts">
- <catalogue id="other" name="OtherMessages" location="{lm:project.translations}" />
- <catalogue id="contracts" name="ContractsMessages"
- location="{lm:project.translations}" />
+ <catalogue id="other" name="OtherMessages"
+ location="{lm:project.translations}" />
+ <catalogue id="contracts" name="ContractsMessages"
+ location="{lm:project.translations}" />
</catalogues>
<cache-at-startup>true</cache-at-startup>
</map:transformer>
</map:transformers>
<map:serializers default="xml-utf8">
- <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">
+ <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>&serializer-xhtml-doctype-public;</doctype-public>
<doctype-system>&serializer-xhtml-doctype-system;</doctype-system>
<encoding>&serializer-xhtml-encoding;</encoding>
<indent>yes</indent>
<omit-xml-declaration>yes</omit-xml-declaration>
</map:serializer>
- <map:serializer name="html" mime-type="text/html" src="org.apache.cocoon.serialization.HTMLSerializer">
- <doctype-public>&serializer-html-doctype-public;</doctype-public>
- <doctype-system>&serializer-html-doctype-system;</doctype-system>
- <encoding>&serializer-html-encoding;</encoding>
- </map:serializer>
- <map:serializer mime-type="image/png" name="svg2png"
- src="org.apache.cocoon.serialization.SVGSerializer">
-<!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
-<!-- <parameter name="gamma" type="float" value="0.48"/> -->
+ <map:serializer mime-type="image/png" name="svg2png"
+ src="org.apache.cocoon.serialization.SVGSerializer">
+ <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+ <!-- <parameter name="gamma" type="float" value="0.48"/> -->
<parameter name="gamma" type="float" value="0" />
</map:serializer>
- <map:serializer name="xml-utf8" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="xml-utf8" mime-type="text/xml"
+ src="org.apache.cocoon.serialization.XMLSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
</map:serializers>
<map:actions>
<map:action name="locale" src="org.apache.cocoon.acting.LocaleAction" />
</map:actions>
- <map:pipes default="caching"/>
+ <map:pipes default="caching" />
</map:components>
<map:pipelines>
-<!--FOR-808 WORKAROUND
+ <!--FOR-808 WORKAROUND
Creating a virtual skinconf from the properties module.
The core depends on a skinconf but the dispatcher not.
See as well FOR-829 where we use this config.-->
@@ -114,12 +165,12 @@
<map:serialize />
</map:match>
</map:pipeline>
-<!--
+ <!--
structurer
prepares and transforms the requested contracts (themes) and populate them with the content (businessHelper).
-->
<map:pipeline>
- <map:act type="locale" >
+ <map:act type="locale">
<map:match pattern="resolve.structurer.**">
<map:generate src="lm://resolve.structurer.{1}" />
<map:serialize />
@@ -133,17 +184,17 @@
</map:match>
</map:act>
</map:pipeline>
-<!-- prepare the xsl:templates of the requested contract.
+ <!-- prepare the xsl:templates of the requested contract.
{1} format to deliver
{2} contract name
Note - This pipeline is useful to include contracts into another. To include a contract :
<xsl:include href="cocoon://prepare.contract.html.NameOfTheContract"/>
Warning - At the moment, the contracts do not manage formats anymore... -->
<map:pipeline>
- <map:act type="locale" >
+ <map:act type="locale">
<map:match pattern="prepare.contract.*.**">
<map:generate src="{lm:resolve.contract.{1}.{2}}" />
- <map:transform src="{lm:contract-strip-xsl.xsl}"/>
+ <map:transform src="{lm:contract-strip-xsl.xsl}" />
<map:transform type="i18n">
<map:parameter name="locale" value="{../locale}" />
</map:transform>
@@ -151,7 +202,7 @@
</map:match>
</map:act>
</map:pipeline>
-<!-- You can group elements to a template and call it from any view.
+ <!-- You can group elements to a template and call it from any view.
<jx:import uri="cocoon://prepare.panels.export-link"/>
-->
<map:pipeline>
@@ -163,7 +214,7 @@
</map:match>
</map:pipeline>
<map:pipeline>
-<!--
+ <!--
Last processing step.
Here we are overriding the default skin generation.
-->
@@ -176,21 +227,19 @@
</map:generate>
<map:transform type="dispatcher">
<map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}" />
<map:parameter name="request" value="{1}" />
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}" />
<map:parameter name="type" value="html" />
- <map:parameter name="hooksTransformer" value="lm://hooks-to-html.xsl"
- />
</map:transform>
- <map:transform
- src="lm://transform.xml.xml-namespace-stripped"
- />
- <map:transform src="lm://strip-dispatcher-remains-html.xsl">
- <map:parameter name="serializer" value="&dispatcher-output-serializer;"/>
- </map:transform>
- <map:serialize type="&dispatcher-output-serializer;"/>
+ <map:transform src="lm://hooks-to-html.xsl" />
+ <map:transform src="lm://transform.xml.xml-namespace-stripped" />
+ <map:transform src="lm://strip-dispatcher-remains-html.xsl" />
+ <map:serialize type="xhtml" />
</map:match>
-<!--
+ <!--
Last processing step.
Here we are overriding the default skin generation.
-->
@@ -201,17 +250,16 @@
<map:parameter name="getRequestExtension" value="fo" />
<map:parameter name="contextPath" value="{request:contextPath}" />
</map:generate>
- <map:transform type="dispatcher">
+ <map:transform type="dispatcherEnhanced">
<map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}" />
<map:parameter name="request" value="{1}" />
<map:parameter name="type" value="fo" />
- <map:parameter name="hooksTransformer" value="lm://hooks-to-fo.xsl"/>
</map:transform>
- <map:transform
- src="lm://strip-dispatcher-remains-fo.xsl"
- />
- <map:serialize />
+ <map:transform src="lm://hooks-to-fo.xsl" />
+ <map:transform src="lm://strip-dispatcher-remains-fo.xsl" />
+ <map:serialize />
</map:match>
<map:match pattern="**.internal*">
<map:generate src="cocoon:/resolve.structurer.{1}" type="jx">
@@ -222,12 +270,14 @@
</map:generate>
<map:transform type="dispatcher">
<map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="dispatcher.caching" value="{properties:dispatcher.caching}" />
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}" />
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}" />
<map:parameter name="request" value="{1}" />
<map:parameter name="type" value="internal{2}" />
</map:transform>
- <map:serialize />
+ <map:serialize />
</map:match>
<map:match pattern="**.prepare.dispatcher.css">
<map:generate src="cocoon:/resolve.structurer.{1}" type="jx">
@@ -238,8 +288,10 @@
</map:generate>
<map:transform type="dispatcher">
<map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="dispatcher.caching" value="{properties:dispatcher.caching}" />
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}" />
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}" />
<map:parameter name="request" value="{1}" />
<map:parameter name="type" value="css" />
</map:transform>
@@ -247,11 +299,9 @@
</map:match>
<map:match pattern="**.dispatcher.css">
<map:generate type="text" src="cocoon:/{1}.prepare.dispatcher.css" />
- <map:transform type="pattern"
- src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" />
- <map:transform
- src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl"
- />
+ <map:transform type="pattern"
+ src="{forrest:forrest.context}/resources/chaperon/grammars/link.xlex" />
+ <map:transform src="{forrest:forrest.context}/resources/chaperon/stylesheets/pattern2link.xsl" />
<map:serialize type="text" mime-type="text/css" />
</map:match>
<map:match pattern="internal.**.*">
@@ -263,8 +313,10 @@
</map:generate>
<map:transform type="dispatcher">
<map:parameter name="cacheKey" value="{0}" />
- <map:parameter name="validityFile" value="cocoon:/resolve.structurer.{1}" />
- <map:parameter name="dispatcher.caching" value="{forrest:dispatcher.caching}" />
+ <map:parameter name="validityFile"
+ value="cocoon:/resolve.structurer.{1}" />
+ <map:parameter name="dispatcher.caching"
+ value="{forrest:dispatcher.caching}" />
<map:parameter name="request" value="{1}" />
<map:parameter name="type" value="xhtml2" />
</map:transform>
@@ -272,18 +324,18 @@
</map:match>
</map:pipeline>
<map:pipeline>
-<!-- businessHelper -->
- <map:mount uri-prefix="" src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/dataModel.xmap" check-reload="yes"
- pass-through="true" />
+ <!-- businessHelper -->
+ <map:mount uri-prefix="" src="dataModel.xmap" check-reload="yes"
+ pass-through="true" />
</map:pipeline>
-<!-- linkmap -->
+ <!-- linkmap -->
<map:pipeline>
- <map:mount uri-prefix="" src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/ls.xmap" check-reload="yes"
- pass-through="true" />
+ <map:mount uri-prefix="" src="ls.xmap" check-reload="yes"
+ pass-through="true" />
</map:pipeline>
<map:pipeline>
- <map:mount uri-prefix="" src="{forrest:forrest.plugins}/org.apache.forrest.plugin.internal.dispatcher/themes.xmap" check-reload="yes"
- pass-through="true" />
+ <map:mount uri-prefix="" src="themes.xmap" check-reload="yes"
+ pass-through="true" />
</map:pipeline>
</map:pipelines>
</map:sitemap>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/locationmap.xml Wed Dec 2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -19,132 +19,107 @@
<locationmap xmlns="http://apache.org/forrest/locationmap/1.0">
<components>
<matchers default="lm">
- <matcher name="lm"
- src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher"/>
+ <matcher name="lm"
+ src="org.apache.forrest.locationmap.WildcardLocationMapHintMatcher" />
</matchers>
<actions default="RecursiveDirectoryTraversalAction">
- <action name="RecursiveDirectoryTraversalAction"
- src="org.apache.forrest.dispatcher.acting.RecursiveDirectoryTraversalAction"/>
- <action name="resourceTypeAction"
- src="org.apache.forrest.dispatcher.acting.ResourceTypeAction"/>
- <action logger="sitemap.action.sourcetype" name="sourcetype"
- src="org.apache.forrest.sourcetype.SourceTypeAction">
+ <action name="RecursiveDirectoryTraversalAction"
+ src="org.apache.forrest.dispatcher.acting.RecursiveDirectoryTraversalAction" />
+ <action name="resourceTypeAction"
+ src="org.apache.forrest.dispatcher.acting.ResourceTypeAction" />
+ <action logger="sitemap.action.sourcetype" name="sourcetype"
+ src="org.apache.forrest.sourcetype.SourceTypeAction">
<sourcetype name="document-v10">
- <document-declaration
- public-id="-//APACHE//DTD Documentation V1.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Documentation V1.0//EN" />
</sourcetype>
<sourcetype name="howto-v10">
- <document-declaration
- public-id="-//APACHE//DTD How-to V1.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD How-to V1.0//EN" />
</sourcetype>
<sourcetype name="todo-v10">
- <document-declaration
- public-id="-//APACHE//DTD Todo V1.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Todo V1.0//EN" />
</sourcetype>
<sourcetype name="changes-v10">
- <document-declaration
- public-id="-//APACHE//DTD Changes V1.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Changes V1.0//EN" />
</sourcetype>
<sourcetype name="document-v11">
- <document-declaration
- public-id="-//APACHE//DTD Documentation V1.1//EN" />
+ <document-declaration public-id="-//APACHE//DTD Documentation V1.1//EN" />
</sourcetype>
<sourcetype name="howto-v11">
- <document-declaration
- public-id="-//APACHE//DTD How-to V1.1//EN" />
+ <document-declaration public-id="-//APACHE//DTD How-to V1.1//EN" />
</sourcetype>
<sourcetype name="todo-v11">
- <document-declaration
- public-id="-//APACHE//DTD Todo V1.1//EN" />
+ <document-declaration public-id="-//APACHE//DTD Todo V1.1//EN" />
</sourcetype>
<sourcetype name="changes-v11">
- <document-declaration
- public-id="-//APACHE//DTD Changes V1.1//EN" />
+ <document-declaration public-id="-//APACHE//DTD Changes V1.1//EN" />
</sourcetype>
<sourcetype name="todo-v12">
- <document-declaration
- public-id="-//APACHE//DTD Todo V1.2//EN" />
+ <document-declaration public-id="-//APACHE//DTD Todo V1.2//EN" />
</sourcetype>
<sourcetype name="changes-v12">
- <document-declaration
- public-id="-//APACHE//DTD Changes V1.2//EN" />
+ <document-declaration public-id="-//APACHE//DTD Changes V1.2//EN" />
</sourcetype>
<sourcetype name="howto-v12">
- <document-declaration
- public-id="-//APACHE//DTD How-to V1.2//EN" />
+ <document-declaration public-id="-//APACHE//DTD How-to V1.2//EN" />
</sourcetype>
<sourcetype name="todo-v13">
- <document-declaration
- public-id="-//APACHE//DTD Todo V1.3//EN" />
+ <document-declaration public-id="-//APACHE//DTD Todo V1.3//EN" />
</sourcetype>
<sourcetype name="changes-v13">
- <document-declaration
- public-id="-//APACHE//DTD Changes V1.3//EN" />
+ <document-declaration public-id="-//APACHE//DTD Changes V1.3//EN" />
</sourcetype>
<sourcetype name="howto-v13">
- <document-declaration
- public-id="-//APACHE//DTD How-to V1.3//EN" />
+ <document-declaration public-id="-//APACHE//DTD How-to V1.3//EN" />
</sourcetype>
<sourcetype name="document-v20a">
- <document-declaration
- public-id="-//APACHE//DTD Documentation V2.0a//EN" />
+ <document-declaration public-id="-//APACHE//DTD Documentation V2.0a//EN" />
</sourcetype>
<sourcetype name="document-v20">
- <document-declaration
- public-id="-//APACHE//DTD Documentation V2.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Documentation V2.0//EN" />
</sourcetype>
<sourcetype name="todo-v20">
- <document-declaration
- public-id="-//APACHE//DTD Todo V2.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Todo V2.0//EN" />
</sourcetype>
<sourcetype name="changes-v20">
- <document-declaration
- public-id="-//APACHE//DTD Changes V2.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD Changes V2.0//EN" />
</sourcetype>
<sourcetype name="howto-v20">
- <document-declaration
- public-id="-//APACHE//DTD How-to V2.0//EN" />
+ <document-declaration public-id="-//APACHE//DTD How-to V2.0//EN" />
</sourcetype>
</action>
</actions>
<selectors default="exists">
- <selector name="exists" logger="sitemap.selector.exists"
- src="org.apache.forrest.sourceexists.SourceExistsSelector" />
+ <selector name="exists" logger="sitemap.selector.exists"
+ src="org.apache.forrest.sourceexists.SourceExistsSelector" />
</selectors>
</components>
<locator>
<!--+
| Configuration of general location
+-->
- <!--+
+ <!--+
| resources home
+-->
<match pattern="resources.home">
- <location src="{properties:resources}"/>
+ <location src="{properties:resources}" />
</match>
<!--+
| Base location of the project themes
+-->
<match pattern="themer.project.dir">
- <location src="{lm:resources.home}/themes" />
+ <location src="{lm:resources.home}themes" />
</match>
<!--+
| Base location of the project structurer
+-->
<match pattern="structurer.project.dir">
- <location src="{lm:resources.home}/structurer" />
- </match>
- <!--+
- | contracts (e.g. html) that can be used in the project.
- +-->
- <match pattern="themer.contracts.dir">
- <location src="{lm:dispatcher.themer}/themes" />
+ <location src="{lm:resources.home}structurer" />
</match>
<!--+
| Base location for plugins
+-->
<match pattern="plugins.home">
- <location src="{properties:forrest.plugins}"/>
+ <location src="{properties:forrest.plugins}" />
</match>
<!--+
| Base location of the builded dispatcher plugin
@@ -156,24 +131,20 @@
| Base location of the builded themer plugin
+-->
<match pattern="dispatcher.themer">
- <location src="{lm:plugins.home}/{properties:dispatcher.themer}" />
+ <location src="{lm:dispatcher.home}/themer" />
</match>
<!--+
| Configuration of general location
| END
+-->
-<!-- resource types -->
+ <!-- resource types -->
<match pattern="dispatcher.structurer.resourceType.**">
<select>
- <location
- src="{lm:structurer.project.dir}/resource-types/{1}{properties:dispatcher.theme-ext}"
- />
- <location
- src="{lm:dispatcher.themer}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}"
- />
+ <location src="{lm:structurer.project.dir}/resource-types/{1}{properties:dispatcher.theme-ext}" />
+ <location src="{lm:dispatcher.themer}/structurer/resource-types/{1}{properties:dispatcher.theme-ext}" />
</select>
</match>
-<!--
+ <!--
FIXME - Problem with the pattern
********************************
We have encountered a strange problem with the pattern 'resolve.structurer.**'.
@@ -184,15 +155,15 @@
structurer templating
*********************
- URL specific structurer templates (project-based) e.g. index.fv
+ URL specific structurer templates (project-based) e.g. index.structurer.xml
* either in the structurer/url
* or in the xdocs dir [deprecated]
have priority *before*
- a) sourcetype based e.g. document-v20.fv
- b) resourceTypeAction based on meta data e.g. xhtml.fv
+ a) sourcetype based e.g. document-v20.structurer.xml
+ b) resourceTypeAction based on meta data e.g. xhtml.structurer.xml
(demonstrates lenya meta data integration for DOCO)
- c) RecursiveDirectoryTraversalAction e.g. samples/common.fv
+ c) RecursiveDirectoryTraversalAction e.g. samples/common.structurer.xml
c1) url dir
c2) xdocs dir [deprecated]
@@ -206,11 +177,9 @@
-->
<match pattern="resolve.structurer.**">
<select type="exists">
-<!-- project-based
+ <!-- project-based
url-based (url location) -->
- <location
- src="{lm:structurer.project.dir}/url/{1}{properties:dispatcher.theme-ext}"
- />
+ <location src="{lm:structurer.project.dir}/url/{1}{properties:dispatcher.theme-ext}" />
<!--<act type="sourcetype"
src="{properties:content.xdocs}{1}.xml">
Sourcetype based
@@ -219,7 +188,8 @@
src="lm://dispatcher.structurer.resourceType.{sourcetype}"
/>
</act>
- --><!--<act type="resourceTypeAction">
+ -->
+ <!--<act type="resourceTypeAction">
<parameter value="{../1}{1}" name="request"/>
<parameter value="{properties:content.xdocs}"
name="projectDir"/>
@@ -233,242 +203,172 @@
Meta data based
<location src="{uri}" />
</act>
- --><act type="RecursiveDirectoryTraversalAction">
- <parameter value="{../1}{1}" name="request"/>
- <parameter value="{properties:dispatcher.theme}" name="projectFallback"/>
- <parameter value="{properties:dispatcher.theme-ext}"
- name="projectExtension"/>
- <parameter value="{properties:resources}structurer/url/"
- name="projectDir"/>
-<!-- url
+ -->
+ <act type="RecursiveDirectoryTraversalAction">
+ <parameter value="{../1}{1}" name="request" />
+ <parameter value="{properties:dispatcher.theme}"
+ name="projectFallback" />
+ <parameter value="{properties:dispatcher.theme-ext}"
+ name="projectExtension" />
+ <parameter value="{lm:structurer.project.dir}/url/"
+ name="projectDir" />
+ <!-- url
project-based theme-based = directory-based / parent-directory based (recursively) -->
<location src="{uri}" />
</act>
-<!-- themes-dir: project-application-based theme-dir-based -->
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}"
- />
-<!-- themes-dir: project-application-based default -->
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}"
- />
-<!-- themer: forrest-application-based theme-based -->
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}"
- />
-<!-- themer: forrest-application-based default -->
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}"
- />
+ <!-- themes-dir: project-application-based theme-dir-based -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" />
+ <!-- themes-dir: project-application-based default -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" />
+ <!-- themer: forrest-application-based theme-based -->
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}{properties:dispatcher.theme-ext}" />
+ <!-- themer: forrest-application-based default -->
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}{properties:dispatcher.fallback.theme-ext}" />
</select>
</match>
-<!-- Structurer panels - You can group elements to a template and call it from any view. -->
+ <!-- Structurer panels - You can group elements to a template and call it from any view. -->
<match pattern="resolve.panels.**">
<select type="exists">
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}"
- />
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}"
- />
-<!-- plugin provided panels -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+ <!-- plugin provided panels -->
<location src="{lm:resolvePluginPanels.{1}}" />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}"
- />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}"
- />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/panels/{1}{properties:dispatcher.panel-ext}" />
</select>
</match>
-
-<!-- Next coming from themer -->
-<!-- Project implementation of templates have priority before default ones.
+ <!-- Next coming from themer -->
+ <!-- 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.*.**">
<select type="exists">
-<!-- project-based theme -->
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{1}/{2}.ft" />
-<!-- project-based default fallback -->
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
-<!-- plugin provided contracts -->
+ <!-- project-based theme -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+ <!-- project-based default fallback -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+ <!-- plugin provided contracts -->
<location src="{lm:resolvePluginContract.{1}.{2}}" />
-<!-- forrest-application-based theme -->
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
- <location
- src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/{1}/{2}{properties:dispatcher.contract-ext}"
- />
-<!-- forrest-application-based default fallback -->
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}"
- />
-<!-- forrest-application-based no found -->
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/noFt{properties:dispatcher.contract-ext}"
- />
+ <!-- forrest-application-based theme -->
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+ <!-- forrest-application-based default fallback -->
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/{2}{properties:dispatcher.contract-ext}" />
+ <!-- forrest-application-based no found -->
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{1}/noFt{properties:dispatcher.contract-ext}" />
</select>
</match>
-
-<!-- generic match for theme image resources -->
-<!--
+ <!-- generic match for theme image resources -->
+ <!--
{1} name
{2} extension (note we assume e.g. {1}.gif)
-->
<match pattern="themes/images/**.*">
<select type="exists">
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.theme}/images/{1}.{2}"
- />
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/images/{1}.{2}"
- />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}"
- />
- <location
- src="{lm:plugins.home}/org.apache.forrest.themes.core/themes/common/images/{1}.{2}"
- />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}"
- />
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/images/{1}.{2}" />
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/images/{1}.{2}" />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/images/{1}.{2}" />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/images/{1}.{2}" />
</select>
</match>
-<!-- generic match for theme resources like css and js. -->
-<!--
+ <!-- generic match for theme resources like css and js. -->
+ <!--
{1} name
{2} extension (note we assume e.g. PATH/css/{1}.css)
-->
<match pattern="themes/**.*">
<select type="exists">
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{2}/{1}.{2}" />
- <location
- src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}"
- />
-<!-- plugin provided contracts -->
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.theme}/{2}/{1}.{2}" />
+ <location src="{lm:themer.project.dir}/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" />
+ <!-- plugin provided contracts -->
<location src="{lm:resolvePluginThemes.{2}.{1}}" />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}.{2}"
- />
- <location
- src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}"
- />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.theme}/{2}/{1}.{2}" />
+ <location src="{lm:dispatcher.themer}/themes/{properties:dispatcher.fallback.theme}/{2}/{1}.{2}" />
</select>
</match>
-
<!--+
| various helper xsl matches
+-->
<!-- xhtml2 to html core transformation -->
<match pattern="transform.xhtml2.html.structurer">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/html/xhtml2_to_html.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/html/xhtml2_to_html.xsl" />
</match>
<!-- Some input need to be striped by their root element. -->
<match pattern="root-strip.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/root-strip.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/root-strip.xsl" />
</select>
</match>
<!-- dataModel -->
-<!-- A project can to supersede the standard <format>-to-<format>.xsl file to add specific feature.
+ <!-- A project can to supersede the standard <format>-to-<format>.xsl file to add specific feature.
to include the standard in the new stylesheet, just import the standard stylesheet has follows :
<xsl:import href="lm://std-dataModel-xml-document-to-<format>.xsl"/>
or <xsl:import href="lm://std-dataModel-html-<format>-to-<format>.xsl"/>
-->
<match pattern="dataModel-xml-document-to-**.xsl">
<select type="exists">
- <location
- src="{lm:resources.home}stylesheets/xslt/xml/document-to-{1}.xsl"
- />
- <location
- src="{lm:std-dataModel-xml-document-to-{1}.xsl}"
- />
+ <location src="{lm:resources.home}stylesheets/xslt/xml/document-to-{1}.xsl" />
+ <location src="{lm:std-dataModel-xml-document-to-{1}.xsl}" />
</select>
</match>
<match pattern="dataModel-html-**.xsl">
<select type="exists">
- <location
- src="{lm:resources.home}stylesheets/xslt/html/{1}.xsl"
- />
- <location
- src="{lm:std-dataModel-html-{1}.xsl}"
- />
+ <location src="{lm:resources.home}stylesheets/xslt/html/{1}.xsl" />
+ <location src="{lm:std-dataModel-html-{1}.xsl}" />
</select>
</match>
<match pattern="std-dataModel-html-**.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/html/{1}.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/html/{1}.xsl" />
</select>
</match>
<match pattern="std-dataModel-xml-document-to-**.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/xml/document-to-{1}.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/xml/document-to-{1}.xsl" />
</select>
</match>
-<!-- contracts have to be striped to their stylesheet for aggregation. -->
+ <!-- contracts have to be striped to their stylesheet for aggregation. -->
<match pattern="contract-strip-xsl.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/contract-strip-xsl.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" />
+ </select>
+ </match>
+ <match pattern="transform.book.menu">
+ <select type="exists">
+ <location src="{forrest:forrest.context}/skins/common/xslt/html/book-to-menu.xsl" />
</select>
</match>
<match pattern="hooks-to-**.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/{1}/hooksMatcher.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/{1}/hooksMatcher.xsl" />
</select>
</match>
<match pattern="strip-dispatcher-remains-**.xsl">
<select type="exists">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/{1}/strip-dispatcher-remains.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/{1}/strip-dispatcher-remains.xsl" />
</select>
</match>
-<!-- contracts (e.g. html) that can be used in the project. -->
+ <!-- contracts (e.g. html) that can be used in the project. -->
<match pattern="ls.contracts.xsl">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts.xsl" />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts.xsl" />
</match>
<match pattern="ls.contracts-to-document.xsl">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts-to-document.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/ls.contracts-to-document.xsl" />
</match>
+ <!-- Dispatcher has its own implementation of the following match
+ since the original has a dependency on skinconf.xml -->
<match pattern="transform.project.text">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/project-to-text.xsl"/>
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/project-to-text.xsl" />
</match>
-<!-- Extracts the style sheet from the contract. -->
+ <!-- Extracts the style sheet from the contract. -->
<match pattern="contract-strip-xsl.xsl">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/contract-strip-xsl.xsl" />
+ </match>
+ <!-- Round corner images -->
+ <match pattern="theme.images.corner.round">
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/round-corner-hex.svg.xslt" />
</match>
<match pattern="transform.xml.variable.helper">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl"
- />
- </match>
-<!-- Id generation -->
- <match pattern="generateId.xsl">
- <location
- src="{lm:dispatcher.home}/resources/stylesheets/helper/generateId.xsl"
- />
+ <location src="{lm:dispatcher.home}/resources/stylesheets/helper/variable.helper.xsl" />
</match>
</locator>
</locationmap>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/ls.xmap Wed Dec 2 13:58:18 2009
@@ -37,11 +37,12 @@
<map:serializers default="xml" />
</map:components>
<map:pipelines>
-<!-- ls.contracts
+ <!-- ls.contracts
list the default contracts-->
<map:pipeline>
<map:match pattern="ls.contracts.source.xml">
- <map:generate src="{lm:themer.contracts.dir}" type="xpathdirectory">
+ <map:generate src="{lm:dispatcher.themer}/themes"
+ type="xpathdirectory">
<map:parameter name="xpath" value="/*" />
<map:parameter name="xmlFiles" value="\.ft$" />
<map:parameter name="exclude" value="[\w]*.svn" />
@@ -51,14 +52,15 @@
<map:serialize />
</map:match>
<map:match pattern="ls.contracts.**.plugin.**.source.xml">
- <map:generate src="{forrest:forrest.plugins}/{1}.plugin.{2}/resources/themes" type="xpathdirectory">
+ <map:generate src="{forrest:forrest.plugins}/{1}.plugin.{2}/resources/themes"
+ type="xpathdirectory">
<map:parameter name="xpath" value="/*" />
<map:parameter name="xmlFiles" value="\.ft$" />
<map:parameter name="exclude" value="[\w]*.svn" />
<map:parameter name="depth" value="3" />
</map:generate>
<map:transform src="{lm:ls.contracts.xsl}" />
- <map:serialize type="xml-document"/>
+ <map:serialize type="xml-document" />
</map:match>
<map:match pattern="ls.contracts.project.source.xml">
<map:generate src="{lm:themer.project.dir}" type="xpathdirectory">
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/hooksMatcher.xsl Wed Dec 2 13:58:18 2009
@@ -15,22 +15,22 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</xsl:template>
-<!--This template will match the different combinations for hooks-->
+ <!--This template will match the different combinations for hooks-->
<xsl:template match="hook">
- <xsl:element name="fo:{@name}" xmlns:fo="http://www.w3.org/1999/XSL/Format">
- <xsl:apply-templates/>
+ <xsl:element name="fo:{@name}"
+ xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <xsl:apply-templates />
</xsl:element>
</xsl:template>
<xsl:template match="@*|*|text()|processing-instruction()|comment()">
<xsl:copy>
- <xsl:apply-templates
- select="@*|*|text()|processing-instruction()|comment()"/>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/fo/strip-dispatcher-remains.xsl Wed Dec 2 13:58:18 2009
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -15,40 +15,38 @@
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:fo="http://www.w3.org/1999/XSL/Format">
- <xsl:param name="rootFontFamily" select="//rootFontFamily/@value"/>
- <xsl:key name="static-content" match="fo:static-content" use="@flow-name"/>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <xsl:param name="rootFontFamily" select="//rootFontFamily/@value" />
+ <xsl:key name="static-content" match="fo:static-content" use="@flow-name" />
<xsl:template match="/">
- <fo:root
- xmlns:fo="http://www.w3.org/1999/XSL/Format"
- font-family="{$rootFontFamily}"
- font-size="12pt">
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ font-family="{$rootFontFamily}" font-size="12pt">
<fo:layout-master-set>
- <xsl:copy-of select="/fo/layout-master-set/*"/>
+ <xsl:copy-of select="/fo/layout-master-set/*" />
</fo:layout-master-set>
<fo:bookmark-tree>
- <xsl:copy-of select="/fo/bookmark-tree/*"/>
+ <xsl:copy-of select="/fo/bookmark-tree/*" />
</fo:bookmark-tree>
<fo:page-sequence master-reference="book">
<xsl:for-each select="//fo:static-content[generate-id()=generate-id(key('static-content', @flow-name))]">
- <xsl:sort select="@flow-name"/>
- <xsl:variable name="flow-name" select="@flow-name"/>
+
+ <xsl:sort select="@flow-name" />
+ <xsl:variable name="flow-name" select="@flow-name" />
<fo:static-content flow-name="{@flow-name}">
- <xsl:copy-of select="//fo:static-content[@flow-name=$flow-name]/*"/>
+ <xsl:copy-of select="//fo:static-content[@flow-name=$flow-name]/*" />
</fo:static-content>
</xsl:for-each>
<fo:flow flow-name="xsl-region-body">
- <xsl:copy-of select="/fo/xsl-region-body/title/*"/>
-<!-- FIXME : left was {$text-align} -->
+ <xsl:copy-of select="/fo/xsl-region-body/title/*" />
+ <!-- FIXME : left was {$text-align} -->
<!--<fo:block text-align="left" padding-before="18pt" padding-after="18pt">-->
- <xsl:copy-of select="/fo/xsl-region-body/body/*"/>
+ <xsl:copy-of select="/fo/xsl-region-body/body/*" />
<!--</fo:block>-->
<fo:block id="term" />
</fo:flow>
</fo:page-sequence>
</fo:root>
</xsl:template>
- <xsl:template match="//rootFontFamily"/>
+ <xsl:template match="//rootFontFamily" />
</xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/contract-strip-xsl.xsl Wed Dec 2 13:58:18 2009
@@ -15,10 +15,9 @@
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:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:forrest="http://apache.org/forrest/templates/1.0">
<xsl:template match="/">
- <xsl:copy-of select="forrest:contract/forrest:template/xsl:stylesheet"/>
+ <xsl:copy-of select="forrest:contract/forrest:template/xsl:stylesheet" />
</xsl:template>
</xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/generateId.xsl Wed Dec 2 13:58:18 2009
@@ -20,19 +20,19 @@
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
+ <!-- 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 name="generate-id">
<xsl:choose>
<xsl:when test="@id">
- <xsl:value-of select="@id"/>
+ <xsl:value-of select="@id" />
</xsl:when>
<xsl:when test="title">
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="generate-id(.)"/>
+ <xsl:value-of select="generate-id(.)" />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/helper/variable.helper.xsl Wed Dec 2 13:58:18 2009
@@ -16,44 +16,45 @@
limitations under the License.
-->
<xsl:stylesheet version="1.0"
- xmlns:forrest="http://apache.org/forrest/properties/1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:import href="lm://transform.xml.dotdots"/>
- <xsl:import href="lm://transform.xml.pathutils"/>
- <xsl:param name="path" select="'test.html'"/>
- <xsl:param name="theme" select="'notheme'"/>
-<!-- Path (..'s) to the root directory -->
+xmlns:forrest="http://apache.org/forrest/properties/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:import href="lm://transform.xml.dotdots" />
+ <xsl:import href="lm://transform.xml.pathutils" />
+ <xsl:param name="path" select="'test.html'" />
+ <xsl:param name="theme" select="'notheme'" />
+ <!-- Path (..'s) to the root directory -->
<xsl:variable name="root">
<xsl:call-template name="dotdots">
- <xsl:with-param name="path" select="$path"/>
+ <xsl:with-param name="path" select="$path" />
</xsl:call-template>
</xsl:variable>
<xsl:variable name="filename-noext">
<xsl:call-template name="filename-noext">
- <xsl:with-param name="path" select="$path"/>
+ <xsl:with-param name="path" select="$path" />
</xsl:call-template>
</xsl:variable>
-<!-- Source filename (eg 'foo.xml') of current page -->
+ <!-- Source filename (eg 'foo.xml') of current page -->
<xsl:variable name="filename">
<xsl:call-template name="filename">
- <xsl:with-param name="path" select="$path"/>
+ <xsl:with-param name="path" select="$path" />
</xsl:call-template>
</xsl:variable>
<xsl:variable name="skin-img-dir"
- select="concat(string($root), 'themes/images')"/>
- <xsl:variable name="spacer" select="concat($root, 'themer/images/spacer.gif')"/>
+ select="concat(string($root), 'themes/images')" />
+ <xsl:variable name="spacer"
+ select="concat($root, 'themer/images/spacer.gif')" />
<xsl:template match="/">
<properties>
- <property name="skin-img-dir" value="{$skin-img-dir}"/>
- <property name="filename" value="{$filename}"/>
- <property name="filename-noext" value="{$filename-noext}"/>
- <property name="root" value="{$root}"/>
- <property name="path" value="{$path}"/>
- <property name="theme" value="{$theme}"/>
- <xsl:apply-templates select="forrest:properties/forrest:property"/>
+ <property name="skin-img-dir" value="{$skin-img-dir}" />
+ <property name="filename" value="{$filename}" />
+ <property name="filename-noext" value="{$filename-noext}" />
+ <property name="root" value="{$root}" />
+ <property name="path" value="{$path}" />
+ <property name="theme" value="{$theme}" />
+ <xsl:apply-templates select="forrest:properties/forrest:property" />
</properties>
</xsl:template>
<xsl:template match="forrest:property">
- <property name="{@name}" value="{@value}"/>
+ <property name="{@name}" value="{@value}" />
</xsl:template>
</xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/book-to-menu.xsl Wed Dec 2 13:58:18 2009
@@ -20,34 +20,38 @@
details.
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:import href="../common/xslt/html/book-to-menu.xsl"/>
+ <xsl:import href="lm://transform.book.menu" />
<xsl:template match="book">
<div id="menu">
<ul>
- <xsl:apply-templates select="menu"/>
+ <xsl:apply-templates select="menu" />
</ul>
</div>
</xsl:template>
<xsl:template match="menu">
- <li><h1>
- <xsl:value-of select="@label"/>
+ <li>
+ <h1>
+ <xsl:value-of select="@label" />
</h1>
<ul>
- <xsl:apply-templates/>
- </ul></li>
+ <xsl:apply-templates />
+ </ul>
+ </li>
</xsl:template>
- <xsl:template match="menu-item[@type='hidden']"/>
+ <xsl:template match="menu-item[@type='hidden']" />
<xsl:template match="menu-item">
- <li><xsl:apply-imports/></li>
+ <li>
+ <xsl:apply-imports />
+ </li>
</xsl:template>
<xsl:template name="selected">
<div class="current">
- <xsl:value-of select="@label"/>
+ <xsl:value-of select="@label" />
</div>
</xsl:template>
<xsl:template name="print-external">
<font color="#ffcc00">
- <xsl:apply-imports/>
+ <xsl:apply-imports />
</font>
</xsl:template>
</xsl:stylesheet>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/document-to-html.xsl Wed Dec 2 13:58:18 2009
@@ -20,21 +20,24 @@
imported document2html.xsl for details.
-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
- <xsl:import href="../common/xslt/html/document-to-html.xsl"/>
- <xsl:include href="../helper/generateId.xsl"/>
+ <xsl:import href="lm://transform.xdoc.html" />
+ <xsl:include href="lm://transform.xml.generateId" />
+ <xsl:variable name="skin-img-dir"
+ select="concat(string($root), 'themes/images')" />
+ <xsl:template match="body" mode="toc" />
<xsl:template match="document">
<div id="content">
<xsl:if test="normalize-space(header/title)!=''">
<h1>
- <xsl:value-of select="header/title"/>
+ <xsl:value-of select="header/title" />
</h1>
</xsl:if>
<xsl:if test="normalize-space(header/subtitle)!=''">
<h3>
- <xsl:value-of select="header/subtitle"/>
+ <xsl:value-of select="header/subtitle" />
</h3>
</xsl:if>
-<!--
+ <!--
<xsl:apply-templates select="header/type"/>
<xsl:apply-templates select="header/notice"/>
<xsl:apply-templates select="header/abstract"/>
@@ -49,84 +52,88 @@
</div>
-->
<div id="content-main">
- <xsl:apply-templates select="body"/>
+ <xsl:apply-templates select="body" />
</div>
</div>
</xsl:template>
<xsl:template match="body">
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</xsl:template>
- <xsl:template name="tocLinkGenerator"><a>
- <xsl:attribute name="name">
- <xsl:call-template
- name="generate-id"/>
- </xsl:attribute>
- <xsl:attribute name="title">
- <xsl:value-of select="title"/>
- </xsl:attribute>
-<xsl:text> </xsl:text></a>
+ <xsl:template name="tocLinkGenerator">
+ <a>
+ <xsl:attribute name="name">
+ <xsl:call-template name="generate-id" />
+ </xsl:attribute>
+ <xsl:attribute name="title">
+ <xsl:value-of select="title" />
+ </xsl:attribute>
+ <xsl:text>
+
+</xsl:text>
+ </a>
</xsl:template>
-<!--<xsl:template match="@id">
+ <!--<xsl:template match="@id">
<xsl:apply-imports/>
</xsl:template>-->
-<!-- Generate a <a name="..."> tag for an @id -->
-<!--<xsl:template match="@id">
+ <!-- Generate a <a name="..."> tag for an @id -->
+ <!--<xsl:template match="@id">
<xsl:if test="normalize-space(.)!=''">
<a name="{.}"> </a>
</xsl:if>
</xsl:template>-->
<xsl:template match="section">
- <xsl:call-template name="tocLinkGenerator"/>
-<!-- <xsl:apply-templates select="@id"/>-->
- <xsl:variable name = "level" select = "count(ancestor::section)+1" />
+ <xsl:call-template name="tocLinkGenerator" />
+ <!-- <xsl:apply-templates select="@id"/>-->
+ <xsl:variable name="level" select="count(ancestor::section)+1" />
<xsl:choose>
<xsl:when test="$level=1">
<div class="skinconf-heading-{$level}">
<h1>
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</h1>
</div>
<div class="section">
- <xsl:apply-templates select="*[not(self::title)]"/>
+ <xsl:apply-templates select="*[not(self::title)]" />
</div>
</xsl:when>
<xsl:when test="$level=2">
<div class="skinconf-heading-{$level}">
<h2>
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</h2>
</div>
<div class="section">
- <xsl:apply-templates select="*[not(self::title)]"/>
+ <xsl:apply-templates select="*[not(self::title)]" />
</div>
</xsl:when>
-<!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
+ <!-- If a faq, answer sections will be level 3 (1=Q/A, 2=part) -->
<xsl:when test="$level=3 and $notoc='true'">
<h4 class="faq">
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</h4>
- <div align="right"><a href="#{@id}-menu">^</a>
+ <div align="right">
+ <a href="#{@id}-menu">^</a>
</div>
<div style="margin-left: 15px">
- <xsl:apply-templates select="*[not(self::title)]"/>
+ <xsl:apply-templates select="*[not(self::title)]" />
</div>
</xsl:when>
<xsl:when test="$level=3">
<h4>
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</h4>
- <xsl:apply-templates select="*[not(self::title)]"/>
+ <xsl:apply-templates select="*[not(self::title)]" />
</xsl:when>
<xsl:otherwise>
<h5>
- <xsl:value-of select="title"/>
+ <xsl:value-of select="title" />
</h5>
- <xsl:apply-templates select="*[not(self::title)]"/>
+ <xsl:apply-templates select="*[not(self::title)]" />
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template match="figure">
- <xsl:apply-templates select="@id"/>
+ <xsl:apply-templates select="@id" />
<div style="text-align: center;">
<xsl:if test="@id">
<xsl:attribute name="id">
@@ -140,34 +147,34 @@
</xsl:if>
<xsl:if test="@height">
<xsl:attribute name="height">
- <xsl:value-of select="@height"/>
+ <xsl:value-of select="@height" />
</xsl:attribute>
</xsl:if>
<xsl:if test="@width">
<xsl:attribute name="width">
- <xsl:value-of select="@width"/>
+ <xsl:value-of select="@width" />
</xsl:attribute>
</xsl:if>
</img>
</div>
</xsl:template>
<xsl:template match="note | warning | fixme">
- <xsl:apply-templates select="@id"/>
+ <xsl:apply-templates select="@id" />
<div class="{local-name()}">
<div class="label">
<xsl:choose>
-<!-- FIXME: i18n Transformer here -->
+ <!-- FIXME: i18n Transformer here -->
<xsl:when test="@label">
- <xsl:value-of select="@label"/>
+ <xsl:value-of select="@label" />
</xsl:when>
<xsl:when test="local-name() = 'note'">Note</xsl:when>
<xsl:when test="local-name() = 'warning'">Warning</xsl:when>
- <xsl:otherwise>Fixme (<xsl:value-of
- select="@author"/>)</xsl:otherwise>
+ <xsl:otherwise>Fixme (
+ <xsl:value-of select="@author" />)</xsl:otherwise>
</xsl:choose>
</div>
<div class="content">
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</div>
</div>
</xsl:template>
Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl?rev=886147&r1=886146&r2=886147&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.dispatcher/resources/stylesheets/html/hooksMatcher.xsl Wed Dec 2 13:58:18 2009
@@ -15,30 +15,34 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<xsl:stylesheet version="1.0"
- xmlns:forrest="http://apache.org/forrest/templates/1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:stylesheet version="1.0"
+xmlns:forrest="http://apache.org/forrest/templates/1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</xsl:template>
-<!--This template will match the different combinations for hooks-->
- <xsl:template match="hook">
+ <!--This template will match the different combinations for hooks-->
+ <xsl:template match="forrest:hook">
<xsl:if test="@type='block' or not(@type)">
<div>
- <xsl:call-template name="attributes"/>
+ <xsl:call-template name="attributes" />
<xsl:if test="@nbsp='true'">
-<xsl:text> </xsl:text>
+ <xsl:text>
+
+</xsl:text>
</xsl:if>
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</div>
</xsl:if>
<xsl:if test="@type='inline'">
<span id="{@name}">
- <xsl:call-template name="attributes"/>
+ <xsl:call-template name="attributes" />
<xsl:if test="@nbsp='true'">
-<xsl:text> </xsl:text>
+ <xsl:text>
+
+</xsl:text>
</xsl:if>
- <xsl:apply-templates/>
+ <xsl:apply-templates />
</span>
</xsl:if>
</xsl:template>
@@ -56,8 +60,7 @@
</xsl:template>
<xsl:template match="@*|*|text()|processing-instruction()|comment()">
<xsl:copy>
- <xsl:apply-templates
- select="@*|*|text()|processing-instruction()|comment()"/>
+ <xsl:apply-templates select="@*|*|text()|processing-instruction()|comment()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.