Description:
 - build.xml: Remove foreach usage as antcontrib is not in Debian
 - build.xml: Don't fork javacc-generate (use Ant Classpath)
 - docbook.xml: Use Xalan2 as XSLT processor
 - docbook.xml: Fix classpath inclusion of fop.jar
Origin: Damien Raude-Morvan <drazzib@debian.org>
--- a/docbook.xml
+++ b/docbook.xml
@@ -183,16 +183,24 @@
             force="true"
             in="${project.docbook}/${docbook.file}.xml"
             out="${output.docbook.html}/${docbook.file}/index.html">
+            <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
             <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/>
             <param name="chunk.quietly" expression="1"/>
             <param name="root.filename" expression="index"/>
             <param name="use.id.as.filename" expression="1"/>
+            <param name="fop.extensions" expression="0"/>
+            <param name="fop1.extensions" expression="0"/>
             <xmlcatalog refid="docbook.catalog"/>
         </xslt>
     </target>
 
     <target name="docbook-html-doc" depends="docbook-init">
-        <foreach target="docbook-html-doc-single" list="${project.docbook.filelist}" param="docbook.file"/>
+       <antcall target="docbook-html-doc-single">
+               <param name="docbook.file" value="LanguageGuide" />
+       </antcall>
+       <antcall target="docbook-html-doc-single">
+               <param name="docbook.file" value="DeveloperGuide" />
+       </antcall>
     </target>
 
     <target name="docbook-pdf-doc-single" depends="docbook-init">
@@ -252,29 +260,32 @@
             force="true"
             in="${project.docbook}/${docbook.file}.xml"
             out="${output.docbook.fop}/${docbook.file}.fop">
+            <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/>
             <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/>
             <param name="project.docbook.file" expression="${docbook.file}"/>
             <param name="use.id.as.filename" expression="1"/>
+            <param name="fop.extensions" expression="0"/>
+            <param name="fop1.extensions" expression="0"/>
             <xmlcatalog refid="docbook.catalog"/>
         </xslt>
     </target>
 
     <target name="docbook-convert-fo-to-pdf" unless="uptodate.pdf">
         <echo>Converting FO to PDF ...</echo>
-        <java classname="org.apache.fop.apps.Fop" fork="true">
-            <classpath>
-                <fileset dir="${fop.dir}">
-                    <include name="**/*.jar"/>
-                </fileset>
-            </classpath>
+        <exec executable="/usr/bin/fop">
             <arg line="-q"/>
             <arg line="-fo ${output.docbook.fop}/${docbook.file}.fop"/>
             <arg line="-pdf ${output.docbook.pdf}/${docbook.file}.pdf"/>
-        </java>
+        </exec>
     </target>
 
     <target name="docbook-pdf-doc" depends="docbook-init">
-        <foreach target="docbook-pdf-doc-single" list="${project.docbook.filelist}" param="docbook.file"/>
+       <antcall target="docbook-pdf-doc-single">
+               <param name="docbook.file" value="LanguageGuide" />
+       </antcall>
+       <antcall target="docbook-pdf-doc-single">
+               <param name="docbook.file" value="DeveloperGuide" />
+       </antcall>
     </target>
 
 </project>
--- a/osbuild.xml
+++ b/osbuild.xml
@@ -138,14 +138,11 @@
                  classpathref="cp"
                  author="true"
                  version="true"
-                 overview="${src.java}/overview.html"
                  windowTitle="${fullname} API - ${version}"
                  doctitle="${fullname} API (${version})"
                  footer="&lt;a href=&quot;http://www.opensymphony.com/${name}/&quot; target=&quot;_top&quot;&gt;${fullname} Project Page&lt;/a&gt;"
                  use="true"
                  verbose="false">
-            <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/>
-            <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/>
         </javadoc>
         <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> -->
     </target>
--- a/build.xml
+++ b/build.xml
@@ -59,12 +59,12 @@
     </target>
 
     <target name="javacc-generate">
-        <java classname="org.javacc.jjtree.Main" classpathref="cp" fork="true">
+        <java classname="org.javacc.jjtree.Main" fork="false">
             <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/>
             <arg value="${src.java}/ognl/ognl.jjt"/>
         </java>
 
-        <java classname="org.javacc.parser.Main" classpathref="cp" fork="true">
+        <java classname="org.javacc.parser.Main" fork="false">
             <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/>
             <arg value="${src.java}/ognl/ognl.jj"/>
         </java>
