[portal-commits] JBoss Portal SVN: r8974 - in tools/docbook/support: support/lib and 1 other directory.

[portal-commits at lists.jboss.org]

Author: thomas.heute at jboss.com
Date: 2007-11-16 09:59:43 -0500 (Fri, 16 Nov 2007)
New Revision: 8974

Removed:
   tools/docbook/support/support/lib/xcluder-0.9.2.jar
Modified:
   tools/docbook/support/support.xml
Log:
Unfortunately painfully slow... Xerces solution is also slow (no xinclude then :( )

Deleted: tools/docbook/support/support/lib/xcluder-0.9.2.jar
===================================================================
(Binary files differ)

Modified: tools/docbook/support/support.xml
===================================================================
--- tools/docbook/support/support.xml	2007-11-16 13:29:12 UTC (rev 8973)
+++ tools/docbook/support/support.xml	2007-11-16 14:59:43 UTC (rev 8974)
@@ -101,22 +101,7 @@
         -->
 	</target>
 
-	<target name="xincludefusion">
-
-		<taskdef name="xcluder" 
-        classname="gr.abiss.xcluder.XercesXcluder" 
-        classpathref="lib.classpath" 
-    	/>
-
-
-		<xcluder in="${basedir}/${lang}/master.xml"
-	    out="${basedir}/${build.dir}/${lang}/master.xml"
-	    indent="yes" 
-		/>
-
-	</target>
-
-	<target name="lang.docpdf" depends="xincludefusion">
+	<target name="lang.docpdf">
 		<!-- Copy all the images to the output location,
              will be removed later. -->
 
@@ -143,7 +128,7 @@
 			<classpath refid="lib.classpath"/>
 			<arg value="-o" />
 			<arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
-			<arg value="${basedir}/${build.dir}/${lang}/master.xml"/>
+			<arg value="${basedir}/${lang}/master.xml"/>
 			<arg value="${styles.dir}/${lang}/${db.style.fopdf}"/>
 			<arg value="ulink.footnotes=1" />
 		</java>
@@ -170,7 +155,7 @@
 		<delete dir="${basedir}/${build.dir}/${lang}/pdf/images"/>
 	</target>
 
-	<target name="lang.dochtml" depends="xincludefusion">
+	<target name="lang.dochtml">
 		<mkdir dir="${basedir}/${build.dir}/${lang}/html/"/>
 
 		<!-- Copy all the images to the output location -->
@@ -195,12 +180,12 @@
 		<java classname="com.icl.saxon.StyleSheet"
               fork="true" dir="${basedir}/${build.dir}/${lang}/html">
 			<classpath refid="lib.classpath"/>
-			<arg value="${basedir}/${build.dir}/${lang}/master.xml"/>
+			<arg value="${basedir}/${lang}/master.xml"/>
 			<arg value="${styles.dir}/${lang}/${db.style.html}"/>
 		</java>
 	</target>
 
-	<target name="lang.dochtmlsingle" depends="xincludefusion">
+	<target name="lang.dochtmlsingle">
 		<mkdir dir="${basedir}/${build.dir}/${lang}/html_single/"/>
 
 		<!-- Copy all the images to the output location -->
@@ -227,7 +212,7 @@
 			<classpath refid="lib.classpath"/>
 			<arg value="-o"/>
 			<arg value="${basedir}/${build.dir}/${lang}/html_single/index.html"/>
-			<arg value="${basedir}/${build.dir}/${lang}/master.xml"/>
+			<arg value="${basedir}/${lang}/master.xml"/>
 			<arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/>
 		</java>
 	</target>