Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 15626 invoked from network); 1 Mar 2004 18:45:05 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 1 Mar 2004 18:45:05 -0000 Received: (qmail 71833 invoked by uid 500); 1 Mar 2004 18:44:56 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 71684 invoked by uid 500); 1 Mar 2004 18:44:55 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 71673 invoked by uid 500); 1 Mar 2004 18:44:55 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 71668 invoked from network); 1 Mar 2004 18:44:54 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 1 Mar 2004 18:44:54 -0000 Received: (qmail 15582 invoked by uid 1260); 1 Mar 2004 18:45:02 -0000 Date: 1 Mar 2004 18:45:02 -0000 Message-ID: <20040301184502.15579.qmail@minotaur.apache.org> From: cziegeler@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/source SourceUtil.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N cziegeler 2004/03/01 10:45:02 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.1/src/java/org/apache/cocoon/components/source/SourceUtil.java Index: SourceUtil.java =================================================================== RCS file: /home/cvs/cocoon-2.1/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 18 Dec 2003 21:09:47 -0000 1.11 +++ SourceUtil.java 1 Mar 2004 18:45:02 -0000 1.12 @@ -494,6 +494,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);