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 2005/06/13 23:38:52 UTC
svn commit: r190513 - in /lenya/branches/BRANCH_1_2_X/src/webapp:
lenya/pubs/default/publication-sitemap.xmap lenya/xopus.xmap sitemap.xmap
Author: gregor
Date: Mon Jun 13 14:38:51 2005
New Revision: 190513
URL: http://svn.apache.org/viewcvs?rev=190513&view=rev
Log:
Explicitly set utf-8 as the charset. This should hopefully resolve the remaining UTF-8 problems.
Modified:
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/publication-sitemap.xmap
lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xopus.xmap
lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/publication-sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/publication-sitemap.xmap?rev=190513&r1=190512&r2=190513&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/publication-sitemap.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/pubs/default/publication-sitemap.xmap Mon Jun 13 14:38:51 2005
@@ -161,7 +161,7 @@
<map:act type="language-exists">
<map:select type="resource-exists">
<map:when test="{global:cache-dir}/{../1}.html">
- <map:read src="{global:cache-dir}/{../1}.html" mime-type="text/html"/>
+ <map:read src="{global:cache-dir}/{../1}.html" mime-type="text/html; charset=utf-8"/>
</map:when>
<map:otherwise>
<map:generate src="cocoon:/lenyabody-view/{page-envelope:publication-id}/{page-envelope:area}/{page-envelope:document-type}{page-envelope:document-url}"/>
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xopus.xmap
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xopus.xmap?rev=190513&r1=190512&r2=190513&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xopus.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/xopus.xmap Mon Jun 13 14:38:51 2005
@@ -68,7 +68,7 @@
<map:pipeline>
<map:match pattern="**.html">
- <map:read src="{global:xopus-resources}{1}.html" mime-type="text/html"/>
+ <map:read src="{global:xopus-resources}{1}.html" mime-type="text/html; charset=utf-8"/>
</map:match>
<map:handle-errors>
<map:select type="exception">
Modified: lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap?rev=190513&r1=190512&r2=190513&view=diff
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/sitemap.xmap Mon Jun 13 14:38:51 2005
@@ -135,7 +135,7 @@
<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">
+ <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html; charset=utf-8" 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>
@@ -143,60 +143,60 @@
</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">
+ <map:serializer name="html" logger="sitemap.serializer.html" mime-type="text/html; charset=utf-8" 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">
+ <map:serializer name="html-no-dtd" logger="sitemap.serializer.html-no-dtd" mime-type="text/html; charset=utf-8" 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="htmlnoi" logger="sitemap.serializer.htmlnoi" mime-type="text/html" pool-grow="4" pool-max="32" pool-min="4" src="org.apache.cocoon.serialization.HTMLSerializer">
+ <map:serializer name="htmlnoi" logger="sitemap.serializer.htmlnoi" mime-type="text/html; charset=utf-8" 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>
<doctype-system>http://www.w3.org/TR/html4/loose.dtd</doctype-system>
<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">
+ <map:serializer name="xhtml" logger="sitemap.serializer.xhtml" mime-type="text/html; charset=utf-8" 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">
+ <map:serializer name="xhtml" logger="sitemap.serializer.xhtml" mime-type="text/html; charset=utf-8" 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="xml" logger="sitemap.serializer.xml" mime-type="text/xml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="xml" logger="sitemap.serializer.xml" mime-type="application/xml; charset=utf-8" src="org.apache.cocoon.serialization.XMLSerializer">
<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">
+ <map:serializer name="xml" logger="sitemap.serializer.xml" mime-type="application/xml; charset=utf-8" src="org.apache.cocoon.components.serializers.XMLSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
-->
<map:serializer name="links" logger="sitemap.serializer.links" src="org.apache.cocoon.serialization.LinkSerializer"/>
- <map:serializer name="wml" logger="sitemap.serializer.wml" mime-type="text/vnd.wap.wml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="wml" logger="sitemap.serializer.wml" mime-type="text/vnd.wap.wml; charset=utf-8" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//WAPFORUM//DTD WML 1.1//EN</doctype-public>
<doctype-system>http://www.wapforum.org/DTD/wml_1.1.xml</doctype-system>
<encoding>ASCII</encoding>
<omit-xml-declaration>yes</omit-xml-declaration>
</map:serializer>
- <map:serializer name="svgxml" logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="svgxml" logger="sitemap.serializer.svgxml" mime-type="image/svg-xml; charset=utf-8" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
</map:serializer>
- <map:serializer name="text" logger="sitemap.serializer.text" mime-type="text/plain" src="org.apache.cocoon.serialization.TextSerializer">
+ <map:serializer name="text" logger="sitemap.serializer.text" mime-type="text/plain; charset=utf-8" src="org.apache.cocoon.serialization.TextSerializer">
<encoding>UTF-8</encoding>
</map:serializer>
@@ -207,7 +207,7 @@
<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"/>
- <map:serializer name="svgxml" logger="sitemap.serializer.svgxml" mime-type="image/svg-xml" src="org.apache.cocoon.serialization.XMLSerializer">
+ <map:serializer name="svgxml" logger="sitemap.serializer.svgxml" mime-type="image/svg-xml; charset=utf-8" src="org.apache.cocoon.serialization.XMLSerializer">
<doctype-public>-//W3C//DTD SVG 20000303 Stylable//EN</doctype-public>
<doctype-system>http://www.w3.org/TR/2000/03/WD-SVG-20000303/</doctype-system>
</map:serializer>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org