Author: thorsten
Date: Wed Oct 19 00:57:38 2005
New Revision: 326440
URL: http://svn.apache.org/viewcvs?rev=326440&view=rev
Log:
Moved default contracts to its own directory. Added ls.contracts feature to the
structurer and refactored the underlying code. Linked this work in
the coresponding lm.
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl
(with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl
(with props)
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/branding-breadcrumbs.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/branding-fontsize.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/branding-logo.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/branding-tagline.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/compliance-links.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-abstract.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-author.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-authors.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-feeder.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-include-html.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-ls-contracts.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-main-lenya.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-main.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-minitoc.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-motd-page.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-pdf-link.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-pod-link.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-source-xml-link.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-title.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-txt-link.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/content-xml-link.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/export-link.vt.xml
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/export-link.vt.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/genericMarkup.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/nav-main-sub.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/nav-main.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/nav-section.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/noFt.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/search-input.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-compliance-links.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-copyright.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-credits.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-current-time.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-feedback-dyn.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-feedback.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-last-published-net.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-last-published.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-meta-icon.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-meta-navigation.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/default/siteinfo-meta.ft
- copied unchanged from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/defaults
- copied, changed from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft
Removed:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-breadcrumbs.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-fontsize.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-logo.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/branding-tagline.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/compliance-links.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-abstract.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-author.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-authors.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-feeder.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-include-html.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-ls-contracts.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main-lenya.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-main.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-minitoc.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-motd-page.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pdf-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-pod-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-source-xml-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-title.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-txt-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/content-xml-link.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/export-link.vt.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/genericMarkup.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main-sub.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-main.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/nav-section.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/noFt.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/search-input.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-compliance-links.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-copyright.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-credits.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-current-time.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback-dyn.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-feedback.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published-net.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-last-published.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-icon.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta-navigation.ft
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/siteinfo-meta.ft
Modified:
forrest/trunk/etc/structurer.sh
forrest/trunk/main/webapp/locationmap-structurer.xml
forrest/trunk/main/webapp/locationmap-themer.xml
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
Modified: forrest/trunk/etc/structurer.sh
URL:
http://svn.apache.org/viewcvs/forrest/trunk/etc/structurer.sh?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
--- forrest/trunk/etc/structurer.sh (original)
+++ forrest/trunk/etc/structurer.sh Wed Oct 19 00:57:38 2005
@@ -60,5 +60,4 @@
$FORREST_HOME/tools/ant/bin/ant local-deploy
cd ../org.apache.forrest.plugin.output.themes
$FORREST_HOME/tools/ant/bin/ant local-deploy
-cd ../org.apache.forrest.plugin.input.viewHelper.xhtml.ls
-$FORREST_HOME/tools/ant/bin/ant local-deploy
+
Modified: forrest/trunk/main/webapp/locationmap-structurer.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-structurer.xml?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-structurer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-structurer.xml Wed Oct 19 00:57:38
2005
@@ -84,12 +84,22 @@
<!-- Structurer tiles - You can group elements to a template and call it
from any view. -->
<match pattern="resolve.tiles.**">
<select type="exists">
- <location
src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
- <location src="{project:resources}/templates/{1}.vt.xml" />
- <location
src="{project:themer}/resources/templates/{project:theme}/{1}.vt.xml" />
- <location src="{project:themer}/resources/templates/{1}.vt.xml" />
- <location
src="{defaults:themer}/resources/templates/{project:theme}/{1}.vt.xml" />
- <location src="{defaults:themer}/resources/templates/{1}.vt.xml" />
+ <location
+ src="{project:resources}/templates/{project:theme}/{1}.vt.xml" />
+ <location
+ src="{project:resources}/templates/{defaults:theme}/{1}.vt.xml" />
+ <location
+
src="{project:themer}/resources/templates/{project:theme}/{1}.vt.xml"
+ />
+ <location
+
src="{project:themer}/resources/templates/{defaults:theme}/{1}.vt.xml"
+ />
+ <location
+
src="{defaults:themer}/resources/templates/{project:theme}/{1}.vt.xml"
+ />
+ <location
+
src="{defaults:themer}/resources/templates/{defaults:theme}/{1}.vt.xml"
+ />
</select>
</match>
<!-- FIXME: jxpath locationmap-->
Modified: forrest/trunk/main/webapp/locationmap-themer.xml
URL:
http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/locationmap-themer.xml?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
--- forrest/trunk/main/webapp/locationmap-themer.xml (original)
+++ forrest/trunk/main/webapp/locationmap-themer.xml Wed Oct 19 00:57:38 2005
@@ -45,15 +45,15 @@
<!-- project-based theme -->
<location src="{project:resources}/templates/{project:theme}/{1}.ft" />
<!-- project-based default fallback -->
- <location src="{project:resources}/templates/{1}.ft" />
+ <location src="{project:resources}/templates/{defaults:theme}/{1}.ft"
/>
<!-- project-application-based theme -->
<location
src="{project:themer}/resources/templates/{project:theme}/{1}.ft" />
<!-- project-application-based default fallback -->
- <location src="{project:themer}/resources/templates/{1}.ft" />
+ <location
src="{project:themer}/resources/templates/{defaults:theme}/{1}.ft" />
<!-- forrest-application-based theme -->
<location
src="{defaults:themer}/resources/templates/{project:theme}/{1}.ft" />
<!-- forrest-application-based default fallback -->
- <location src="{defaults:themer}/resources/templates/{1}.ft" />
+ <location
src="{defaults:themer}/resources/templates/{defaults:theme}/{1}.ft" />
<!-- forrest-application-based no found -->
<location src="{defaults:themer}/resources/templates/noFt.ft" />
</select>
@@ -98,6 +98,31 @@
<select type="exists">
<location
src="{project:structurer}/resources/stylesheets/contract.property.xsl" />
<location
src="{defaults:structurer}/resources/stylesheets/contract.property.xsl" />
+ </select>
+ </match>
+ <!-- contracts (e.g. html) that can be used in the project. -->
+ <match pattern="ls.contracts.xsl">
+ <select type="exists">
+ <location
src="{project:structurer}/resources/stylesheets/ls.contracts.xsl" />
+ <location
src="{defaults:structurer}/resources/stylesheets/ls.contracts.xsl" />
+ </select>
+ </match>
+ <match pattern="ls.contracts">
+ <select type="exists">
+ <location src="cocoon://ls.contracts" />
+ </select>
+ </match>
+ <match pattern="ls.contracts-to-document.xsl">
+ <select type="exists">
+ <location
src="{project:structurer}/resources/stylesheets/ls.contracts-to-document.xsl" />
+ <location
src="{defaults:structurer}/resources/stylesheets/ls.contracts-to-document.xsl"
/>
+ </select>
+ </match>
+ <!-- contracts (e.g. html) that can be used in the project. -->
+ <match pattern="themer.contracts.dir">
+ <select type="exists">
+ <location src="{project:themer}/resources/templates" />
+ <location src="{defaults:themer}/resources/templates" />
</select>
</match>
</locator>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/internal.xmap
Wed Oct 19 00:57:38 2005
@@ -48,6 +48,7 @@
src="org.apache.cocoon.generation.TraversableGenerator"
logger="sitemap.generator.traverse" label="content"
pool-max="16" />
+<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"
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl?rev=326440&view=auto
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl
(added)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl
Wed Oct 19 00:57:38 2005
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:xhtml="http://www.w3.org/1999/xhtml";
+ xmlns:dir="http://apache.org/cocoon/directory/2.0";
+ xmlns:session="http://apache.org/cocoon/session/1.0";
+ xmlns:forrest="http://apache.org/forrest/templates/1.0"; >
+ <!--
+ Create row for each document. Information about the document is
+ extracted from the document itself using the document()
+ function.
+ -->
+ <xsl:template match="/">
+ <document>
+ <header>
+ <title>ls.contracts</title>
+ </header>
+ <body>
+ <xsl:apply-templates/>
+ </body>
+ </document>
+ </xsl:template>
+ <xsl:template match="forrest:theme">
+ <xsl:variable select="@name" name="name"/>
+ <section id="{$name}">
+ <title>
+ theme name: <xsl:value-of select="@name" />
+ </title>
+ <xsl:apply-templates select="./forrest:contract">
+ <xsl:with-param select="$name" name="theme"/>
+ </xsl:apply-templates>
+ </section>
+ </xsl:template>
+ <xsl:template match="forrest:contract">
+ <xsl:param name="theme" select="default"/>
+ <section id="[EMAIL PROTECTED]">
+ <title>
+ <xsl:value-of select="@name" />
+ </title>
+ <p class="file">
+ <strong>file-name:</strong>
+ <br/>
+ <xsl:value-of select="@file-name" />
+ </p>
+ <p class="description">
+ <strong>description:</strong>
+ <br/>
+ <xsl:copy-of select="./description" />
+ </p>
+ <p class="usage">
+ <strong>usage:</strong>
+ </p>
+ <source>
+ <xsl:value-of select="./usage" />
+ </source>
+ <p class="template-definition">
+ <strong>forrest-template definition:</strong>
+ </p>
+ <source><forrest:template<xsl:apply-templates
select="./forrest:template/@*" />/>
+ </source>
+ </section>
+ </xsl:template>
+ <xsl:template match="forrest:template/@*"> <xsl:value-of
select="name()"/>="<xsl:value-of select="."/>"</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
Propchange:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts-to-document.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Added:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl?rev=326440&view=auto
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl
(added)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl
Wed Oct 19 00:57:38 2005
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2005 The Apache Software Foundation or its licensors,
+ as applicable.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsl:stylesheet
+ version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
+ xmlns:dir="http://apache.org/cocoon/directory/2.0";
+ xmlns:forrest="http://apache.org/forrest/templates/1.0";
+ >
+
+
+ <xsl:template match="/dir:directory">
+ <forrest:themes xmlns:forrest="http://apache.org/forrest/templates/1.0";>
+ <xsl:apply-templates />
+ </forrest:themes>
+ </xsl:template>
+
+<xsl:template match="dir:directory">
+ <forrest:theme name="[EMAIL PROTECTED]">
+ <xsl:apply-templates />
+ </forrest:theme>
+</xsl:template>
+
+<xsl:template match="dir:file[./*/*/@name]">
+ <forrest:contract name="{./*/*/@name}" file-name="[EMAIL PROTECTED]">
+ <xsl:copy-of select="./*/*/description"/>
+ <xsl:copy-of select="./*/*/usage"/>
+ <xsl:apply-templates select=".//forrest:template"/>
+ </forrest:contract>
+</xsl:template>
+
+<xsl:template match="forrest:template">
+ <forrest:template>
+ <xsl:copy-of select="@*"/>
+ </forrest:template>
+</xsl:template>
+
+</xsl:stylesheet>
+
Propchange:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/resources/stylesheets/ls.contracts.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.internal.structurer/themer.xmap
Wed Oct 19 00:57:38 2005
@@ -70,5 +70,24 @@
<map:serialize />
</map:match>
</map:pipeline>
+ <!-- ls.contracts
+ list the default contracts-->
+ <map:pipeline>
+ <map:match pattern="ls.contracts">
+ <map:generate src="{lm:themer.contracts.dir}" 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="2" />
+ </map:generate>
+ <map:transform src="{lm:ls.contracts.xsl}"/>
+ <map:serialize />
+ </map:match>
+ <map:match pattern="ls.contracts.xml">
+ <map:generate src="{lm:ls.contracts}"/>
+ <map:transform src="{lm:ls.contracts-to-document.xsl}"/>
+ <map:serialize />
+ </map:match>
+ </map:pipeline>
</map:pipelines>
</map:sitemap>
Modified:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap?rev=326440&r1=326439&r2=326440&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
Wed Oct 19 00:57:38 2005
@@ -32,7 +32,7 @@
src="org.apache.cocoon.generation.HTMLGenerator">
<jtidy-config>jtidy.properties</jtidy-config>
</map:generator>
- <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:generators>
@@ -75,29 +75,17 @@
<map:pipeline>
<map:match pattern="test.**.*">
<map:generate src="status.xml" />
- <map:transform src="resources/stylesheets/temp.xsl">
+ <!--<map:transform src="resources/stylesheets/temp.xsl">
<map:parameter name="test"
- value="{lm:structurer-final-xsl-{1}.xsl}" />
- </map:transform>
+ value="{lm:ls.contracts.xsl}" />
+ </map:transform>-->
<map:serialize />
</map:match>
</map:pipeline>
<!-- DO NOT USE ANYMORE
FIXME: Finish rewriting move to lm -> {lm:contract.{1}.{2}}del if
finished-->
<!--FIXME:START-->
- <!-- ls.fbits
- list the default fbits-->
- <map:pipeline>
- <map:match pattern="ls.contracts">
- <map:generate src="resources/templates" 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="2" />
- </map:generate>
- <map:serialize type="xml" />
- </map:match>
- </map:pipeline>
+
<!-- ls.fbits
list the project fbits-->
<map:pipeline>
Copied:
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/defaults
(from r326053,
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft)
URL:
http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/defaults?p2=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/defaults&p1=forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft&r1=326053&r2=326440&rev=326440&view=diff
==============================================================================
---
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/blank.ft
(original)
+++
forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/templates/defaults
Wed Oct 19 00:57:38 2005
@@ -28,7 +28,7 @@
</description>
<usage><![CDATA[<forrest:contract name="doNotUseJustDummy"/>]]></usage>
<forrest:template xmlns:forrest="http://apache.org/forrest/templates/1.0";
- format="html" name="blank" inputFormat="xsl" body="false" head="false">
+ format="xhtml" name="blank" inputFormat="xsl" body="false" head="false">
<xsl:stylesheet version="1.1"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!--Add here the needed templates-->
