You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2008/04/04 14:01:27 UTC

svn commit: r644687 - in /cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src: changes/changes.xml main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java

Author: joerg
Date: Fri Apr  4 05:01:03 2008
New Revision: 644687

URL: http://svn.apache.org/viewvc?rev=644687&view=rev
Log:
COCOON-2063: revert for the time being since Charset.defaultCharset() is only Java 5. Any replacement?

Modified:
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml
    cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml?rev=644687&r1=644686&r2=644687&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/changes/changes.xml Fri Apr  4 05:01:03 2008
@@ -25,9 +25,7 @@
 <document>
   <body>
     <release version="1.0.0-RC1" date="2007-??-??" description="unreleased">  
-      <action dev="joerg" type="fix" fixes-bug="COCOON-2063" due-to="Alexander Klimetschek" due-to-email="alexander.klimetschek@googlemail.com">
-        Set system's default encoding on NekoHTMLGenerator and NekoHTMLTransformer configuration to make them work with UTF-8.
-      </action>
+      
     </release>     
     <release version="1.0.0-M1" date="2007-03-02" description="released">    
       <action dev="crossley" type="add" fixes-bug="COCOON-1206" due-to="Miles Elam" due-to-email="miles@geekspeak.org">

Modified: cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java?rev=644687&r1=644686&r2=644687&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java (original)
+++ cocoon/trunk/blocks/cocoon-html/cocoon-html-impl/src/main/java/org/apache/cocoon/components/NekoHtmlSaxParser.java Fri Apr  4 05:01:03 2008
@@ -16,7 +16,6 @@
  */
 package org.apache.cocoon.components;
 
-import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.Properties;
 
@@ -35,7 +34,6 @@
     private static HTMLConfiguration getConfig(Properties properties) {
         HTMLConfiguration config = new HTMLConfiguration();
         config.setProperty("http://cyberneko.org/html/properties/names/elems", "lower");
-        config.setProperty("http://cyberneko.org/html/properties/default-encoding", Charset.defaultCharset().name());
         if (properties != null) {
             for (Iterator i = properties.keySet().iterator(); i.hasNext();) {
                 String name = (String) i.next();