Update of /cvsroot/xdoclet/xdoclet/core/src/xdoclet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9101/src/xdoclet
Modified Files: XmlSubTask.java Log Message: Use dom4j for xml formatting, default formatting for hibernate module turned back on Index: XmlSubTask.java =================================================================== RCS file: /cvsroot/xdoclet/xdoclet/core/src/xdoclet/XmlSubTask.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -r1.27 -r1.28 *** XmlSubTask.java 19 Jul 2005 19:10:02 -0000 1.27 --- XmlSubTask.java 15 Aug 2005 14:38:34 -0000 1.28 *************** *** 6,24 **** import java.io.File; ! import java.io.FileWriter; import java.io.IOException; ! import java.io.Writer; import java.net.URL; - import javax.xml.parsers.DocumentBuilder; - import javax.xml.parsers.DocumentBuilderFactory; - import javax.xml.parsers.ParserConfigurationException; - import org.apache.commons.logging.Log; ! import org.apache.xml.serialize.DOMSerializer; ! import org.apache.xml.serialize.OutputFormat; ! import org.apache.xml.serialize.XMLSerializer; ! import org.w3c.dom.Document; ! import org.xml.sax.SAXException; import xdoclet.tagshandler.IdTagsHandler; --- 6,18 ---- import java.io.File; ! import java.io.FileOutputStream; import java.io.IOException; ! import java.io.OutputStream; import java.net.URL; import org.apache.commons.logging.Log; ! import org.dom4j.io.OutputFormat; ! import org.dom4j.io.SAXReader; ! import org.dom4j.io.XMLWriter; import xdoclet.tagshandler.IdTagsHandler; *************** *** 342,346 **** Log log = LogUtil.getLog(XmlSubTask.class, "prettifyXml"); ! Document document = null; if (log.isDebugEnabled()) { --- 336,340 ---- Log log = LogUtil.getLog(XmlSubTask.class, "prettifyXml"); ! org.dom4j.Document document = null; if (log.isDebugEnabled()) { *************** *** 349,376 **** try { ! DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); ! ! factory.setValidating(false); ! ! DocumentBuilder builder = factory.newDocumentBuilder(); ! document = builder.parse(file); } ! catch (IOException e) { throw new XDocletException(e, "unable to parse generated xml file " + file); } - catch (ParserConfigurationException e) { - throw new XDocletException(e, "unable to get XML DocumentBuilder class"); - } - catch (SAXException e) { - throw new XDocletException(e, "XML processing error during reformatting"); - } try { ! Writer writer = new FileWriter(file); ! OutputFormat format = new OutputFormat(document, "UTF-8", true); ! DOMSerializer serializer = new XMLSerializer(writer, format); ! serializer.serialize(document); } catch (IOException e) { --- 343,360 ---- try { ! SAXReader reader = new SAXReader(); ! document = reader.read(file); } ! catch (org.dom4j.DocumentException e) { throw new XDocletException(e, "unable to parse generated xml file " + file); } try { ! OutputFormat format = OutputFormat.createPrettyPrint(); ! OutputStream out = new FileOutputStream(file); ! XMLWriter writer = new XMLWriter(out, format); ! writer.write(document); } catch (IOException e) { ------------------------------------------------------- SF.Net email is Sponsored by the Better Software Conference & EXPO September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf _______________________________________________ xdoclet-devel mailing list xdoclet-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xdoclet-devel