sylvain 01/07/24 05:12:44
Modified: src/org/apache/cocoon/xml/dom Tag: cocoon_20_branch
DOMStreamer.java
Added: src/org/apache/cocoon/xml Tag: cocoon_20_branch
EmbeddedXMLPipe.java
Log:
Strip start/endDocument if the streamed node isn't a Document
Revision Changes Path
No revision
No revision
1.1.2.1 +1 -1 xml-cocoon2/src/org/apache/cocoon/xml/EmbeddedXMLPipe.java
Index: EmbeddedXMLPipe.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/EmbeddedXMLPipe.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- EmbeddedXMLPipe.java 2001/07/24 12:10:04 1.1
+++ EmbeddedXMLPipe.java 2001/07/24 12:12:44 1.1.2.1
@@ -19,7 +19,7 @@
* events.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ovidiu Predescu</a>
- * @version CVS $Revision: 1.1 $ $Date: 2001/07/24 12:10:04 $
+ * @version CVS $Revision: 1.1.2.1 $ $Date: 2001/07/24 12:12:44 $
*/
public class EmbeddedXMLPipe extends AbstractXMLPipe
{
No revision
No revision
1.1.1.1.2.3 +13 -2 xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java
Index: DOMStreamer.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/xml/dom/DOMStreamer.java,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- DOMStreamer.java 2001/07/05 13:33:55 1.1.1.1.2.2
+++ DOMStreamer.java 2001/07/24 12:12:44 1.1.1.1.2.3
@@ -16,6 +16,7 @@
import javax.xml.transform.sax.SAXResult;
import org.apache.cocoon.xml.AbstractXMLProducer;
+import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.cocoon.xml.XMLConsumer;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -29,7 +30,7 @@
* @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 $Revision: 1.1.1.1.2.2 $ $Date: 2001/07/05 13:33:55 $
+ * @version CVS $Revision: 1.1.1.1.2.3 $ $Date: 2001/07/24 12:12:44 $
*/
public class DOMStreamer extends AbstractXMLProducer {
@@ -83,7 +84,17 @@
}
}
DOMSource source = new DOMSource(node);
- SAXResult result = new SAXResult(super.contentHandler);
+
+ ContentHandler handler;
+ if (node.getNodeType() == Node.DOCUMENT_NODE) {
+ // Pass all SAX events
+ handler = super.contentHandler;
+ } else {
+ // Strip start/endDocument
+ handler = new EmbeddedXMLPipe(super.contentHandler);
+ }
+
+ SAXResult result = new SAXResult(handler);
result.setLexicalHandler(super.lexicalHandler);
try {
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
