You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/03/01 19:49:14 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source SourceUtil.java
cziegeler 2004/03/01 10:49:14
Modified: src/java/org/apache/cocoon/components/source SourceUtil.java
Log:
Add handling of encoding (part of bug 26924)
Revision Changes Path
1.12 +8 -1 cocoon-2.2/src/java/org/apache/cocoon/components/source/SourceUtil.java
Index: SourceUtil.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/source/SourceUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SourceUtil.java 10 Jan 2004 14:38:19 -0000 1.11
+++ SourceUtil.java 1 Mar 2004 18:49:14 -0000 1.12
@@ -407,6 +407,13 @@
Map resolverParameters = new java.util.HashMap();
resolverParameters.put(SourceResolver.METHOD, method);
+ if (typeParameters != null) {
+ String encoding = typeParameters.getParameter("encoding",
+ System.getProperties().getProperty("file.encoding", "ISO-8859-1"));
+ if ( encoding != null && !"".equals(encoding) ) {
+ resolverParameters.put(SourceResolver.URI_ENCODING, encoding);
+ }
+ }
resolverParameters.put(SourceResolver.URI_PARAMETERS,
resourceParameters);