You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2008/04/20 23:11:18 UTC
svn commit: r649979 - in /cocoon/whiteboard/corona/trunk:
corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java
corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
Author: reinhard
Date: Sun Apr 20 14:11:17 2008
New Revision: 649979
URL: http://svn.apache.org/viewvc?rev=649979&view=rev
Log:
COCOON-2199 Streamline XMLSerializer configuration (patch by Steven Dolg)
Modified:
cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java
cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
Modified: cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java?rev=649979&r1=649978&r2=649979&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java (original)
+++ cocoon/whiteboard/corona/trunk/corona-core/src/main/java/org/apache/cocoon/corona/pipeline/component/XMLSerializer.java Sun Apr 20 14:11:17 2008
@@ -22,7 +22,6 @@
import java.util.Map;
import java.util.Properties;
-import javax.xml.transform.OutputKeys;
import javax.xml.transform.TransformerConfigurationException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
@@ -116,7 +115,6 @@
public void setOutputStream(OutputStream outputStream) {
try {
this.transformerHandler = SAX_TRANSFORMER_FACTORY.newTransformerHandler();
- this.format.put(OutputKeys.METHOD, "xml");
this.transformerHandler.getTransformer().setOutputProperties(this.format);
this.transformerHandler.setResult(new StreamResult(outputStream));
} catch (TransformerConfigurationException e) {
Modified: cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml
URL: http://svn.apache.org/viewvc/cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml?rev=649979&r1=649978&r2=649979&view=diff
==============================================================================
--- cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml (original)
+++ cocoon/whiteboard/corona/trunk/corona-sitemap/src/main/resources/META-INF/cocoon/spring/corona-pipeline-component.xml Sun Apr 20 14:11:17 2008
@@ -26,12 +26,13 @@
</bean>
<bean name="serializer:xhtml" class="org.apache.cocoon.corona.pipeline.component.XMLSerializer" scope="prototype">
- <property name="contentType" value="text/html" />
+ <property name="contentType" value="text/html;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="encoding">UTF-8</prop>
+ <prop key="method">xml</prop>
</props>
</property>
</bean>