You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/12/05 00:30:18 UTC
svn commit: r109830 - /lenya/trunk/src/confpatch/serializers.xmap /lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap /lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl
Author: gregor
Date: Sat Dec 4 15:30:17 2004
New Revision: 109830
URL: http://svn.apache.org/viewcvs?view=rev&rev=109830
Log:
Switch to HTML / XHTML / XML serializers from the serializers block. This improves compliance with UTF-8 and fixes various serialization bugs.
Modified:
lenya/trunk/src/confpatch/serializers.xmap
lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl
Modified: lenya/trunk/src/confpatch/serializers.xmap
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/confpatch/serializers.xmap?view=diff&rev=109830&p1=lenya/trunk/src/confpatch/serializers.xmap&r1=109829&p2=lenya/trunk/src/confpatch/serializers.xmap&r2=109830
==============================================================================
--- lenya/trunk/src/confpatch/serializers.xmap (original)
+++ lenya/trunk/src/confpatch/serializers.xmap Sat Dec 4 15:30:17 2004
@@ -18,30 +18,15 @@
<xmap remove="/sitemap/components/serializers" xpath="/sitemap/components" insert-after="/sitemap/components/transformers">
<map:serializers default="html">
- <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.serialization.HTMLSerializer">
- <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
- <buffer-size>1024</buffer-size>
+ <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html" pool-grow="4" pool-max="32"
+ pool-min="4" src="org.apache.cocoon.components.serializers.HTMLSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
-<!-- This serializer (Cocoon-2.1.5) has an issue with namespaces -->
-<!--
- <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.components.serializers.HTMLSerializer">
- <encoding>UTF-8</encoding>
- </map:serializer>
--->
<map:serializer name="html-no-dtd" logger="sitemap.serializer.html-no-dtd" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.serialization.HTMLSerializer">
<buffer-size>1024</buffer-size>
</map:serializer>
- <map:serializer name="html-iso-8859-1" logger="sitemap.serializer.html-iso-8859-1" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.serialization.HTMLSerializer">
- <buffer-size>1024</buffer-size>
- <doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
- <encoding>ISO-8859-1</encoding>
- </map:serializer>
-
<map:serializer name="htmlnoi" logger="sitemap.serializer.htmlnoi" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.serialization.HTMLSerializer">
<indent>no</indent>
<doctype-public>-//W3C//DTD HTML 4.01 Transitional//EN</doctype-public>
@@ -49,37 +34,14 @@
<encoding>UTF-8</encoding>
</map:serializer>
- <map:serializer name="xhtml" logger="sitemap.serializer.xhtml" mime-type="text/html" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
- <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
- <encoding>UTF-8</encoding>
- </map:serializer>
-<!-- This serializer (Cocoon-2.1.5) has an issue with namespaces -->
-<!--
- <map:serializer name="xhtml" logger="sitemap.serializer.xhtml" mime-type="text/html" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.components.serializers.XHTMLSerializer">
- <encoding>UTF-8</encoding>
- </map:serializer>
--->
-
- <map:serializer name="xhtml-iso-8859-1" logger="sitemap.serializer.xhtml-iso-8859-1" mime-type="text/html" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
- <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
- <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
- <encoding>ISO-8859-1</encoding>
- </map:serializer>
-
- <map:serializer name="xml" logger="sitemap.serializer.xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer"/>
-
- <!-- Why can't we use UTF-8 in the above serializer ?? -->
- <map:serializer name="xml-utf-8" logger="sitemap.serializer.xml-utf-8" mime-type="text/xml" pool-grow="2" pool-max="64" pool-min="2" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="xhtml" logger="sitemap.serializer.xhtml" mime-type="text/html" pool-grow="2" pool-max="64" pool-min="2"
+ src="org.apache.cocoon.components.serializers.XHTMLSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
-<!-- This serializer (Cocoon-2.1.5) has an issue with namespaces -->
-<!--
<map:serializer name="xml" logger="sitemap.serializer.xml" mime-type="text/xml" src="org.apache.cocoon.components.serializers.XMLSerializer">
- <encoding>UTF-8</encoding>
+ <encoding>UTF-8</encoding>
</map:serializer>
--->
<map:serializer name="links" logger="sitemap.serializer.links" src="org.apache.cocoon.serialization.LinkSerializer"/>
@@ -98,11 +60,7 @@
<map:serializer name="text" logger="sitemap.serializer.text" mime-type="text/plain" src="org.apache.cocoon.serialization.TextSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
-
- <map:serializer name="text-iso-8859-1" logger="sitemap.serializer.text-iso-8859-1" mime-type="text/plain" src="org.apache.cocoon.serialization.TextSerializer">
- <encoding>ISO-8859-1</encoding>
- </map:serializer>
-
+
<map:serializer name="fo2pdf" logger="sitemap.serializer.fo2pdf" mime-type="application/pdf" src="org.apache.cocoon.serialization.FOPSerializer"/>
<map:serializer name="fo2ps" logger="sitemap.serializer.fo2ps" mime-type="application/postscript" src="org.apache.cocoon.serialization.FOPSerializer"/>
<map:serializer name="fo2pcl" logger="sitemap.serializer.fo2pcl" mime-type="vnd.hp-PCL" src="org.apache.cocoon.serialization.FOPSerializer"/>
Modified: lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap?view=diff&rev=109830&p1=lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap&r1=109829&p2=lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap&r2=109830
==============================================================================
--- lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap (original)
+++ lenya/trunk/src/webapp/lenya/pubs/default/usecase-bxe.xmap Sat Dec 4 15:30:17 2004
@@ -85,7 +85,7 @@
<map:transform src="../../xslt/bxe/change-object-path-back.xsl">
<map:parameter name="documentid" value="{page-envelope:document-id}"/>
</map:transform>
- <map:serialize type="xml-utf-8"/>
+ <map:serialize type="xml"/>
</map:match>
<map:match type="usecase" pattern="bxe">
@@ -116,7 +116,7 @@
</map:act>
<map:generate src="../../resources/misc/bxe/download.xhtml"/>
<map:call resource="style-cms-page"/>
- <map:serialize type="html"/>
+ <map:serialize type="xhtml"/>
</map:match>
<map:match pattern="image-upload-show" type="step">
Modified: lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl?view=diff&rev=109830&p1=lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl&r1=109829&p2=lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl&r2=109830
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/bxe/aggregate.xsl Sat Dec 4 15:30:17 2004
@@ -19,7 +19,7 @@
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xmlns="http://www.w3.org/1999/xhtml"
>
<xsl:template match="/">
@@ -27,14 +27,14 @@
</xsl:template>
<xsl:template match="bxe">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<xsl:apply-templates select="xhtml:html/xhtml:head"/>
-<xsl:copy-of select="xhtml:html/xhtml:body"/>
+<html>
+<xsl:apply-templates select="html/head"/>
+<xsl:copy-of select="html/body"/>
</html>
</xsl:template>
-<xsl:template match="xhtml:head">
-<head xmlns="http://www.w3.org/1999/xhtml">
+<xsl:template match="head">
+<head>
<xsl:for-each select="/bxe/namespaces/xmlns">
<meta name="bxeNS" content="{.}"/>
</xsl:for-each>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org