cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/source SourceUtil.java
Date Mon, 01 Mar 2004 18:45:02 GMT
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);
   
  
  
  

Mime
View raw message