cvs commit: cocoon-2.2/src/java/org/apache/cocoon/components/source SourceUtil.java

[cziegeler]

cziegeler    2004/03/17 04:33:34

  Modified:    src/java/org/apache/cocoon/components/cprocessor
                        TreeProcessor.java
               src/java/org/apache/cocoon/transformation
                        AbstractSAXTransformer.java
               src/java/org/apache/cocoon/components/source SourceUtil.java
  Log:
  Don't use hard-coded encoding for serializing dom to string (addresses bug 
26924)
  
  Revision  Changes    Path
  1.24      +1 -1      
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java
  
  Index: TreeProcessor.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/TreeProcessor.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- TreeProcessor.java        12 Mar 2004 14:59:27 -0000      1.23
  +++ TreeProcessor.java        17 Mar 2004 12:33:34 -0000      1.24
  @@ -362,7 +362,7 @@
               parser.parse(SourceUtil.getInputSource(source), pipe);
               if ( domBuilder != null ) {
                   this.getLogger().debug("Configuration from sitemap: " + 
this.m_source.getURI());
  -                
this.getLogger().debug(XMLUtils.serializeNodeToXML(domBuilder.getDocument()));
  +                
this.getLogger().debug(XMLUtils.serializeNode(domBuilder.getDocument(), 
XMLUtils.createPropertiesForXML(false)));
               }
               Configuration config = configHandler.getConfiguration();
               
  
  
  
  1.12      +3 -1      
cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java
  
  Index: AbstractSAXTransformer.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/transformation/AbstractSAXTransformer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractSAXTransformer.java       17 Mar 2004 12:26:59 -0000      1.11
  +++ AbstractSAXTransformer.java       17 Mar 2004 12:33:34 -0000      1.12
  @@ -31,10 +31,12 @@
   import org.apache.cocoon.transformation.helpers.ParametersRecorder;
   import org.apache.cocoon.transformation.helpers.TextRecorder;
   import org.apache.cocoon.xml.IncludeXMLConsumer;
  +import org.apache.cocoon.xml.SaxBuffer;
   import org.apache.cocoon.xml.XMLConsumer;
   import org.apache.cocoon.xml.XMLUtils;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.excalibur.source.SourceParameters;
  +import org.apache.excalibur.xml.sax.XMLizable;
   import org.w3c.dom.Document;
   import org.w3c.dom.DocumentFragment;
   import org.w3c.dom.Node;
  
  
  
  1.15      +4 -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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- SourceUtil.java   17 Mar 2004 12:26:59 -0000      1.14
  +++ SourceUtil.java   17 Mar 2004 12:33:34 -0000      1.15
  @@ -20,6 +20,9 @@
   import java.io.OutputStream;
   import java.util.Iterator;
   import java.util.Map;
  +import java.util.Properties;
  +
  +import javax.xml.transform.OutputKeys;
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.ServiceException;