Author: ferdinand
Date: Fri Feb 15 14:05:10 2008
New Revision: 628187
URL: http://svn.apache.org/viewvc?rev=628187&view=rev
Log:
Reverted fop merge because site-author broke because of missing usemap.gif
Added:
forrest/trunk/lib/core/commons-logging-1.0.4.jar
- copied unchanged from r628174,
forrest/trunk/lib/core/commons-logging-1.0.4.jar
forrest/trunk/lib/core/commons-logging-1.0.4.jar.license.txt
- copied unchanged from r628174,
forrest/trunk/lib/core/commons-logging-1.0.4.jar.license.txt
forrest/trunk/lib/core/fop-0.20.5.jar
- copied unchanged from r628174, forrest/trunk/lib/core/fop-0.20.5.jar
forrest/trunk/lib/core/fop-0.20.5.jar.license.txt
- copied unchanged from r628174,
forrest/trunk/lib/core/fop-0.20.5.jar.license.txt
Removed:
forrest/trunk/lib/core/commons-io-1.3.1.jar
forrest/trunk/lib/core/commons-io.LICENSE.txt
forrest/trunk/lib/core/commons-io.NOTICE.txt
forrest/trunk/lib/core/commons-logging-1.1.1.jar
forrest/trunk/lib/core/commons-logging.LICENSE.txt
forrest/trunk/lib/core/commons-logging.NOTICE.txt
forrest/trunk/lib/core/xmlgraphics-commons-1.2.jar
forrest/trunk/lib/core/xmlgraphics-commons.LICENSE.txt
forrest/trunk/lib/core/xmlgraphics-commons.NOTICE.txt
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/lib/
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/footerinfo.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/pdfoutline.xsl
forrest/trunk/site-author/resources/images/rss.png
Modified:
forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
forrest/trunk/main/webapp/sitemap.xmap
forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
forrest/trunk/main/webapp/skins/common/xslt/fo/footerinfo.xsl
forrest/trunk/main/webapp/skins/common/xslt/fo/pdfoutline.xsl
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/build.xml
forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
forrest/trunk/site-author/content/xdocs/committed.xml
forrest/trunk/site-author/content/xdocs/mail-lists.xml
Modified:
forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl?rev=628187&r1=628186&r2=628187&view=diff
==============================================================================
--- forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl
(original)
+++ forrest/trunk/main/webapp/resources/stylesheets/linkmap-to-document.xsl Fri
Feb 15 14:05:10 2008
@@ -15,18 +15,14 @@
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";>
- <xsl:output
- method="xml"
- version="1.0"
- omit-xml-declaration="no"
- indent="yes"
- doctype-public="-//APACHE//DTD Documentation V1.2//EN"
- doctype-system="http://forrest.apache.org/dtd/document-v12.dtd"; />
- <xsl:template
- match="/">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+ <xsl:output method="xml"
+ version="1.0"
+ omit-xml-declaration="no"
+ indent="yes"
+ doctype-public="-//APACHE//DTD Documentation V1.2//EN"
+ doctype-system="http://forrest.apache.org/dtd/document-v12.dtd";
/>
+ <xsl:template match="/">
<document>
<header>
<title>Site Linkmap Table of Contents</title>
@@ -38,41 +34,30 @@
<!-- FIXME: FOR-731 workaround for a side-effect of the workaround for FOR-675
<xsl:apply-templates select="*[not(self::site)]" />
-->
- <xsl:apply-templates
- select="*" />
+ <xsl:apply-templates select="*" />
</body>
</document>
</xsl:template>
- <xsl:template
- match="*">
- <xsl:if
- test="@label">
+ <xsl:template match="*">
+ <xsl:if test="@label">
<ul>
<li><a>
- <xsl:if
- test="@href!=''">
- <xsl:attribute
- name="href">
- <xsl:value-of
- select="@href" />
+ <xsl:if test="@href!=''">
+ <xsl:attribute name="href">
+ <xsl:value-of select="@href"/>
</xsl:attribute>
</xsl:if>
- <xsl:value-of
- select="@label" />
+ <xsl:value-of select="@label"/>
<!-- force site element name to be on same line as label
--></a>  ___________________  <em>
- <xsl:value-of
- select="name(.)" /></em>
- <xsl:if
- test="@description">
+ <xsl:value-of select="name(.)" /></em>
+ <xsl:if test="@description">
<!-- allow description to flow to next line in a small window -->
<xsl:text> : </xsl:text>
- <xsl:value-of
- select="normalize-space(@description)" />
+ <xsl:value-of select="normalize-space(@description)"/>
</xsl:if></li>
- <xsl:if
- test="[EMAIL PROTECTED]'']">
+ <xsl:if test="*">
<ul>
- <xsl:apply-templates />
+ <xsl:apply-templates/>
</ul>
</xsl:if>
</ul>
Modified: forrest/trunk/main/webapp/sitemap.xmap
URL:
http://svn.apache.org/viewvc/forrest/trunk/main/webapp/sitemap.xmap?rev=628187&r1=628186&r2=628187&view=diff
==============================================================================
--- forrest/trunk/main/webapp/sitemap.xmap (original)
+++ forrest/trunk/main/webapp/sitemap.xmap Fri Feb 15 14:05:10 2008
@@ -557,7 +557,28 @@
<map:match pattern="**faq.fo">
<map:mount uri-prefix="" src="faq.xmap" check-reload="yes" />
</map:match>
-
+<!-- generate .fo from .xml -->
+ <map:match type="regexp" pattern="^(.*?)([^/]*).fo$">
+ <map:select type="exists">
+ <map:when test="{lm:project.{1}{2}.fo}">
+ <map:generate src="{lm:project.{1}{2}.fo}"/>
+ </map:when>
+ <map:otherwise>
+ <map:aggregate element="site">
+ <map:part src="cocoon:/skinconf.xml"/>
+ <map:part src="cocoon:/{1}{2}.xml"/>
+ </map:aggregate>
+<!-- <map:transform type="idgen"/> -->
+ <map:transform type="xinclude"/>
+ <map:transform type="linkrewriter"
src="cocoon://{1}linkmap-{2}.fo"/>
+ <map:transform src="{lm:transform.document.fo}">
+ <map:parameter name="imagesdir"
value="{properties:resources.images}/"/>
+ <map:parameter name="xmlbasedir"
value="{properties:content.xdocs}{1}"/>
+ </map:transform>
+ </map:otherwise>
+ </map:select>
+ <map:serialize type="xml"/>
+ </map:match>
<!-- handle PHP -->
<map:match type="regexp" pattern="^(.*?)([^/]*).php$">
<map:generate src="cocoon://{1}{2}.html"/>
