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

portal-commits at lists.jboss.org portal-commits at lists.jboss.org
Fri Nov 16 08:29:12 EST 2007


Author: thomas.heute at jboss.com
Date: 2007-11-16 08:29:12 -0500 (Fri, 16 Nov 2007)
New Revision: 8973

Added:
   tools/docbook/support/support/lib/xcluder-0.9.2.jar
Modified:
   tools/docbook/support/support.xml
Log:
Enable usage of xinclude

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


Property changes on: tools/docbook/support/support/lib/xcluder-0.9.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: tools/docbook/support/support.xml
===================================================================
--- tools/docbook/support/support.xml	2007-11-16 12:12:44 UTC (rev 8972)
+++ tools/docbook/support/support.xml	2007-11-16 13:29:12 UTC (rev 8973)
@@ -1,236 +1,252 @@
 <project name="DocSupport" default="all.doc" basedir=".">
 
-    <dirname property="support.basedir" file="${ant.file.DocSupport}"/>
+	<dirname property="support.basedir" file="${ant.file.DocSupport}"/>
 
-    <!-- Set build directories for all formats. -->
-    <property name="build.dir"             value="build"/>
+	<!-- Set build directories for all formats. -->
+	<property name="build.dir"             value="build"/>
 
-    <!-- Support files for build process. -->
-    <property name="support.dir"           value="${support.basedir}/support"/>
-    <property name="styles.dir"            value="${support.basedir}/styles"/>
+	<!-- Support files for build process. -->
+	<property name="support.dir"           value="${support.basedir}/support"/>
+	<property name="styles.dir"            value="${support.basedir}/styles"/>
 
-    <!-- Set DocBook stylesheets. -->
-    <property name="db.style.fopdf"        value="fopdf.xsl"/>
-    <property name="db.style.html"         value="html_chunk.xsl"/>
-    <property name="db.style.htmlsingle"   value="html.xsl"/>
+	<!-- Set DocBook stylesheets. -->
+	<property name="db.style.fopdf"        value="fopdf.xsl"/>
+	<property name="db.style.html"         value="html_chunk.xsl"/>
+	<property name="db.style.htmlsingle"   value="html.xsl"/>
 
-    <property name="maxmem"                value="1024m" />
+	<property name="maxmem"                value="1024m" />
 
-    <xmlcatalog id="docbook.catalog">
-        <catalogpath path="${support.basedir}/docbook-dtd/catalog.xml" />
-    </xmlcatalog>
+	<xmlcatalog id="docbook.catalog">
+		<catalogpath path="${support.basedir}/docbook-dtd/catalog.xml" />
+	</xmlcatalog>
 
 
-    <!-- Classpath for the build tools. -->
-    <path id="lib.classpath">
-        <fileset dir="${support.dir}/lib">
-            <include name="**/*.jar"/>
-        </fileset>
-    </path>
+	<!-- Classpath for the build tools. -->
+	<path id="lib.classpath">
+		<fileset dir="${support.dir}/lib">
+			<include name="**/*.jar"/>
+		</fileset>
+	</path>
 
-    <!-- ################################################################## -->
+	<!-- ################################################################## -->
 
-    <target name="all.doc" depends="clean">
-        <antcall target="lang.all"><param name="lang" value="en"/></antcall>
-    </target>
+	<target name="all.doc" depends="clean">
+		<antcall target="lang.all">
+			<param name="lang" value="en"/>
+		</antcall>
+	</target>
 
-    <!-- ################################################################## -->
+	<!-- ################################################################## -->
 
-    <target name="lang.all.bypass.check" unless="lang.all.bypass.disabled">
-       <uptodate property="lang.all.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}">
-          <srcfiles dir="${support.basedir}" includes="**"/>
-          <srcfiles dir="${basedir}/${lang}" includes="**"/>
-          <srcfiles dir="${basedir}" includes="build.xml"/>
-       </uptodate>
-    </target>
+	<target name="lang.all.bypass.check" unless="lang.all.bypass.disabled">
+		<uptodate property="lang.all.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}">
+			<srcfiles dir="${support.basedir}" includes="**"/>
+			<srcfiles dir="${basedir}/${lang}" includes="**"/>
+			<srcfiles dir="${basedir}" includes="build.xml"/>
+		</uptodate>
+	</target>
 
-    <target name="lang.all.run" depends="lang.all.bypass.check, lang.all.bypass.message" unless="lang.all.bypass.on">
-       <antcall target="clean"/>
-       <antcall target="lang.all"/>
-    </target>
-    
-    <target name="lang.all.bypass.message" if="lang.all.bypass.on">
-       <echo>Already uptodate: ${basedir}/${build.dir}/${lang}/pdf/${pdf.name}</echo>
-       <echo>add -Dlang.all.bypass.disabled=true to force a rebuild</echo>
-    </target>
+	<target name="lang.all.run" depends="lang.all.bypass.check, lang.all.bypass.message" unless="lang.all.bypass.on">
+		<antcall target="clean"/>
+		<antcall target="lang.all"/>
+	</target>
 
-    <!-- ################################################################## -->
+	<target name="lang.all.bypass.message" if="lang.all.bypass.on">
+		<echo>Already uptodate: ${basedir}/${build.dir}/${lang}/pdf/${pdf.name}</echo>
+		<echo>add -Dlang.all.bypass.disabled=true to force a rebuild</echo>
+	</target>
 
-    <target name="lang.dochtml.bypass.check" unless="lang.dochtml.bypass.disabled">
-       <uptodate property="lang.dochtml.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/html/index.html">
-          <srcfiles dir="${support.basedir}" includes="**"/>
-          <srcfiles dir="${basedir}/${lang}" includes="**"/>
-          <srcfiles dir="${basedir}" includes="build.xml"/>
-       </uptodate>
-    </target>
+	<!-- ################################################################## -->
 
-    <target name="lang.dochtml.run" depends="lang.dochtml.bypass.check, lang.dochtml.bypass.message" unless="lang.dochtml.bypass.on">
-       <antcall target="clean.dochtml"/>
-       <antcall target="lang.dochtml"/>
-       <antcall target="lang.dochtmlsingle"/>
-    </target>
-    
-    <target name="lang.dochtml.bypass.message" if="lang.dochtml.bypass.on">
-       <echo>Already uptodate: ${basedir}/${build.dir}/${lang}/html/index.html</echo>
-       <echo>add -Dlang.dochtml.bypass.disabled=true to force a rebuild</echo>
-    </target>
+	<target name="lang.dochtml.bypass.check" unless="lang.dochtml.bypass.disabled">
+		<uptodate property="lang.dochtml.bypass.on" targetfile="${basedir}/${build.dir}/${lang}/html/index.html">
+			<srcfiles dir="${support.basedir}" includes="**"/>
+			<srcfiles dir="${basedir}/${lang}" includes="**"/>
+			<srcfiles dir="${basedir}" includes="build.xml"/>
+		</uptodate>
+	</target>
 
-    <!-- ################################################################## -->
+	<target name="lang.dochtml.run" depends="lang.dochtml.bypass.check, lang.dochtml.bypass.message" unless="lang.dochtml.bypass.on">
+		<antcall target="clean.dochtml"/>
+		<antcall target="lang.dochtml"/>
+		<antcall target="lang.dochtmlsingle"/>
+	</target>
 
-    <target name="clean">
-        <!-- Delete build directory. -->
-        <delete dir="${basedir}/${build.dir}"/>
-    </target>
+	<target name="lang.dochtml.bypass.message" if="lang.dochtml.bypass.on">
+		<echo>Already uptodate: ${basedir}/${build.dir}/${lang}/html/index.html</echo>
+		<echo>add -Dlang.dochtml.bypass.disabled=true to force a rebuild</echo>
+	</target>
 
-    <target name="clean.dochtml">
-        <!-- Delete build directory for single html -->
-        <delete dir="${basedir}/${build.dir}/${lang}/html"/>
-        <delete dir="${basedir}/${build.dir}/${lang}/html_single"/>
-    </target>
+	<!-- ################################################################## -->
 
-    <!-- ################################################################## -->
+	<target name="clean">
+		<!-- Delete build directory. -->
+		<delete dir="${basedir}/${build.dir}"/>
+	</target>
 
-    <target name="lang.all">
-        <antcall target="lang.docpdf"/>
-        <antcall target="lang.dochtml"/>
-        <antcall target="lang.dochtmlsingle"/>
-        <!-- 
+	<target name="clean.dochtml">
+		<!-- Delete build directory for single html -->
+		<delete dir="${basedir}/${build.dir}/${lang}/html"/>
+		<delete dir="${basedir}/${build.dir}/${lang}/html_single"/>
+	</target>
+
+	<!-- ################################################################## -->
+
+	<target name="lang.all">
+		<antcall target="lang.docpdf"/>
+		<antcall target="lang.dochtml"/>
+		<antcall target="lang.dochtmlsingle"/>
+		<!-- 
         <antcall target="lang.htmlmisc"/>
         -->
-    </target>
+	</target>
 
-    <target name="lang.docpdf">
-        <!-- Copy all the images to the output location,
+	<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">
+		<!-- Copy all the images to the output location,
              will be removed later. -->
 
-       <!-- "rebuild" the build.dir variable, in case ${basedir} has been overridden -->
-        <copy todir="${basedir}/${build.dir}/${lang}/pdf/images" failonerror="false">
-            <fileset dir="${basedir}/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.svg"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-            <fileset dir="../common/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.svg"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-        </copy>
+		<!-- "rebuild" the build.dir variable, in case ${basedir} has been overridden -->
+		<copy todir="${basedir}/${build.dir}/${lang}/pdf/images" failonerror="false">
+			<fileset dir="${basedir}/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.svg"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+			<fileset dir="../common/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.svg"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+		</copy>
 
-        <!-- Create the XSL/FO temporary file. -->
-
-        <java classname="com.icl.saxon.StyleSheet"
+		<!-- Create the XSL/FO temporary file. -->
+		<java classname="com.icl.saxon.StyleSheet"
               maxmemory="${maxmem}"
               fork="true" dir="${basedir}">
-            <classpath refid="lib.classpath"/>
-            <arg value="-o" />
-            <arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
-            <arg value="${basedir}/${lang}/master.xml"/>
-            <arg value="${styles.dir}/${lang}/${db.style.fopdf}"/>
-            <arg value="ulink.footnotes=1" />
-        </java>
+			<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="${styles.dir}/${lang}/${db.style.fopdf}"/>
+			<arg value="ulink.footnotes=1" />
+		</java>
 
 
-<!--
+		<!--
         <xslt out="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"
                    in="${basedir}/${lang}/master.xml"
               style="${styles.dir}/${lang}/${db.style.fopdf}">
             <xmlcatalog refid="docbook.catalog"/>
         </xslt>
 -->
-        <!-- Create a PDF from the XSL/FO. -->
-        <java classname="org.apache.fop.apps.Fop" 
+		<!-- Create a PDF from the XSL/FO. -->
+		<java classname="org.apache.fop.apps.Fop" 
 	      maxmemory="${maxmem}"
               fork="true" dir="${basedir}">
-            <classpath refid="lib.classpath"/>
-            <arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
-            <arg value="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}"/>
-        </java>
+			<classpath refid="lib.classpath"/>
+			<arg value="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+			<arg value="${basedir}/${build.dir}/${lang}/pdf/${pdf.name}"/>
+		</java>
 
-        <!-- Delete temporary files. -->
-        <delete file="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
-        <delete dir="${basedir}/${build.dir}/${lang}/pdf/images"/>
-    </target>
+		<!-- Delete temporary files. -->
+		<delete file="${basedir}/${build.dir}/${lang}/pdf/docbook_fop.tmp"/>
+		<delete dir="${basedir}/${build.dir}/${lang}/pdf/images"/>
+	</target>
 
-    <target name="lang.dochtml">
-        <mkdir dir="${basedir}/${build.dir}/${lang}/html/"/>
+	<target name="lang.dochtml" depends="xincludefusion">
+		<mkdir dir="${basedir}/${build.dir}/${lang}/html/"/>
 
-        <!-- Copy all the images to the output location -->
-        <copy todir="${basedir}/${build.dir}/${lang}/html/images" failonerror="false">
-            <fileset dir="${basedir}/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-            <fileset dir="../common/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-        </copy>
-        <copy todir="${basedir}/${build.dir}/${lang}/html/css">
-            <fileset dir="${styles.dir}/${lang}">
-                <include name="**/*.css"/>
-            </fileset>
-        </copy>
+		<!-- Copy all the images to the output location -->
+		<copy todir="${basedir}/${build.dir}/${lang}/html/images" failonerror="false">
+			<fileset dir="${basedir}/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+			<fileset dir="../common/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+		</copy>
+		<copy todir="${basedir}/${build.dir}/${lang}/html/css">
+			<fileset dir="${styles.dir}/${lang}">
+				<include name="**/*.css"/>
+			</fileset>
+		</copy>
 
-        <java classname="com.icl.saxon.StyleSheet"
+		<java classname="com.icl.saxon.StyleSheet"
               fork="true" dir="${basedir}/${build.dir}/${lang}/html">
-            <classpath refid="lib.classpath"/>
-            <arg value="${basedir}/${lang}/master.xml"/>
-            <arg value="${styles.dir}/${lang}/${db.style.html}"/>
-        </java>
-    </target>
+			<classpath refid="lib.classpath"/>
+			<arg value="${basedir}/${build.dir}/${lang}/master.xml"/>
+			<arg value="${styles.dir}/${lang}/${db.style.html}"/>
+		</java>
+	</target>
 
-    <target name="lang.dochtmlsingle">
-        <mkdir dir="${basedir}/${build.dir}/${lang}/html_single/"/>
+	<target name="lang.dochtmlsingle" depends="xincludefusion">
+		<mkdir dir="${basedir}/${build.dir}/${lang}/html_single/"/>
 
-        <!-- Copy all the images to the output location -->
-        <copy todir="${basedir}/${build.dir}/${lang}/html_single/images" failonerror="false">
-            <fileset dir="${basedir}/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-            <fileset dir="../common/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-                <include name="**/*.jpg"/>
-            </fileset>
-        </copy>
-        <copy todir="${basedir}/${build.dir}/${lang}/html_single/css">
-            <fileset dir="${styles.dir}/${lang}">
-                <include name="**/*.css"/>
-            </fileset>
-        </copy>
+		<!-- Copy all the images to the output location -->
+		<copy todir="${basedir}/${build.dir}/${lang}/html_single/images" failonerror="false">
+			<fileset dir="${basedir}/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+			<fileset dir="../common/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.gif"/>
+				<include name="**/*.jpg"/>
+			</fileset>
+		</copy>
+		<copy todir="${basedir}/${build.dir}/${lang}/html_single/css">
+			<fileset dir="${styles.dir}/${lang}">
+				<include name="**/*.css"/>
+			</fileset>
+		</copy>
 
-        <java classname="com.icl.saxon.StyleSheet" 
+		<java classname="com.icl.saxon.StyleSheet" 
 	      fork="true" dir="${basedir}">
-            <classpath refid="lib.classpath"/>
-            <arg value="-o"/>
-            <arg value="${basedir}/${build.dir}/${lang}/html_single/index.html"/>
-            <arg value="${basedir}/${lang}/master.xml"/>
-            <arg value="${styles.dir}/${lang}/${db.style.htmlsingle}"/>
-        </java>
-    </target>
+			<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="${styles.dir}/${lang}/${db.style.htmlsingle}"/>
+		</java>
+	</target>
 
-    <!-- I do not really like to have external dependency for HTML pages 
+	<!-- I do not really like to have external dependency for HTML pages 
          So, I am not using this task ... -->
-    <target name="lang.htmlmisc">
-        <!-- Copy images and CSS for HTML documentation, language specific. -->
-        <copy todir="${basedir}/${build.dir}/${lang}/shared/images">
-            <fileset dir="${basedir}/${lang}/images">
-                <include name="**/*.png"/>
-                <include name="**/*.gif"/>
-            </fileset>
-        </copy>
+	<target name="lang.htmlmisc">
+		<!-- Copy images and CSS for HTML documentation, language specific. -->
+		<copy todir="${basedir}/${build.dir}/${lang}/shared/images">
+			<fileset dir="${basedir}/${lang}/images">
+				<include name="**/*.png"/>
+				<include name="**/*.gif"/>
+			</fileset>
+		</copy>
 
-        <copy todir="${basedir}/${build.dir}/${lang}/shared/css">
-            <fileset dir="${styles.dir}/${lang}">
-                <include name="**/*.css"/>
-            </fileset>
-        </copy>
-    </target>
+		<copy todir="${basedir}/${build.dir}/${lang}/shared/css">
+			<fileset dir="${styles.dir}/${lang}">
+				<include name="**/*.css"/>
+			</fileset>
+		</copy>
+	</target>
 </project>




More information about the portal-commits mailing list