From 406b6ab6365c38387ec19e5be0d93e5e544417c7 Mon Sep 17 00:00:00 2001
From: jstrachan <jstrachan@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 17 Mar 2003 08:57:35 +0000
Subject: [PATCH] patch to ensure that the XML declaration is output with the
 XML encoding as well as disabling pretty printing so that <pre> and <source>
 elements come out right

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113130 13f79535-47bb-0310-9956-ffa450edef68
---
 faq/plugin.jelly       | 5 +----
 html2xdoc/.cvsignore   | 1 +
 html2xdoc/plugin.jelly | 5 +----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/faq/plugin.jelly b/faq/plugin.jelly
index acdd6e41..14030d42 100644
--- a/faq/plugin.jelly
+++ b/faq/plugin.jelly
@@ -35,10 +35,7 @@
 		<x:parse var="doc" xml="${srcfileFile}"/>    
 		<x:set var="root" select="$doc/*"/>
 
-		<j:file name="${destfile}" encoding="${outputencoding}"
-			omitXmlDeclaration="true" outputMode="xml"
-			prettyPrint="true">
-
+		<j:file name="${destfile}" encoding="${outputencoding}" outputMode="xml">
 <document>
 
   <properties>
diff --git a/html2xdoc/.cvsignore b/html2xdoc/.cvsignore
index 5d21c883..bca2cda9 100644
--- a/html2xdoc/.cvsignore
+++ b/html2xdoc/.cvsignore
@@ -1,2 +1,3 @@
 target
 maven.log
+velocity.log
diff --git a/html2xdoc/plugin.jelly b/html2xdoc/plugin.jelly
index bda37432..54c87521 100644
--- a/html2xdoc/plugin.jelly
+++ b/html2xdoc/plugin.jelly
@@ -75,10 +75,7 @@
         <!-- now lets convert the document into XML -->
         <j:set var="xmlDoc" value="${htmlTool.convert(htmlDoc)}"/>
 
-        <j:file name="${outFile}" encoding="${outputencoding}"
-          omitXmlDeclaration="true" outputMode="xml"
-          prettyPrint="true">
-
+        <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml">
 					<x:copyOf select="$xmlDoc"/>
         </j:file>
       </j:forEach>