Return-Path: 
 <svn-return-6898-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 93958 invoked from network); 8 Apr 2007 01:52:27 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 8 Apr 2007 01:52:27 -0000
Received: (qmail 17211 invoked by uid 500); 8 Apr 2007 01:52:34 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 17183 invoked by uid 500); 8 Apr 2007 01:52:33 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 17174 invoked by uid 99); 8 Apr 2007 01:52:33 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Apr 2007 18:52:33 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Apr 2007 18:52:26 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 46A511A9838; Sat,  7 Apr 2007 18:52:06 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r526505 - in /forrest/trunk: etc/xmlformat.conf
 main/build.xml
Date: Sun, 08 Apr 2007 01:52:06 -0000
To: svn@forrest.apache.org
From: crossley@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070408015206.46A511A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: crossley
Date: Sat Apr  7 18:52:05 2007
New Revision: 526505

URL: http://svn.apache.org/viewvc?view=rev&rev=526505
Log:
Add Ant target 'xmlformat' and initial xmlformat.conf for FOR-644

Added:
    forrest/trunk/etc/xmlformat.conf
Modified:
    forrest/trunk/main/build.xml

Added: forrest/trunk/etc/xmlformat.conf
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/xmlformat.conf?view=auto&rev=526505
==============================================================================
--- forrest/trunk/etc/xmlformat.conf (added)
+++ forrest/trunk/etc/xmlformat.conf Sat Apr  7 18:52:05 2007
@@ -0,0 +1,21 @@
+*DEFAULT
+  subindent 2
+
+p, abstract, description, note, warning, fixme, quote
+  normalize yes
+  wrap-length 80
+
+title, li, dt, dd
+  entry-break 0
+  exit-break 0
+
+strong, a, link, jump, fork, em, code, sub, sup, tt
+  format inline
+
+source, pre, blockcode
+  format block
+  normalize no
+
+xsl:text
+  format verbatim
+# FIXME: xsl:text elements are then left-aligned to column 1

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?view=diff&rev=526505&r1=526504&r2=526505
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Sat Apr  7 18:52:05 2007
@@ -160,7 +160,44 @@
     depends="clean,dist-shbat" />
 
   <!-- =================================================================== -->
-  <!-- Use tidy.sf.net on a single xml-type file                           -->
+  <!-- Use xmlformat on various xml-type files                             -->
+  <!-- =================================================================== -->
+<!-- Notes:
+You need 'xmlformat' locally installed.
+Change the fileset/@dir to the tree that you want to clean.
+If you encounter invalid xml, uncomment the -v (not xmlformat job to validate).
+Remove any build directories in a tree before running.
+-->
+  <target name="xmlformat" depends="init">
+    <apply executable="xmlformat" parallel="false" verbose="yes">
+      <arg value="-f${forrest.home}/etc/xmlformat.conf"/>
+      <arg value="-i"/>
+<!--
+      <arg value="-v"/>
+-->
+      <srcfile/>
+      <fileset dir="${forrest.home}/etc/test-whitespace">
+        <patternset>
+          <include name="**/*.xml"/>
+          <include name="**/*.xsl"/>
+          <include name="**/*.xslt"/>
+          <include name="**/*.xmap"/>
+          <include name="**/*.jx"/>
+          <include name="**/*.ft"/>
+          <include name="**/*.fv"/>
+          <include name="**/*.html"/>
+          <include name="**/*.rdf"/>
+          <include name="**/*.xcat"/>
+          <include name="**/*.xhtml"/>
+          <include name="**/*.xhtml2"/>
+          <include name="**/*.xxe"/>
+        </patternset>
+      </fileset>
+    </apply>
+  </target>
+
+  <!-- =================================================================== -->
+  <!-- Test tidy.sf.net on a single xml-type file                          -->
   <!-- See also etc/tidy-xml.pl                                            -->
   <!-- =================================================================== -->
   <target name="tidy-xml-file" depends="init">