You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2008/04/09 15:35:54 UTC
svn commit: r646338 - in
/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src:
changes/changes.xml
main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
Author: vgritsenko
Date: Wed Apr 9 06:35:52 2008
New Revision: 646338
URL: http://svn.apache.org/viewvc?rev=646338&view=rev
Log:
See http://markmail.org/message/4viaizy77vnrxbko#query:+mid:4viaizy77vnrxbko
<action dev="vgritsenko" type="update">
Set default encoding for all text based serializers (such as XML,
XHTML, text, etc) to UTF-8.
</action>
Modified:
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml
cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml?rev=646338&r1=646337&r2=646338&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/changes/changes.xml Wed Apr 9 06:35:52 2008
@@ -25,6 +25,13 @@
-->
<document>
<body>
+ <release version="1.0.1" date="TBA" description="unreleased">
+ <action dev="vgritsenko" type="update">
+ Set default encoding for all text based serializers (such as XML,
+ XHTML, text, etc) to UTF-8.
+ </action>
+ </release>
+
<release version="1.0.0" date="2008-03-25" description="released">
<action dev="thorsten" type="fix">
The paginator when used with spring has thrown errors since the service()
Modified: cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml?rev=646338&r1=646337&r2=646338&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml (original)
+++ cocoon/trunk/core/cocoon-pipeline/cocoon-pipeline-components/src/main/resources/META-INF/cocoon/spring/cocoon-core-serializers.xml Wed Apr 9 06:35:52 2008
@@ -29,7 +29,10 @@
http://cocoon.apache.org/schema/pipeline http://cocoon.apache.org/schema/pipeline/cocoon-pipeline-1.0.xsd"
default-init-method="init">
- <!-- Abstract parent bean that sets the default encoding from the settings bean -->
+ <!--
+ - Abstract parent bean that sets the default encoding from the settings bean
+ - FIXME Why it is necessary at all, anyway?
+ -->
<bean name="org.apache.cocoon.serialization.AbstractTextSerializer" class="org.apache.cocoon.serialization.AbstractTextSerializer"
scope="prototype" abstract="true">
<property name="defaultEncoding">
@@ -40,107 +43,141 @@
</property>
</bean>
+ <!--
+ - XML Serializer
+ -->
<bean name="org.apache.cocoon.serialization.Serializer/xml" class="org.apache.cocoon.serialization.XMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/xml"/>
+ <pipeline:component mime-type="text/xml;charset=utf-8"/>
+ <property name="format">
+ <props>
+ <prop key="encoding">UTF-8</prop>
+ </props>
+ </property>
</bean>
+ <!--
+ - HTML 4.01 Transitional Serializer
+ -->
<bean name="org.apache.cocoon.serialization.Serializer/html" class="org.apache.cocoon.serialization.HTMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/html"/>
+ <pipeline:component mime-type="text/html;charset=utf-8"/>
<property name="format">
<props>
<prop key="doctype-public">-//W3C//DTD HTML 4.01 Transitional//EN</prop>
<prop key="doctype-system">http://www.w3.org/TR/html4/loose.dtd</prop>
+ <prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <bean name="org.apache.cocoon.serialization.Serializer/wml" class="org.apache.cocoon.serialization.XMLSerializer"
+ <!--
+ - XHTML 1.0 Serializer. You can choose from Strict, Transitional, or Frameset XHTML.
+ -
+ - For Strict XHTML set doctype to:
+ - <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>
+ -
+ - For Transitional XHTML set doctype to:
+ - <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
+ - <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
+ -
+ - For Frameset XHTML set doctype to:
+ - <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
+ - <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
+ -
+ - Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
+ - XHTML DTD simultaneously, you can define several XHTML serializers.
+ -->
+ <bean name="org.apache.cocoon.serialization.Serializer/xhtml" class="org.apache.cocoon.serialization.XMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/vnd.wap.wml"/>
+ <pipeline:component mime-type="text/html;charset=utf-8"/>
<property name="format">
<props>
- <prop key="doctype-public">-//WAPFORUM//DTD WML 1.1//EN</prop>
- <prop key="doctype-system">http://www.wapforum.org/DTD/wml_1.1.xml</prop>
- <prop key="encoding">ASCII</prop>
- <prop key="omit-xml-declaration">yes</prop>
+ <prop key="doctype-public">-//W3C//DTD XHTML 1.0 Strict//EN</prop>
+ <prop key="doctype-system">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</prop>
+ <prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <!--+
- | Compact HTML for Small Information Appliances,
- | based on http://www.w3.org/TR/1998/NOTE-compactHTML-19980209/
- +-->
- <bean name="org.apache.cocoon.serialization.Serializer/chtml" class="org.apache.cocoon.serialization.HTMLSerializer"
+ <!--
+ - XHTML 1.1 Serializer
+ -->
+ <bean name="org.apache.cocoon.serialization.Serializer/xhtml11" class="org.apache.cocoon.serialization.XMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/html"/>
+ <pipeline:component mime-type="application/xhtml+xml;charset=utf-8"/>
<property name="format">
<props>
- <prop key="doctype-public">-//W3C//DTD Compact HTML 1.0 Draft//EN</prop>
+ <prop key="doctype-public">-//W3C//DTD XHTML 1.1//EN</prop>
+ <prop key="doctype-system">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</prop>
+ <prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <bean name="org.apache.cocoon.serialization.Serializer/svgxml" class="org.apache.cocoon.serialization.XMLSerializer"
+ <!--
+ - Plain Text Serializer
+ -->
+ <bean name="org.apache.cocoon.serialization.Serializer/text" class="org.apache.cocoon.serialization.TextSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="image/svg+xml"/>
+ <pipeline:component mime-type="text/plain;charset=utf-8"/>
<property name="format">
<props>
- <prop key="doctype-public">-//W3C//DTD SVG 1.0//EN</prop>
- <prop key="doctype-system">http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</prop>
+ <prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <!--+
- | You can choose from Strict, Transitional, or Frameset XHTML.
- | For Strict XHTML set doctype to:
- | <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>
- | For Transitional XHTML set doctype to:
- | <doctype-public>-//W3C//DTD XHTML 1.0 Transitional//EN</doctype-public>
- | <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</doctype-system>
- | For Frameset XHTML set doctype to:
- | <doctype-public>-//W3C//DTD XHTML 1.0 Frameset//EN</doctype-public>
- | <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</doctype-system>
- |
- | Default XHTML doctype in Cocoon is XHTML Strict. If you want to use more than one
- | XHTML DTD simultaneously, you can define several XHTML serializers.
- +-->
- <bean name="org.apache.cocoon.serialization.Serializer/xhtml" class="org.apache.cocoon.serialization.XMLSerializer"
+
+ <bean name="org.apache.cocoon.serialization.Serializer/svgxml" class="org.apache.cocoon.serialization.XMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/html"/>
+ <pipeline:component mime-type="image/svg+xml;charset=utf-8"/>
<property name="format">
<props>
- <prop key="doctype-public">-//W3C//DTD XHTML 1.0 Strict//EN</prop>
- <prop key="doctype-system">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</prop>
+ <prop key="doctype-public">-//W3C//DTD SVG 1.0//EN</prop>
+ <prop key="doctype-system">http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd</prop>
<prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <bean name="org.apache.cocoon.serialization.Serializer/xhtml11" class="org.apache.cocoon.serialization.XMLSerializer"
+ <!--
+ - Compact HTML for Small Information Appliances,
+ - based on http://www.w3.org/TR/1998/NOTE-compactHTML-19980209/
+ -->
+ <bean name="org.apache.cocoon.serialization.Serializer/chtml" class="org.apache.cocoon.serialization.HTMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="application/xhtml+xml"/>
+ <pipeline:component mime-type="text/html;charset=utf-8"/>
<property name="format">
<props>
- <prop key="doctype-public">-//W3C//DTD XHTML 1.1//EN</prop>
- <prop key="doctype-system">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</prop>
+ <prop key="doctype-public">-//W3C//DTD Compact HTML 1.0 Draft//EN</prop>
<prop key="encoding">UTF-8</prop>
</props>
</property>
</bean>
- <bean name="org.apache.cocoon.serialization.Serializer/text" class="org.apache.cocoon.serialization.TextSerializer"
+ <bean name="org.apache.cocoon.serialization.Serializer/wml" class="org.apache.cocoon.serialization.XMLSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="text/plain"/>
+ <pipeline:component mime-type="text/vnd.wap.wml;charset=utf-8"/>
+ <property name="format">
+ <props>
+ <prop key="doctype-public">-//WAPFORUM//DTD WML 1.1//EN</prop>
+ <prop key="doctype-system">http://www.wapforum.org/DTD/wml_1.1.xml</prop>
+ <prop key="encoding">UTF-8</prop>
+ <prop key="omit-xml-declaration">yes</prop>
+ </props>
+ </property>
</bean>
<bean name="org.apache.cocoon.serialization.Serializer/vrml" class="org.apache.cocoon.serialization.TextSerializer"
scope="prototype" parent="org.apache.cocoon.serialization.AbstractTextSerializer">
- <pipeline:component mime-type="model/vrml"/>
+ <pipeline:component mime-type="model/vrml;charset=utf-8"/>
+ <property name="format">
+ <props>
+ <prop key="encoding">UTF-8</prop>
+ </props>
+ </property>
</bean>
</beans>