From e0d60fe19659a26078fc79432df10780ddaa3e8c Mon Sep 17 00:00:00 2001
From: David Cramer <david@thingbag.net>
Date: Tue, 6 Jul 2010 21:39:14 +0000
Subject: [PATCH] Use xml catalogs to point to docbook xsls

---
 xsl/webhelp/build.properties | 10 +++++++---
 xsl/webhelp/build.xml        | 10 ++++++----
 xsl/webhelp/xsl/webhelp.xsl  |  6 +-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/xsl/webhelp/build.properties b/xsl/webhelp/build.properties
index e8f9e4601..34adcb60f 100755
--- a/xsl/webhelp/build.properties
+++ b/xsl/webhelp/build.properties
@@ -1,6 +1,10 @@
 input-xml=docsrc/readme.xml
 frameset.base.dir=doc
-#xslt-processor=c:/workhead/export/saxon/6.5/lib/saxon.jar
-xslt-processor=/usr/bin/xsltproc
-#docbookx.dtd=c:/workhead/export/DocBookDTD/4.5/docbookx.dtd"
+xslt-processor-classpath=c:/workhead/export/saxon/6.5/lib/saxon.jar
+# To use this catalog, make sure the resolver is in your classpath.
+# Download xml-commons-resolver from http://xml.apache.org/commons/dist/
+# and add it to your CLASSPATH. Then use the following property to point 
+# to your docbook xsl stylesheets' catalog
+docbook-xsl-catalog=c:/gsoc2010/docbook-xsl-1.75.2/catalog.xml
 docbookx.dtd=file:///media/DATA/ACADEMIC/GSOC/docbook/repository/docbook/trunk/defguide/en/schema/docbookx.dtd
+validate=true
diff --git a/xsl/webhelp/build.xml b/xsl/webhelp/build.xml
index 3b83fa7c0..a3c15be4a 100755
--- a/xsl/webhelp/build.xml
+++ b/xsl/webhelp/build.xml
@@ -3,14 +3,16 @@
   <loadproperties srcFile="build.properties"/>
   
   <xmlcatalog id="catalog">
-	<dtd publicId="-//OASIS//DTD DocBook XML V4.5//EN"
-	  location="${docbookx.dtd}"/>
+	<catalogpath>
+	  <pathelement location="${docbook-xsl-catalog}"/>
+	</catalogpath>
+	<dtd publicId="-//OASIS//DTD DocBook XML V4.5//EN" location="${docbookx.dtd}"/>
   </xmlcatalog>
 
   <property environment="env"/>
   <property name="ant.jar" value="${env.ANT_HOME}/lib/ant.jar"/>
 
-  <target name="validate">
+  <target name="validate" if="validate">
 	<xmlvalidate file="${input-xml}">
 	  <xmlcatalog refid="catalog"/>
 	</xmlvalidate>
@@ -24,7 +26,7 @@
 	  out="${frameset.base.dir}/dummy.html"
 	  style="xsl/webhelp.xsl"
 	  scanincludeddirectories="false"
-	  classpath="${xslt-processor}">
+	  classpath="${xslt-processor-classpath}">
 	  <xmlcatalog refid="catalog"/>
 	  <param name="chunked.toc.all.open" expression="${chunked.toc.all.open}" if="chunked.toc.all.open"/>
 	  <param name="exclude.search.from.chunked.html" expression="${exclude.search.from.chunked.html}" if="exclude.search.from.chunked.html"/>
diff --git a/xsl/webhelp/xsl/webhelp.xsl b/xsl/webhelp/xsl/webhelp.xsl
index a115c031f..6e774b998 100755
--- a/xsl/webhelp/xsl/webhelp.xsl
+++ b/xsl/webhelp/xsl/webhelp.xsl
@@ -4,11 +4,7 @@
         xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
         version="1.0" xmlns="http://www.w3.org/1999/xhtml">
 
-    <!--<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>-->
-    <!--xsl:import
-            href="c:/gsoc2010/docbook-xsl-1.75.2/xhtml/chunk.xsl"/-->
-    <xsl:import
-            href="file:///media/DATA/ACADEMIC/GSOC/docbook/repository/docbook/trunk/maven/docbook-xsl/target/docbook/xhtml/chunk.xsl"/>
+    <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
  
     <xsl:include href="keywords.xsl"/>
 
-- 
2.40.0