X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Fmain%2Fjava%2Forg%2Fwamblee%2Fxml%2FDomUtils.java;h=3d1c2d8ffae0cc0b38031627db6b7131becf5d7b;hb=f821a28ffddc9b91d23c8ef6993c19bee70e3b37;hp=d5e3bee47e1bc8b74612748829d8948ed46120a6;hpb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;p=utils

diff --git a/support/general/src/main/java/org/wamblee/xml/DomUtils.java b/support/general/src/main/java/org/wamblee/xml/DomUtils.java
index d5e3bee4..3d1c2d8f 100644
--- a/support/general/src/main/java/org/wamblee/xml/DomUtils.java
+++ b/support/general/src/main/java/org/wamblee/xml/DomUtils.java
@@ -1,12 +1,12 @@
 /*
- * Copyright 2005 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,52 +15,47 @@
  */
 package org.wamblee.xml;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
-
-import org.dom4j.DocumentException;
-
-import org.dom4j.io.DOMReader;
-import org.dom4j.io.DOMWriter;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import org.xml.sax.SAXException;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
+
 /**
  * Some basic XML utilities for common reoccuring tasks for DOM documents.
  * 
  * @author Erik Brakkee
  */
 public final class DomUtils {
-    private static final Log LOG = LogFactory.getLog(DomUtils.class);
+    private static final Logger LOG = Logger
+        .getLogger(DomUtils.class.getName());
 
     /**
      * Disabled default constructor.
@@ -110,7 +105,7 @@ public final class DomUtils {
             try {
                 aIs.close();
             } catch (Exception e) {
-                LOG.warn("Error closing XML file", e);
+                LOG.log(Level.WARNING, "Error closing XML file", e);
             }
         }
     }
@@ -150,13 +145,13 @@ public final class DomUtils {
             try {
                 aSchema.close();
             } catch (Exception e) {
-                LOG.warn("Error closing schema", e);
+                LOG.log(Level.WARNING, "Error closing schema", e);
             }
 
             try {
                 aIs.close();
             } catch (Exception e) {
-                LOG.warn("Error closing XML file", e);
+                LOG.log(Level.WARNING, "Error closing XML file", e);
             }
         }
     }
@@ -172,8 +167,15 @@ public final class DomUtils {
      */
     public static void serialize(Document aDocument, OutputStream aOs)
         throws IOException {
-        XMLSerializer serializer = new XMLSerializer(aOs, new OutputFormat());
-        serializer.serialize(aDocument);
+        try {
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Transformer identityTransform = factory.newTransformer();
+            DOMSource source = new DOMSource(aDocument);
+            StreamResult result = new StreamResult(aOs);
+            identityTransform.transform(source, result);
+        } catch (TransformerException e) {
+            throw new IOException(e.getMessage(), e);
+        }
     }
 
     /**
@@ -192,32 +194,6 @@ public final class DomUtils {
         return os.toString();
     }
 
-    /**
-     * Converts a dom4j document into a w3c DOM document.
-     * 
-     * @param aDocument
-     *            Document to convert.
-     * 
-     * @return W3C DOM document.
-     * 
-     */
-    public static Document convert(org.dom4j.Document aDocument)
-        throws DocumentException {
-        return new DOMWriter().write(aDocument);
-    }
-
-    /**
-     * Converts a W3C DOM document into a dom4j document.
-     * 
-     * @param aDocument
-     *            Document to convert.
-     * 
-     * @return Dom4j document.
-     */
-    public static org.dom4j.Document convert(Document aDocument) {
-        return new DOMReader().read(aDocument);
-    }
-
     /**
      * Removes duplicate attributes from a DOM tree.This is useful for
      * postprocessing the output of JTidy as a workaround for a bug in JTidy.