You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cr...@apache.org on 2005/09/11 03:54:02 UTC
svn commit: r280059 - in /cocoon/site/src/forrest-configuration: ./ classes/
resources/stylesheets/
Author: crossley
Date: Sat Sep 10 18:53:51 2005
New Revision: 280059
URL: http://svn.apache.org/viewcvs?rev=280059&view=rev
Log:
Fix line-endings and do 'svn propset svn:eol-style native'
Modified:
cocoon/site/src/forrest-configuration/classes/CatalogManager.properties (contents, props changed)
cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl (contents, props changed)
cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl (contents, props changed)
cocoon/site/src/forrest-configuration/resources/stylesheets/no-comments.xml (props changed)
cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml (contents, props changed)
cocoon/site/src/forrest-configuration/sitemap.xmap
cocoon/site/src/forrest-configuration/skinconf-colors.xml (contents, props changed)
cocoon/site/src/forrest-configuration/skinconf-credits.xml (contents, props changed)
cocoon/site/src/forrest-configuration/skinconf-heading.xml (contents, props changed)
cocoon/site/src/forrest-configuration/skinconf-pdf.xml (contents, props changed)
Modified: cocoon/site/src/forrest-configuration/classes/CatalogManager.properties
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/classes/CatalogManager.properties?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/classes/CatalogManager.properties (original)
+++ cocoon/site/src/forrest-configuration/classes/CatalogManager.properties Sat Sep 10 18:53:51 2005
@@ -1,37 +1,37 @@
-# Copyright 2002-2004 The Apache Software Foundation
-#
-# 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.
-
-#=======================================================================
-# CatalogManager.properties
-#
-# This is the default properties file for Apache Forrest.
-# This facilitates local configuration of application-specific catalogs.
-#
-# See the Apache Forrest documentation:
-# http://forrest.apache.org/docs/your-project.html
-# http://forrest.apache.org/docs/validation.html
-
-# verbosity ... level of messages for status/debug
-# See forrest/src/core/context/WEB-INF/cocoon.xconf
-
-# catalogs ... list of additional catalogs to load
-# (Note that Apache Forrest will automatically load its own default catalog
-# from src/core/context/resources/schema/catalog.xcat)
-# use full pathnames
-# pathname separator is always semi-colon (;) regardless of operating system
-# directory separator is always slash (/) regardless of operating system
-#
-#catalogs=/home/me/forrest/my-site/src/documentation/resources/schema/catalog.xcat
-catalogs=
-
+# Copyright 2002-2004 The Apache Software Foundation
+#
+# 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.
+
+#=======================================================================
+# CatalogManager.properties
+#
+# This is the default properties file for Apache Forrest.
+# This facilitates local configuration of application-specific catalogs.
+#
+# See the Apache Forrest documentation:
+# http://forrest.apache.org/docs/your-project.html
+# http://forrest.apache.org/docs/validation.html
+
+# verbosity ... level of messages for status/debug
+# See forrest/src/core/context/WEB-INF/cocoon.xconf
+
+# catalogs ... list of additional catalogs to load
+# (Note that Apache Forrest will automatically load its own default catalog
+# from src/core/context/resources/schema/catalog.xcat)
+# use full pathnames
+# pathname separator is always semi-colon (;) regardless of operating system
+# directory separator is always slash (/) regardless of operating system
+#
+#catalogs=/home/me/forrest/my-site/src/documentation/resources/schema/catalog.xcat
+catalogs=
+
Propchange: cocoon/site/src/forrest-configuration/classes/CatalogManager.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl (original)
+++ cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl Sat Sep 10 18:53:51 2005
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:param name="docid"/>
-
- <xsl:template match="img|link">
- <xsl:element name="{name()}">
- <xsl:for-each select="@*">
- <xsl:choose>
- <xsl:when test="(name(.) = 'src' or name(.) = 'href') and starts-with(., 'files')">
- <xsl:attribute name="{name(.)}">
- <xsl:value-of select="$docid"/>/<xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:when>
- <xsl:otherwise>
- <xsl:attribute name="{name(.)}">
- <xsl:value-of select="."/>
- </xsl:attribute>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <xsl:value-of select="."/>
- </xsl:element>
- </xsl:template>
-
- <xsl:template match="@*|node()" priority="-2">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:param name="docid"/>
+
+ <xsl:template match="img|link">
+ <xsl:element name="{name()}">
+ <xsl:for-each select="@*">
+ <xsl:choose>
+ <xsl:when test="(name(.) = 'src' or name(.) = 'href') and starts-with(., 'files')">
+ <xsl:attribute name="{name(.)}">
+ <xsl:value-of select="$docid"/>/<xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="{name(.)}">
+ <xsl:value-of select="."/>
+ </xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <xsl:value-of select="."/>
+ </xsl:element>
+ </xsl:template>
+
+ <xsl:template match="@*|node()" priority="-2">
+ <xsl:copy>
+ <xsl:apply-templates select="@*|node()"/>
+ </xsl:copy>
+ </xsl:template>
</xsl:stylesheet>
Propchange: cocoon/site/src/forrest-configuration/resources/stylesheets/correct-img-links.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl (original)
+++ cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl Sat Sep 10 18:53:51 2005
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:variable name="content" select="/aggregate/content/document/body"/>
- <xsl:variable name="content-header" select="/aggregate/content/document/header"/>
- <xsl:variable name="comments" select="/aggregate/comments"/>
- <xsl:variable name="generated-before" select="/aggregate/generated-before"/>
- <xsl:variable name="generated-after" select="/aggregate/generated-after"/>
- <xsl:variable name="meta" select="/aggregate/meta"/>
-
- <!-- status indicates a 2.1 legacy document -->
- <xsl:variable name="legacy21" select="$meta/legacy"/>
-
- <xsl:template match="/">
- <document>
- <header>
- <xsl:apply-templates select="$content-header/title" mode="header"/>
- </header>
- <body>
- <xsl:copy-of select="$generated-before/html/body/*"/>
- <xsl:apply-templates select="$content" mode="content"/>
- <xsl:copy-of select="$generated-after/html/body/*"/>
- <xsl:apply-templates select="$comments"/>
- </body>
- </document>
- </xsl:template>
- <xsl:template match="comments">
- <section id="Comments">
- <title>Comments</title>
- <div class="commentsarea">
- <div class="commenttaskbar">
- add your comments
- </div>
- <xsl:apply-templates select="comment"/>
- </div>
- </section>
- </xsl:template>
- <xsl:template match="comment">
- <div class="comment">
- <div class="commentheader">
- <xsl:value-of select="@subject"/> by <xsl:value-of select="@name"/>
- </div>
- <div class="commentbody">
- <xsl:copy-of select="*"/>
- </div>
- </div>
- </xsl:template>
-
- <!-- add note to title for 2.1 legacy docs -->
- <xsl:template match="title" mode="header">
- <title>
- <xsl:value-of select="."/>
- <xsl:if test="$legacy21">
- <xsl:value-of select="' (2.1 legacy document)'"/>
- </xsl:if>
- </title>
- </xsl:template>
-
- <!-- optional status note before the body -->
- <xsl:template match="body" mode="content">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
-
- <!-- add fixme box in the case of legacy docs -->
- <xsl:if test="$legacy21">
- <warning>
- This document was copied as is from the Cocoon 2.1 documentation, but has not
- yet been fully reviewed or moved to its new home.
- </warning>
- </xsl:if>
-
- <xsl:apply-templates mode="content"/>
- </xsl:copy>
- </xsl:template>
-
- <!-- convert <moved> to a <note> -->
- <xsl:template match="moved" mode="content">
- <note>
- <p>
- Moved to <a href="{@href}"><xsl:value-of select="@href"/></a>
- (<xsl:value-of select="@author"/>)
- </p>
- <xsl:apply-templates mode="content"/>
- </note>
- </xsl:template>
-
- <!-- copy other content elements -->
- <xsl:template match="*" mode="content">
- <xsl:copy>
- <xsl:copy-of select="@*"/>
- <xsl:apply-templates mode="content"/>
- </xsl:copy>
- </xsl:template>
-
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <xsl:variable name="content" select="/aggregate/content/document/body"/>
+ <xsl:variable name="content-header" select="/aggregate/content/document/header"/>
+ <xsl:variable name="comments" select="/aggregate/comments"/>
+ <xsl:variable name="generated-before" select="/aggregate/generated-before"/>
+ <xsl:variable name="generated-after" select="/aggregate/generated-after"/>
+ <xsl:variable name="meta" select="/aggregate/meta"/>
+
+ <!-- status indicates a 2.1 legacy document -->
+ <xsl:variable name="legacy21" select="$meta/legacy"/>
+
+ <xsl:template match="/">
+ <document>
+ <header>
+ <xsl:apply-templates select="$content-header/title" mode="header"/>
+ </header>
+ <body>
+ <xsl:copy-of select="$generated-before/html/body/*"/>
+ <xsl:apply-templates select="$content" mode="content"/>
+ <xsl:copy-of select="$generated-after/html/body/*"/>
+ <xsl:apply-templates select="$comments"/>
+ </body>
+ </document>
+ </xsl:template>
+ <xsl:template match="comments">
+ <section id="Comments">
+ <title>Comments</title>
+ <div class="commentsarea">
+ <div class="commenttaskbar">
+ add your comments
+ </div>
+ <xsl:apply-templates select="comment"/>
+ </div>
+ </section>
+ </xsl:template>
+ <xsl:template match="comment">
+ <div class="comment">
+ <div class="commentheader">
+ <xsl:value-of select="@subject"/> by <xsl:value-of select="@name"/>
+ </div>
+ <div class="commentbody">
+ <xsl:copy-of select="*"/>
+ </div>
+ </div>
+ </xsl:template>
+
+ <!-- add note to title for 2.1 legacy docs -->
+ <xsl:template match="title" mode="header">
+ <title>
+ <xsl:value-of select="."/>
+ <xsl:if test="$legacy21">
+ <xsl:value-of select="' (2.1 legacy document)'"/>
+ </xsl:if>
+ </title>
+ </xsl:template>
+
+ <!-- optional status note before the body -->
+ <xsl:template match="body" mode="content">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+
+ <!-- add fixme box in the case of legacy docs -->
+ <xsl:if test="$legacy21">
+ <warning>
+ This document was copied as is from the Cocoon 2.1 documentation, but has not
+ yet been fully reviewed or moved to its new home.
+ </warning>
+ </xsl:if>
+
+ <xsl:apply-templates mode="content"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <!-- convert <moved> to a <note> -->
+ <xsl:template match="moved" mode="content">
+ <note>
+ <p>
+ Moved to <a href="{@href}"><xsl:value-of select="@href"/></a>
+ (<xsl:value-of select="@author"/>)
+ </p>
+ <xsl:apply-templates mode="content"/>
+ </note>
+ </xsl:template>
+
+ <!-- copy other content elements -->
+ <xsl:template match="*" mode="content">
+ <xsl:copy>
+ <xsl:copy-of select="@*"/>
+ <xsl:apply-templates mode="content"/>
+ </xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
Propchange: cocoon/site/src/forrest-configuration/resources/stylesheets/doc-aggregate2v12.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/site/src/forrest-configuration/resources/stylesheets/no-comments.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml (original)
+++ cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml Sat Sep 10 18:53:51 2005
@@ -1,17 +1,17 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
<html><body/></html>
Propchange: cocoon/site/src/forrest-configuration/resources/stylesheets/no-generated-document.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/sitemap.xmap?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/sitemap.xmap (original)
+++ cocoon/site/src/forrest-configuration/sitemap.xmap Sat Sep 10 18:53:51 2005
@@ -1,94 +1,94 @@
-<?xml version="1.0"?>
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
- <map:components>
- <map:generators default="file">
- <map:generator name="local-html" src="org.apache.cocoon.generation.HTMLGenerator">
- <jtidy-config>context:/WEB-INF/jtidy.properties</jtidy-config>
- </map:generator>
- </map:generators>
- </map:components>
- <map:pipelines>
- <map:pipeline internal-only="true">
- <map:match pattern="html2document/*">
- <map:select type="exists">
- <map:when test="{project:content.xdocs}{1}/content_en.xml">
- <map:generate src="{project:content.xdocs}{1}/content_en.xml"/>
- <map:transform src="{defaults:stylesheets}/html2document.xsl"/>
- </map:when>
- <map:when test="{project:content.xdocs}{1}/content_en.xdoc">
- <!-- a 2.1 legacy document in xdoc V1.0 format -->
- <map:generate src="{project:content.xdocs}{1}/content_en.xdoc"/>
- <map:transform src="{forrest:stylesheets}/docv10todocv11.xsl"/>
- </map:when>
- <map:otherwise>
- <map:generate src="{project:content.xdocs}{1}/content_en.html" type="local-html"/>
- <map:transform src="{forrest:stylesheets}/html2document.xsl" />
- </map:otherwise>
- </map:select>
- <map:serialize/>
- </map:match>
- <map:match pattern="generated-*/*">
- <map:select type="exists">
- <map:when test="{project:content.xdocs}{2}/generated-{1}_en.xml">
- <map:generate src="{project:content.xdocs}{2}/generated-{1}_en.xml"/>
- </map:when>
- <map:otherwise>
- <map:generate src="{project:resources.stylesheets}no-generated-document.xml"/>
- </map:otherwise>
- </map:select>
- <map:serialize/>
- </map:match>
- <map:match pattern="comments/*">
- <map:select type="exists">
- <map:when test="{project:content.xdocs}{1}/comments_en.xml">
- <map:generate src="{project:content.xdocs}{1}/comments_en.xml"/>
- </map:when>
- <map:otherwise>
- <map:generate src="{project:resources.stylesheets}no-comments.xml"/>
- </map:otherwise>
- </map:select>
- <map:serialize/>
- </map:match>
- </map:pipeline>
- <!-- ******************************************************************************** -->
- <map:pipeline>
- <map:match pattern="*.xml">
- <map:select type="exists">
- <map:when test="{project:content.xdocs}{1}/meta.xml">
- <map:aggregate element="aggregate">
- <map:part src="cocoon:/generated-before/{1}" element="generated-before"/>
- <map:part src="cocoon:/html2document/{1}" element="content"/>
- <map:part src="cocoon:/generated-after/{1}" element="generated-after"/>
- <map:part src="{project:content.xdocs}{1}/meta.xml"/>
- <map:part src="cocoon:/comments/{1}"/>
- </map:aggregate>
- <map:transform src="{project:resources.stylesheets}doc-aggregate2v12.xsl"/>
- <map:transform src="{project:resources.stylesheets}correct-img-links.xsl">
- <map:parameter name="docid" value="{1}"/>
- </map:transform>
- <map:serialize type="xml-document"/>
- </map:when>
- </map:select>
- </map:match>
- <!-- ******************************************************************************** -->
- <map:match pattern="*/files/*.*">
- <map:read src="{project:content.xdocs}{1}/files/{2}.{3}" mime-type="image/{3}"/>
- </map:match>
- </map:pipeline>
- </map:pipelines>
-</map:sitemap>
+<?xml version="1.0"?>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:components>
+ <map:generators default="file">
+ <map:generator name="local-html" src="org.apache.cocoon.generation.HTMLGenerator">
+ <jtidy-config>context:/WEB-INF/jtidy.properties</jtidy-config>
+ </map:generator>
+ </map:generators>
+ </map:components>
+ <map:pipelines>
+ <map:pipeline internal-only="true">
+ <map:match pattern="html2document/*">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{1}/content_en.xml">
+ <map:generate src="{project:content.xdocs}{1}/content_en.xml"/>
+ <map:transform src="{defaults:stylesheets}/html2document.xsl"/>
+ </map:when>
+ <map:when test="{project:content.xdocs}{1}/content_en.xdoc">
+ <!-- a 2.1 legacy document in xdoc V1.0 format -->
+ <map:generate src="{project:content.xdocs}{1}/content_en.xdoc"/>
+ <map:transform src="{forrest:stylesheets}/docv10todocv11.xsl"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="{project:content.xdocs}{1}/content_en.html" type="local-html"/>
+ <map:transform src="{forrest:stylesheets}/html2document.xsl" />
+ </map:otherwise>
+ </map:select>
+ <map:serialize/>
+ </map:match>
+ <map:match pattern="generated-*/*">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{2}/generated-{1}_en.xml">
+ <map:generate src="{project:content.xdocs}{2}/generated-{1}_en.xml"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="{project:resources.stylesheets}no-generated-document.xml"/>
+ </map:otherwise>
+ </map:select>
+ <map:serialize/>
+ </map:match>
+ <map:match pattern="comments/*">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{1}/comments_en.xml">
+ <map:generate src="{project:content.xdocs}{1}/comments_en.xml"/>
+ </map:when>
+ <map:otherwise>
+ <map:generate src="{project:resources.stylesheets}no-comments.xml"/>
+ </map:otherwise>
+ </map:select>
+ <map:serialize/>
+ </map:match>
+ </map:pipeline>
+ <!-- ******************************************************************************** -->
+ <map:pipeline>
+ <map:match pattern="*.xml">
+ <map:select type="exists">
+ <map:when test="{project:content.xdocs}{1}/meta.xml">
+ <map:aggregate element="aggregate">
+ <map:part src="cocoon:/generated-before/{1}" element="generated-before"/>
+ <map:part src="cocoon:/html2document/{1}" element="content"/>
+ <map:part src="cocoon:/generated-after/{1}" element="generated-after"/>
+ <map:part src="{project:content.xdocs}{1}/meta.xml"/>
+ <map:part src="cocoon:/comments/{1}"/>
+ </map:aggregate>
+ <map:transform src="{project:resources.stylesheets}doc-aggregate2v12.xsl"/>
+ <map:transform src="{project:resources.stylesheets}correct-img-links.xsl">
+ <map:parameter name="docid" value="{1}"/>
+ </map:transform>
+ <map:serialize type="xml-document"/>
+ </map:when>
+ </map:select>
+ </map:match>
+ <!-- ******************************************************************************** -->
+ <map:match pattern="*/files/*.*">
+ <map:read src="{project:content.xdocs}{1}/files/{2}.{3}" mime-type="image/{3}"/>
+ </map:match>
+ </map:pipeline>
+ </map:pipelines>
+</map:sitemap>
Modified: cocoon/site/src/forrest-configuration/skinconf-colors.xml
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/skinconf-colors.xml?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/skinconf-colors.xml (original)
+++ cocoon/site/src/forrest-configuration/skinconf-colors.xml Sat Sep 10 18:53:51 2005
@@ -1,62 +1,62 @@
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
-
-<!--
-Skin configuration file. This file contains details of your project,
-which will be used to configure the chosen Forrest skin.
--->
-
- <colors>
- <!-- These values are used for the generated CSS files. -->
-
- <!-- Cocoon -->
-
- <color name="header" value="#294563"/>
-
- <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
-
- <color name="heading" value="#294563"/>
- <color name="subheading" value="#4a6d8c"/>
-
- <color name="published" value="#4C6C8F" font="#FFFFFF"/>
- <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
-
- <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
- <color name="toolbox" value="#4a6d8c"/>
- <color name="border" value="#294563"/>
-
- <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
-
- <color name="menuheading" value="#cfdced" font="#000000" />
- <color name="searchbox" value="#E5E4D9" font="#000000"/>
-
- <color name="dialog" value="#4a6d8c"/>
- <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
-
- <color name="table" value="#7099C5"/>
- <color name="table-cell" value="#f0f0ff"/>
- <color name="highlight" value="#ffff00"/>
- <color name="fixme" value="#cc6600"/>
- <color name="note" value="#006699"/>
- <color name="warning" value="#990000"/>
- <color name="code" value="#CFDCED"/>
-
- <color name="footer" value="#cedfef"/>
-
- </colors>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+
+<!--
+Skin configuration file. This file contains details of your project,
+which will be used to configure the chosen Forrest skin.
+-->
+
+ <colors>
+ <!-- These values are used for the generated CSS files. -->
+
+ <!-- Cocoon -->
+
+ <color name="header" value="#294563"/>
+
+ <color name="tab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="tab-unselected" value="#b5c7e7" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="subtab-selected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="subtab-unselected" value="#4a6d8c" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+
+ <color name="heading" value="#294563"/>
+ <color name="subheading" value="#4a6d8c"/>
+
+ <color name="published" value="#4C6C8F" font="#FFFFFF"/>
+ <color name="feedback" value="#4C6C8F" font="#FFFFFF" align="center"/>
+
+ <color name="navstrip" value="#4a6d8c" font="#ffffff" link="#0F3660" vlink="#0F3660" hlink="#000066"/>
+ <color name="toolbox" value="#4a6d8c"/>
+ <color name="border" value="#294563"/>
+
+ <color name="menu" value="#4a6d8c" font="#cedfef" link="#ffffff" vlink="#ffffff" hlink="#ffcf00"/>
+
+ <color name="menuheading" value="#cfdced" font="#000000" />
+ <color name="searchbox" value="#E5E4D9" font="#000000"/>
+
+ <color name="dialog" value="#4a6d8c"/>
+ <color name="body" value="#ffffff" link="#0F3660" vlink="#009999" hlink="#000066"/>
+
+ <color name="table" value="#7099C5"/>
+ <color name="table-cell" value="#f0f0ff"/>
+ <color name="highlight" value="#ffff00"/>
+ <color name="fixme" value="#cc6600"/>
+ <color name="note" value="#006699"/>
+ <color name="warning" value="#990000"/>
+ <color name="code" value="#CFDCED"/>
+
+ <color name="footer" value="#cedfef"/>
+
+ </colors>
Propchange: cocoon/site/src/forrest-configuration/skinconf-colors.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/skinconf-credits.xml
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/skinconf-credits.xml?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/skinconf-credits.xml (original)
+++ cocoon/site/src/forrest-configuration/skinconf-credits.xml Sat Sep 10 18:53:51 2005
@@ -1,46 +1,46 @@
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
-
-<!--
-Skin configuration file. This file contains details of your project,
-which will be used to configure the chosen Forrest skin.
--->
-
- <credits>
- <credit>
- <name>Built with Apache Forrest</name>
- <url>http://forrest.apache.org/</url>
- <image>skin/images/built-with-forrest-button.png</image>
- <width>88</width>
- <height>31</height>
- </credit>
- <credit>
- <name>Built with Apache Cocoon</name>
- <url>http://cocoon.apache.org/</url>
- <image>images/built-with-cocoon.gif</image>
- <width>88</width>
- <height>31</height>
- </credit>
- <credit>
- <name>thanks to ASF, thanks from ASF</name>
- <url>http://www.apache.org/foundation/thanks.html</url>
- <image>images/icon.png</image>
- <width>26</width>
- <height>22</height>
- </credit>
- <!-- A credit with @role='pdf' will have its name and url
- displayed in the PDF page's footer. -->
- </credits>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+
+<!--
+Skin configuration file. This file contains details of your project,
+which will be used to configure the chosen Forrest skin.
+-->
+
+ <credits>
+ <credit>
+ <name>Built with Apache Forrest</name>
+ <url>http://forrest.apache.org/</url>
+ <image>skin/images/built-with-forrest-button.png</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ <credit>
+ <name>Built with Apache Cocoon</name>
+ <url>http://cocoon.apache.org/</url>
+ <image>images/built-with-cocoon.gif</image>
+ <width>88</width>
+ <height>31</height>
+ </credit>
+ <credit>
+ <name>thanks to ASF, thanks from ASF</name>
+ <url>http://www.apache.org/foundation/thanks.html</url>
+ <image>images/icon.png</image>
+ <width>26</width>
+ <height>22</height>
+ </credit>
+ <!-- A credit with @role='pdf' will have its name and url
+ displayed in the PDF page's footer. -->
+ </credits>
Propchange: cocoon/site/src/forrest-configuration/skinconf-credits.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/skinconf-heading.xml
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/skinconf-heading.xml?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/skinconf-heading.xml (original)
+++ cocoon/site/src/forrest-configuration/skinconf-heading.xml Sat Sep 10 18:53:51 2005
@@ -1,18 +1,18 @@
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
-
- <!-- Heading types can be clean|underlined|boxed -->
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+
+ <!-- Heading types can be clean|underlined|boxed -->
<headings type="clean"/>
Propchange: cocoon/site/src/forrest-configuration/skinconf-heading.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: cocoon/site/src/forrest-configuration/skinconf-pdf.xml
URL: http://svn.apache.org/viewcvs/cocoon/site/src/forrest-configuration/skinconf-pdf.xml?rev=280059&r1=280058&r2=280059&view=diff
==============================================================================
--- cocoon/site/src/forrest-configuration/skinconf-pdf.xml (original)
+++ cocoon/site/src/forrest-configuration/skinconf-pdf.xml Sat Sep 10 18:53:51 2005
@@ -1,47 +1,47 @@
-<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
--->
-
- <!-- Settings specific to PDF output. -->
- <pdf>
- <!--
- Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
- folio, legal, ledger, letter, quarto, tabloid (default letter).
- Supported page orientations are portrait, landscape (default
- portrait).
- Supported text alignments are left, right, justify (default left).
- -->
- <page size="a4" orientation="portrait" text-align="left"/>
-
- <!--
- Margins can be specified for top, bottom, inner, and outer
- edges. If double-sided="false", the inner edge is always left
- and the outer is always right. If double-sided="true", the
- inner edge will be left on odd pages, right on even pages,
- the outer edge vice versa.
- Specified below are the default settings.
- -->
- <margins double-sided="false">
- <top>1cm</top>
- <bottom>1cm</bottom>
- <inner>2cm</inner>
- <outer>1.5cm</outer>
- </margins>
-
- <!--
- Print the URL text next to all links going outside the file
- -->
- <show-external-urls>false</show-external-urls>
- </pdf>
+<!--
+ Copyright 2002-2004 The Apache Software Foundation
+
+ 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.
+-->
+
+ <!-- Settings specific to PDF output. -->
+ <pdf>
+ <!--
+ Supported page sizes are a0, a1, a2, a3, a4, a5, executive,
+ folio, legal, ledger, letter, quarto, tabloid (default letter).
+ Supported page orientations are portrait, landscape (default
+ portrait).
+ Supported text alignments are left, right, justify (default left).
+ -->
+ <page size="a4" orientation="portrait" text-align="left"/>
+
+ <!--
+ Margins can be specified for top, bottom, inner, and outer
+ edges. If double-sided="false", the inner edge is always left
+ and the outer is always right. If double-sided="true", the
+ inner edge will be left on odd pages, right on even pages,
+ the outer edge vice versa.
+ Specified below are the default settings.
+ -->
+ <margins double-sided="false">
+ <top>1cm</top>
+ <bottom>1cm</bottom>
+ <inner>2cm</inner>
+ <outer>1.5cm</outer>
+ </margins>
+
+ <!--
+ Print the URL text next to all links going outside the file
+ -->
+ <show-external-urls>false</show-external-urls>
+ </pdf>
Propchange: cocoon/site/src/forrest-configuration/skinconf-pdf.xml
------------------------------------------------------------------------------
svn:eol-style = native