velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r532512 - /velocity/docbook/trunk/build-docbook.xml
Date Wed, 25 Apr 2007 22:37:24 GMT
Author: henning
Date: Wed Apr 25 15:37:23 2007
New Revision: 532512

URL: http://svn.apache.org/viewvc?view=rev&rev=532512
Log:
move to xalan and fop 0.93


Modified:
    velocity/docbook/trunk/build-docbook.xml

Modified: velocity/docbook/trunk/build-docbook.xml
URL: http://svn.apache.org/viewvc/velocity/docbook/trunk/build-docbook.xml?view=diff&rev=532512&r1=532511&r2=532512
==============================================================================
--- velocity/docbook/trunk/build-docbook.xml (original)
+++ velocity/docbook/trunk/build-docbook.xml Wed Apr 25 15:37:23 2007
@@ -31,7 +31,7 @@
   <!-- ======================================================================== -->
   <path id="dbf.classpath">
     <fileset dir="${dbf.basedir}/lib">
-      <include name="*.jar"/>
+      <include name="**/*.jar"/>
     </fileset>
     <fileset dir="${dbf.xsl.dir}/extensions">
       <include name="${xslt-db.jar}"/>
@@ -76,31 +76,34 @@
 
   <!-- ======================================================================== -->
   <!-- ==                                                                    == -->
-  <!-- == Saxon Converter macro that uses commons-resolver                   == -->
+  <!-- == Xalan Converter macro that uses commons-resolver                   == -->
   <!-- ==                                                                    == -->
   <!-- == input: The file to transform                                       == -->
   <!-- == output: The transformation result                                  == -->
   <!-- == style: The Style Sheet used for the transformation                 == -->
   <!-- ==                                                                    == -->
   <!-- ======================================================================== -->
-  <macrodef name="saxon">
+  <macrodef name="xalan">
     <attribute name="input"/>
     <attribute name="output"/>
     <attribute name="style"/>
     <sequential>
-      <java classname="com.icl.saxon.StyleSheet" fork="true"
+      <java classname="org.apache.xalan.xslt.Process" fork="true"
             dir="${basedir}" classpathref="dbf.classpath">
-        <arg line="-x org.apache.xml.resolver.tools.ResolvingXMLReader"/>
-        <arg line="-y org.apache.xml.resolver.tools.ResolvingXMLReader"/>
-        <arg line="-r org.apache.xml.resolver.tools.CatalogResolver"/>
-        <arg value="-o"/>
+        <arg line="-URIRESOLVER org.apache.xml.resolver.tools.CatalogResolver"/>
+        <arg line="-ENTITYRESOLVER org.apache.xml.resolver.tools.CatalogResolver"/>
+        <arg value="-OUT"/>
         <arg value="@{output}"/>
+        <arg value="-IN"/>
         <arg value="@{input}"/>
+        <arg value="-XSL"/>
         <arg value="@{style}"/>
       </java>
     </sequential>
   </macrodef>
 
+
+
   <!-- ======================================================================== -->
   <!-- ==                                                                    == -->
   <!-- == Transformation Macro that generates output from Docbook            == -->
@@ -154,7 +157,7 @@
     <copy file="${styles.src.dir}/@{title}/titlepage.xml" tofile="${@{type}.tmp.titlepage}.xml"
overwrite="true" failonerror="false" />
     <copy file="${dbf.xsl.dir}/@{xsl}/titlepage.templates.xml" tofile="${@{type}.tmp.titlepage}.xml"
overwrite="false" failonerror="true" />
 
-    <saxon input="${@{type}.tmp.titlepage}.xml"
+    <xalan input="${@{type}.tmp.titlepage}.xml"
            output="${@{type}.tmp.titlepage}.xsl"
            style="${dbf.xsl.dir}/template/titlepage.xsl"/>
 
@@ -162,7 +165,7 @@
       <fileset dir="${images.src.dir}"/>
     </copy>
 
-    <saxon input="${docbook.src.dir}/@{dir}/@{file}.xml"
+    <xalan input="${docbook.src.dir}/@{dir}/@{file}.xml"
            output="${@{type}.target.file}.xml"
            style="${@{type}.tmp.style}"/>
 
@@ -254,7 +257,7 @@
 
     <mkdir dir="${target.dir}/${docbook.dir}/pdf"/>
 
-    <java classname="org.apache.fop.apps.Fop" fork="true" maxmemory="256m"
+    <java classname="org.apache.fop.cli.Main" fork="true" maxmemory="256m"
           dir="${basedir}" classpathref="dbf.classpath">
       <arg value="${pdf.target.file}.xml"/>
       <arg value="${target.dir}/${docbook.dir}/pdf/${docbook.file}.pdf"/>



Mime
View raw message