cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ba...@locus.apache.org
Subject cvs commit: xml-cocoon/src/org/apache/cocoon/processor/xinclude XIncludeProcessor.java
Date Wed, 04 Oct 2000 17:03:00 GMT
balld       00/10/04 10:03:00

  Modified:    .        changes.xml
               src/org/apache/cocoon/processor/xinclude
                        XIncludeProcessor.java
  Log:
  made xincludeprocessor default to parse="xml"
  
  Revision  Changes    Path
  1.120     +5 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.119
  retrieving revision 1.120
  diff -u -r1.119 -r1.120
  --- changes.xml	2000/10/02 20:44:36	1.119
  +++ changes.xml	2000/10/04 17:02:58	1.120
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.119 2000/10/02 20:44:36 balld Exp $
  +  $Id: changes.xml,v 1.120 2000/10/04 17:02:58 balld Exp $
   -->
   
   <changes title="History of Changes">
  @@ -17,6 +17,10 @@
     </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="DB" type="fix" due-to="Peter Verhage" due-to-email="peter@ibuildings.nl">
  +   made xincludeprocessor default to parse="xml"
  +  </action>
  +  </action>
     <action dev="DB" type="fix">
      put heapsize line back into cocoon.properties
     </action>
  
  
  
  1.16      +4 -2      xml-cocoon/src/org/apache/cocoon/processor/xinclude/XIncludeProcessor.java
  
  Index: XIncludeProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xinclude/XIncludeProcessor.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- XIncludeProcessor.java	2000/09/14 18:48:12	1.15
  +++ XIncludeProcessor.java	2000/10/04 17:02:59	1.16
  @@ -101,7 +101,7 @@
    * a terrible wasteful of memory.
    *
    * @author <a href="mailto:balld@webslingerZ.com">Donald Ball</a>
  - * @version CVS $Revision: 1.15 $ $Date: 2000/09/14 18:48:12 $ $Author: balld $
  + * @version CVS $Revision: 1.16 $ $Date: 2000/10/04 17:02:59 $ $Author: balld $
    */
   public class XIncludeProcessor extends AbstractActor implements Processor, Status {
   
  @@ -347,7 +347,9 @@
   				}
   				result = document.createTextNode(sb.toString());
   			}
  -		} else if (xinclude.parse.equals("xml")) {
  +		} else if (xinclude.parse.equals("cdata")) {
  +			/** i'm not sure what to do here **/
  +		} else {
   			InputSource input;
   			/*if (content instanceof Reader) {
   				input = new InputSource((Reader)content);
  
  
  

Mime
View raw message