You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2007/04/09 23:51:48 UTC

svn commit: r526931 - in /incubator/uima/uimaj/trunk/uima-docbook-tool: build/build-docbook.xml styles/uima-style/titlepage/titlepage-pdf.xsl tools/fop-versions/README.txt tools/fop-versions/fop-0.93/README.txt

Author: schor
Date: Mon Apr  9 14:51:33 2007
New Revision: 526931

URL: http://svn.apache.org/viewvc?view=rev&rev=526931
Log:
UIMA-236 fix issues with URL versus file paths in ant script,
remove xsl version of title page left over from a test run,
move a REAME to cover both versions of FOP.

Added:
    incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/README.txt
Removed:
    incubator/uima/uimaj/trunk/uima-docbook-tool/styles/uima-style/titlepage/titlepage-pdf.xsl
    incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/fop-0.93/README.txt
Modified:
    incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml?view=diff&rev=526931&r1=526930&r2=526931
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml Mon Apr  9 14:51:33 2007
@@ -119,86 +119,110 @@
 	
 	<target name="init_once" depends="init_once_a, fop-0.20.5, fop-0.93, saxon-6.5.5, saxon-8.9" description="sets properties, once"/>
 	
-	<target name="init_once_a">
-
-		<property name="docbook.tool.project" location="${ant.file.build-docbook}/../.."/>
-		<property name="jai.version" value="1.1.3"/>  <!-- only this version supported in the auto download script -->
-		<!-- Load our properties -->
-		<!-- if the file is not there, it is not an error - it is just skipped -->
-		<!-- earlier files override later ones -->
-	  <property file="local.docbook.properties"/>  <!-- load from caller project -->
-
-		<property file="${docbook.tool.project}/properties/default.docbook.properties"/>
-
-		<!-- if chapter_name is not set, set it to the book_name -->
-		<property name="chapter_name" value="${book_name}"/>
-		
-		<!-- if docbook.outname is not set, set it to the chapter_name -->
-		<property name="docbook.outname" value="${chapter_name}"/>
-
-		<!-- if olink_work is not set, set it to yes -->
-		<property name="olink_work" value="yes"/>
-
-		<!-- skip some steps if olink_work value is "only" -->
-		<condition property="do_olinkdb_only">
-			<equals arg1="${olink_work}" arg2="only"/>
-	  </condition>
-		
-		<!-- default styles and css -->
-	  <property name="css_styles_prefix" location="${docbook.tool.project}/styles/uima-style"/>
-		
-	  <property name="css.dir"    value="${css_styles_prefix}/css"/>
-	  <property name="styles.dir" value="${css_styles_prefix}"/>
-		
-		<property name="docbook.tools.lib.dir" location="${docbook.tool.project}/tools/common-lib"/>
-		<property name="docbook.ref.dir" location="${docbook.tool.project}/tools/docbook-versions"/>
-		<property name="docbook.xsl.dir" location="${docbook.ref.dir}/docbook-xsl-${docbook.xsl.version}"/>
-		<property name="docbook.xml.dir" location="${docbook.ref.dir}/docbook-xml-${docbook.xml.version}"/>
-		<property name="saxon.dir"       location="${docbook.tool.project}/tools/saxon-versions/saxon-${saxon.version}"/>
-		<property name="jai.dir"         location="${docbook.tool.project}/tools/jai-versions/jai-${jai.version}"/>
-		<property name="tmp.dir"         location="${target.dir}/temp"/> <!-- in caller's project -->
-		<property name="fop.config"      location="${docbook.tool.project}/tools/fop-versions/fop-${fop.version}/fop-config.xml"/>
-
-		<!-- ======================================================================== -->
-		<!-- ==                                                                    == -->
-		<!-- == Set up the classpath for the XSLT conversion                       == -->
-		<!-- ==   and for running FOP                                              == -->
-		<!-- ==                                                                    == -->
-		<!-- ======================================================================== -->
-
-		<path id="saxon_and_fop.classpath">
-			<!-- xercesImpl.jar comes first to allow using XInclude -->
-			<pathelement location="${docbook.tools.lib.dir}/xercesImpl.jar"/>
-			<pathelement location="${docbook.tools.lib.dir}/xml-apis.jar"/>
-			<fileset dir="${docbook.tool.project}/tools/fop-versions/fop-${fop.version}"
-			         includes="*.jar"/>
-			<fileset dir="${saxon.dir}" includes="*.jar"/>
-			<fileset dir="${docbook.tools.lib.dir}" includes="*.jar"/>
-
-			<fileset dir="${docbook.xsl.dir}/extensions">
-				<include name="${xslt-db.jar}"/>
-			</fileset>
-			
-			<fileset dir="${jai.dir}" includes="*.jar"/>
-			
-			<!--  Needed to find CatalogManager.properties -->
-			<pathelement location="${docbook.tool.project}/catalog/docbook.version_${docbook.xml.version}"/>
-		</path>
-		
-		<uptodate property="title-pdf-uptodate"
-			           srcfile="${local.titlepage.dir}/titlepage-pdf.xml"
-			           targetfile="${local.titlepage.dir}/titlepage-pdf.xsl"/>
-		<uptodate property="title-html-uptodate"
-			           srcfile="${local.titlepage.dir}/titlepage-html.xml"
-			           targetfile="${local.titlepage.dir}/titlepage-html.xsl"/>
-		
-		<condition property="fop-0.20.5"> <equals arg1="0.20.5" arg2="${fop.version}"/></condition>
-		<condition property="fop-0.93">   <equals arg1="0.93"   arg2="${fop.version}"/></condition>
-		<condition property="saxon-6.5.5"><equals arg1="6.5.5"  arg2="${saxon.version}"/></condition>
-		<condition property="saxon-8.9">  <equals arg1="8.9"    arg2="${saxon.version}"/></condition>
-		
+  <target name="init_once_a">
+    
+    <path id="docbook.tool.project" location="${ant.file.build-docbook}/../.."/>
+    <pathconvert dirsep="/" property="docbook.tool.project" refid="docbook.tool.project"/>
+    
+    <!--property name="docbook.tool.project" location="${ant.file.build-docbook}/../.."/-->
+    
+    <property name="jai.version" value="1.1.3"/>
+    <!-- only this version supported in the auto download script -->
+    <!-- Load our properties -->
+    <!-- if the file is not there, it is not an error - it is just skipped -->
+    <!-- earlier files override later ones -->
+    <property file="local.docbook.properties"/> <!-- load from caller project -->
+    
+    <property
+      file="${docbook.tool.project}/properties/default.docbook.properties"/>
+    
+    <!-- if chapter_name is not set, set it to the book_name -->
+    <property name="chapter_name" value="${book_name}"/>
+    
+    <!-- if docbook.outname is not set, set it to the chapter_name -->
+    <property name="docbook.outname" value="${chapter_name}"/>
+    
+    <!-- if olink_work is not set, set it to yes -->
+    <property name="olink_work" value="yes"/>
+    
+    <!-- skip some steps if olink_work value is "only" -->
+    <condition property="do_olinkdb_only">
+      <equals arg1="${olink_work}" arg2="only"/>
+    </condition>
+    
+    <!-- default styles and css -->
+    <property name="css_styles_prefix" value="${docbook.tool.project}/styles/uima-style"/>
+    
+    <property name="css.dir" value="${css_styles_prefix}/css"/>
+    <property name="styles.dir" value="${css_styles_prefix}"/>
+    
+    <property name="docbook.tools.lib.dir" value="${docbook.tool.project}/tools/common-lib"/>
+    <property name="docbook.ref.dir" value="${docbook.tool.project}/tools/docbook-versions"/>
+    <property name="docbook.xsl.dir" value="${docbook.ref.dir}/docbook-xsl-${docbook.xsl.version}"/>
+    <property name="docbook.xml.dir" value="${docbook.ref.dir}/docbook-xml-${docbook.xml.version}"/>
+    <property name="saxon.dir" value="${docbook.tool.project}/tools/saxon-versions/saxon-${saxon.version}"/>
+    <property name="jai.dir" value="${docbook.tool.project}/tools/jai-versions/jai-${jai.version}"/>
+    <property name="fop.config" value="${docbook.tool.project}/tools/fop-versions/fop-${fop.version}/fop-config.xml"/>
+    
+    
+    <!-- ======================================================================== -->
+    
+    <!-- ==                                                                    == -->
+    
+    <!-- == Set up the classpath for the XSLT conversion                       == -->
+    
+    <!-- ==   and for running FOP                                              == -->
+    
+    <!-- ==                                                                    == -->
+    
+    <!-- ======================================================================== -->
+    
+    <path id="saxon_and_fop.classpath">
+      <!-- xercesImpl.jar comes first to allow using XInclude -->
+      <pathelement location="${docbook.tools.lib.dir}/xercesImpl.jar"/>
+      <pathelement location="${docbook.tools.lib.dir}/xml-apis.jar"/>
+      <fileset
+        dir="${docbook.tool.project}/tools/fop-versions/fop-${fop.version}"
+        includes="*.jar"/>
+      <fileset dir="${saxon.dir}" includes="*.jar"/>
+      <fileset dir="${docbook.tools.lib.dir}" includes="*.jar"/>
+      
+      <fileset dir="${docbook.xsl.dir}/extensions">
+        <include name="${xslt-db.jar}"/>
+      </fileset>
+      
+      <fileset dir="${jai.dir}" includes="*.jar"/>
+      
+      <!--  Needed to find CatalogManager.properties -->
+      <pathelement location="${docbook.tool.project}/catalog/docbook.version_${docbook.xml.version}"/>
+    </path>
+    
+    <uptodate property="title-pdf-uptodate"
+      srcfile="${local.titlepage.dir}/titlepage-pdf.xml"
+      targetfile="${local.titlepage.dir}/titlepage-pdf.xsl"/>
+    <uptodate property="title-html-uptodate"
+      srcfile="${local.titlepage.dir}/titlepage-html.xml"
+      targetfile="${local.titlepage.dir}/titlepage-html.xsl"/>
+    
+    <condition property="fop-0.20.5">
+      <equals arg1="0.20.5" arg2="${fop.version}"/></condition>
+    <condition property="fop-0.93">
+      <equals arg1="0.93" arg2="${fop.version}"/></condition>
+    <condition property="saxon-6.5.5"><equals arg1="6.5.5"
+        arg2="${saxon.version}"/></condition>
+    <condition property="saxon-8.9">
+      <equals arg1="8.9" arg2="${saxon.version}"/></condition>
+    
+    <path id="olink.dir.path" location="${olink.dir}"/>
+    <pathconvert dirsep="/" property="olink.dir.path" refid="olink.dir.path"/>
+    
+    <path id="target.dir.path" location="${target.dir}"/>
+    <pathconvert dirsep="/" property="target.dir.path" refid="target.dir.path"/>
+    <property name="tmp.dir" value="${target.dir.path}/temp"/>
+    <!-- in caller's project -->
+    
     <!--echoproperties/-->
-	</target>
+  </target>
 	
 	<target name="fop-0.20.5" if="fop-0.20.5">
 		<property name="docbook.fop.extensions" value="fop.extensions"/>
@@ -323,7 +347,7 @@
 	<!-- ======================================================================== -->
 	<target name="clean" depends="init_once"
           description="--> Delete temporary and distribution directories for docs">
-		<delete quiet="true" dir="${target.dir}"/>
+		<delete quiet="true" dir="${target.dir.path}"/>
 	</target>
 
 	<!-- ======================================================================== -->
@@ -336,17 +360,17 @@
 	<target name="transform-pdf" depends="transform-title-pdf, transform-source-pdf" description="--> internal transform for pdf output"/>
 	
 	<target name="transform-source-pdf" description="--> internal transform source for pdf output">
-			
+		<!--echo message="docbook.xsl.root = file:///${docbook.xsl.dir}"/-->	
 		<saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
-           output="${target.dir}/${chapter_name}/${docbook.outname}.pdf_src.xml"
+           output="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"
            style="${src.dir}/styles/top/pdf.xsl"
 		       params="fop.version=${fop.version} 
 		               paper.type=${paper.type} 
 		               collect.xref.targets=${olink_work} 
-		               targets.filename=${olink.dir}/${chapter_name}/pdf-target.db
-		               target.database.document=${olink.dir}/olink_db_pdf.xml
+		               targets.filename=${olink.dir.path}/${chapter_name}/pdf-target.db
+		               target.database.document=file:///${olink.dir.path}/olink_db_pdf.xml
 		               current.docid=${chapter_name}
-			             docbook.xsl.root=${docbook.xsl.dir}			             
+			             docbook.xsl.root=file:///${docbook.xsl.dir}			             
 			             "/>
 	</target>
 	
@@ -366,11 +390,11 @@
   	      unless="do_olinkdb_only">
   	
 		<java classname="${fop.main.class}" fork="true" maxmemory="256m"
-          dir="${target.dir}/${chapter_name}" classpathref="saxon_and_fop.classpath">
+          dir="${target.dir.path}/${chapter_name}" classpathref="saxon_and_fop.classpath">
 			<arg value="-c"/>
 			<arg value="${fop.config}"/>
-			<arg value="${target.dir}/${chapter_name}/${docbook.outname}.pdf_src.xml"/>
-			<arg value="${target.dir}/${chapter_name}/${docbook.outname}.pdf"/>
+			<arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"/>
+			<arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf"/>
 		</java>
   	
 	</target>
@@ -398,16 +422,22 @@
           description="--> Generate HTML docs in a single, big file"/>
 
 	<target name="transform-html-single">
-		<echo message="${src.dir}/styles/top/html-single.xsl"/>
+		<!--echo message="${target.dir.path}/${chapter_name}/${docbook.outname}.html"/>
+		<echo message="olink work = ${olink_work}"/-->
 		<saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
-           output="${target.dir}/${chapter_name}/${docbook.outname}.html"
+           output="${target.dir.path}/${chapter_name}/${docbook.outname}.html"
            style="${src.dir}/styles/top/html-single.xsl"
 		       params="fop-version=$fop.version 
 		               paper.type=${paper.type} 
 		               collect.xref.targets=${olink_work} 
-		               targets.filename=${olink.dir}/${chapter_name}/htmlsingle-target.db
-		               target.database.document=${olink.dir}/olink_db_htmlsingle.xml
+		               targets.filename=${olink.dir.path}/${chapter_name}/htmlsingle-target.db
+		               target.database.document=file:///${olink.dir.path}/olink_db_htmlsingle.xml
 		               current.docid=${chapter_name}"/>
+		
+    	<copy todir="${target.dir.path}/images/${book_name}">
+			<fileset dir="${docbook.src.dir}/${book_name}/images"/>
+		</copy>
+
 	</target>
 	
 	<!-- ======================================================================== -->
@@ -420,11 +450,11 @@
 	<!-- ======================================================================== -->
 
 	<target name="copy-docbook-images-and-css"  unless="${do_olinkdb_only}">
-		<copy todir="${target.dir}/images">
+		<copy todir="${target.dir.path}/images">
 			<fileset dir="${docbook.xsl.dir}/images/"/>
 		</copy>
 
-		<copy todir="${target.dir}/${chapter_name}/css">
+		<copy todir="${target.dir.path}/${chapter_name}/css">
 			<fileset dir="${css.dir}"/>
 		</copy>
 		

Added: incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/README.txt
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/README.txt?view=auto&rev=526931
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/README.txt (added)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/tools/fop-versions/README.txt Mon Apr  9 14:51:33 2007
@@ -0,0 +1,154 @@
+
+Information on Apache FOP dependencies
+=========================================
+
+$Id$
+
+The Apache Licenses can also be found here:
+http://www.apache.org/licenses/
+
+
+Normal Dependencies
+----------------------
+
+- Apache Jakarta Commons IO
+
+    commons-io-*.jar
+    http://jakarta.apache.org/commons/io/
+    (I/O routines)
+    
+    Apache License v2.0
+    
+- Apache Jakarta Commons Logging
+
+    commons-logging-*.jar
+    http://jakarta.apache.org/commons/logging/
+    (Logging adapter for various logging backends like JDK 1.4 logging or Log4J)
+    
+    Apache License v2.0
+
+- Apache Avalon Framework
+
+    avalon-framework-*.jar
+    http://excalibur.apache.org/framework/
+    (Avalon Framework, maintained by the Apache Excalibur project)
+    
+    Apache License v2.0
+
+- Apache XML Graphics Commons
+
+    xmlgraphics-commons-*.jar
+    http://xmlgraphics.apache.org/
+    (Common Library for Apache Batik and Apache FOP)
+    
+    Apache License v2.0
+
+- Apache Batik
+
+    batik-*.jar
+    http://xmlgraphics.apache.org/batik/
+    (SVG Implementation)
+    
+    Apache License v2.0
+
+
+
+Special Dependencies
+-----------------------
+
+The special dependencies are the whole JAXP set which required for users
+on JDK 1.3.x which doesn't include JAXP. But it is also interesting for
+users on JDKs >= 1.4 if they want to replace the default JAXP 
+implementation delivered by the JDK.
+
+Replacing the default implementations involves understanding the 
+"Endorsed Standards Override Mechanism".
+More information can be found here:
+http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html
+
+- JAXP API
+
+    xml-apis.jar
+    http://xml.apache.org/commons/components/external/
+    (the JAXP API, plus SAX and various W3C DOM Java bindings,
+    maintained in XML Commons Externals)
+    
+    Apache License v2.0 (applies to the distribution)
+    SAX is in the public domain
+        http://www.saxproject.org/copying.html
+    W3C Software Notice and License (applies to the various DOM Java bindings)
+    W3C Document License (applies to the DOM documentation)
+        http://www.w3.org/Consortium/Legal/copyright-software
+        http://www.w3.org/Consortium/Legal/copyright-documents
+        http://www.w3.org/Consortium/Legal/
+
+- Apache Xerces-J
+
+    xercesImpl-*.jar
+    http://xerces.apache.org
+    (JAXP-compliant XML parser and DOM Level 3 implementation)
+    
+    Apache License v2.0
+
+- Apache Xalan-J
+
+    xalan-*.jar and serializer-*.jar
+    http://xalan.apache.org
+    (JAXP-compliant XSLT and XPath implementation)
+    
+    Apache License v2.0 (applies to Xalan-J)
+    Apache License v1.1 (applies to Apache BCEL and Apache REGEXP bundled in the JAR)
+    Historical Permission Notice and Disclaimer (applies to CUP Parser Generator)
+        http://www.opensource.org/licenses/historical.php
+        (see xalan.runtime.LICENSE.txt)
+
+
+
+Optional Dependencies
+------------------------
+
+The following libraries are not bundled with FOP and must be installed manually.
+Please make sure you've read the license of each package.
+
+- JIMI Image library
+
+    http://java.sun.com/products/jimi
+    Sun Binary Code License
+
+- JAI (Java Advanced Imaging API)
+
+    http://java.sun.com/products/java-media/jai
+    Java Research License and Java Distribution License (Check which one applies to you!)
+
+- JEuclid (MathML implementation, for the MathML extension)
+
+    http://jeuclid.sourceforge.net/
+    http://sourceforge.net/projects/jeuclid
+    Apache License v1.1
+
+
+
+Additional development-time dependencies
+-------------------------------------------
+
+- Servlet API
+
+    servlet-*.jar
+    http://jakarta.apache.org/tomcat/
+    (Servlet API, javax.servlet)
+    
+    Apache License v1.1
+
+- Apache Ant
+
+    (not bundled, requires pre-installation)
+    http://ant.apache.org
+    (XML-based build system
+    
+    Apache License V2.0
+
+- JUnit
+
+    (not bundled, provided by Apache Ant or your IDE)
+    http://www.junit.org
+    Common Public License V1.0
\ No newline at end of file