cziegeler 2003/02/27 03:51:28
Modified: src/java/org/apache/cocoon/xml/dom DOMStreamer.java
src/java/org/apache/cocoon/serialization
AbstractTextSerializer.java
src/java/org/apache/cocoon/xml XMLUtils.java
Log:
Sync 2.0.x with 2.1
Revision Changes Path
1.8 +13 -10 xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMStreamer.java 26 Feb 2003 15:20:44 -0000 1.7
+++ DOMStreamer.java 27 Feb 2003 11:51:27 -0000 1.8
@@ -82,6 +82,9 @@
* <li>if false, the standard JAXP identity transformer is used.
* </ul>
*
+ * @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Pierpaolo Fumagalli</a>
+ * (Apache Software Foundation, Exoffice Technologies)
* @version CVS $Id$
*/
public class DOMStreamer extends AbstractXMLProducer {
@@ -99,21 +102,21 @@
protected static TransformerFactory factory = TransformerFactory.newInstance();
/**
- * Create a new <code>NamespaceNormalizingDOMStreamer</code> instance.
+ * Create a new <code>DOMStreamer</code> instance.
*/
public DOMStreamer() {
super();
}
/**
- * Create a new <code>NamespaceNormalizingDOMStreamer</code> instance.
+ * Create a new <code>DOMStreamer</code> instance.
*/
public DOMStreamer(XMLConsumer consumer) {
this(consumer, consumer);
}
/**
- * Create a new <code>NamespaceNormalizingDOMStreamer</code> instance.
+ * Create a new <code>DOMStreamer</code> instance.
*/
public DOMStreamer(ContentHandler content) {
this(content, null);
@@ -123,7 +126,7 @@
}
/**
- * Create a new <code>NamespaceNormalizingDOMStreamer</code> instance.
+ * Create a new <code>DOMStreamer</code> instance.
*/
public DOMStreamer(ContentHandler content, LexicalHandler lexical) {
this();
@@ -591,7 +594,7 @@
try {
this.transformer = factory.newTransformer();
} catch (TransformerConfigurationException e) {
- getLogger().error("DefaultDOMStreamer", e);
+ getLogger().error("DOMStreamer", e);
throw new SAXException(e);
}
}
@@ -600,19 +603,19 @@
ContentHandler handler;
if (node.getNodeType() == Node.DOCUMENT_NODE) {
// Pass all SAX events
- handler = contentHandler;
+ handler = contentHandler;
} else {
// Strip start/endDocument
- handler = new EmbeddedXMLPipe(contentHandler);
+ handler = new EmbeddedXMLPipe(contentHandler);
}
SAXResult result = new SAXResult(handler);
- result.setLexicalHandler(lexicalHandler);
+ result.setLexicalHandler(lexicalHandler);
try {
transformer.transform(source, result);
} catch (TransformerException e) {
- getLogger().error("DefaultDOMStreamer", e);
+ getLogger().error("DOMStreamer", e);
throw new SAXException(e);
}
}
1.23 +4 -3
xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
Index: AbstractTextSerializer.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- AbstractTextSerializer.java 27 Feb 2003 11:36:58 -0000 1.22
+++ AbstractTextSerializer.java 27 Feb 2003 11:51:28 -0000 1.23
@@ -537,18 +537,19 @@
this.uriList.clear();
}
}
+
/* (non-Javadoc)
* @see org.xml.sax.ContentHandler#endDocument()
*/
public void endDocument() throws SAXException {
super.endDocument();
+
// if (this.output != null) {
// try {
// this.output.flush();
// } catch (IOException ignored) {
// }
- // }
-
+ // }
}
}
1.17 +2 -1 xml-cocoon2/src/java/org/apache/cocoon/xml/XMLUtils.java
Index: XMLUtils.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/xml/XMLUtils.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XMLUtils.java 26 Feb 2003 15:46:50 -0000 1.16
+++ XMLUtils.java 27 Feb 2003 11:51:28 -0000 1.17
@@ -346,6 +346,7 @@
// XMLizable
if (v instanceof org.apache.excalibur.xml.sax.XMLizable) {
valueOf(contentHandler, (org.apache.excalibur.xml.sax.XMLizable)v);
+ return;
}
// Node
