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 2008/08/28 23:54:00 UTC

svn commit: r690022 [1/2] - in /incubator/uima/uimaj/trunk/uima-docbook-tool: ./ build/ catalog/docbook.version_4.4/ catalog/docbook.version_4.5/ properties/ samples/ samples/titlepage/ samples/top/ styles/uima-style/common/

Author: schor
Date: Thu Aug 28 14:53:59 2008
New Revision: 690022

URL: http://svn.apache.org/viewvc?rev=690022&view=rev
Log:
[UIMA-1163] found several files with mixed line-endings.

Modified:
    incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/README   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/README.FIRST   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/xml-catalog.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.5/CatalogManager.properties   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.5/xml-catalog.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/properties/default.docbook.properties   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/build_book-name.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/local.docbook.properties   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/titlepage/titlepage-html.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/titlepage/titlepage-pdf.xml   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/top/html-chunked.xsl   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/top/html-single.xsl   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/samples/top/pdf.xsl   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/styles/uima-style/common/entities.ent   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/styles/uima-style/common/html-pdf.xsl   (contents, props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/styles/uima-style/common/html.xsl   (props changed)
    incubator/uima/uimaj/trunk/uima-docbook-tool/xinclude.mod   (contents, props changed)

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO Thu Aug 28 14:53:59 2008
@@ -1,101 +1,101 @@
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
-================================
-= How to use the docbook tool. = 
-================================
-
-The tooling is set up assuming you put your documentation in another directory
-which is parallel (has the same ancestor) as the uima-docbook-tool directory.
-Furthermore, it assumes the target output directory for generated code is 
-some directory (name is arbitrary) at the top level of your documentation project.
-(This follows maven conventions).
-
-
-Step 1: Create a project (if necessary) for your docbook documentation.
-
-Step 2: Organize the documentation into one or more "books".  
-
-  Directory structure to create:  
-      ... (at some level) ... /your-first-book-name
-      ... (at some level) ... /your-second-book-name
-        etc.
-        
-    Within each book-name, you have subdirectories for chapters.  These
-    are "xi:include-d" into a "master" file, which should be named
-    the same as the book.  So, a typical book looks like:
-    
-      ... (at some level) ... /my-book-name/my-book-name.xml  <<-- the "master" file
-      ... (at some level) ... /my-book-name/my-chapter1-name.xml  <<-- included files
-      ... (at some level) ... /my-book-name/my-chapter2-name.xml  <<-- included files
-                  etc.
-                 
-Step 3: copy the contents of the "samples" directory into your docbook project,
-        in the src/styles directory.  You should end up with 
-        src/styles/top and src/styles/titlepage directories.
-                  
-Step 4: modify the "local.docbook.properties", 
-        to fit your requirements and directory layout
-
-        For each book you want to build, create a custom copy of
-        build_book-name.xml, modified to reference the book you want to build.
-        
-        Edit the files in the "top" directory and correct any relative path
-        specifications as needed to correspond to your directory layout.
-        
-        (Optional) Customize the "style": Change the titlepage files, and/or
-        add overrides to the xsl files in the "top" directory.  For instructions
-        on how to do this, see http://www.sagehill.net/book-description.html
-        (you can view this as an on-line book, or buy the book).  
-
-Step 5: build the book using the build_book-name.xml as an ANT script.
-
-
-=============
-=  T I P S  =
-=============
-
-Recommended editor = XMLBuddy plugin for Eclipse.  This will read the docbook dtd, 
-plus any customized Entities you might declare, and make them available for 
-Eclipse auto-completion and checking.
-
-Entities you declare can be put into shared entity files, and then
-essentially included in other files.  See Chapter 22 of the DocBook XSL, the 
-Complete Guide, for examples.
-
-
-=============================================================
-Path requirements:
-
-The target path must be a top level path in a parallel project directory.  
-The font config currently depends on this.
-
-NOTES:
-
-The functionality for xi:include relative linking when the thing being included was 
-in a different directory from the includer was broken.  
-This showed up in image fileref= attributes being improperly / inconsistently translated
-to src=... attributes in the generated xml.  Work-around: give up for now
-in having subdirectories - put all things into one directory.  (Note - as
-of April 2007 a bug in this area has been fix and this needs to be retested)
-
-The qandaset functionality works but the FOP processor 0.20.5 seems to have trouble
-handling id= attributes; it's giving an incorrect error message about a duplicate id tag,
-when, in fact, there is no duplicate.  Work-around: give up using qandaset - just use
-variablelist instead. (4/2007: Needs retesting on FOP 0.93 and newer level of docbook)
-
-Parameters for Docbook are described in the FO ref:
-http://docbook.sourceforge.net/release/xsl/current/doc/fo/index.html
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+================================
+= How to use the docbook tool. = 
+================================
+
+The tooling is set up assuming you put your documentation in another directory
+which is parallel (has the same ancestor) as the uima-docbook-tool directory.
+Furthermore, it assumes the target output directory for generated code is 
+some directory (name is arbitrary) at the top level of your documentation project.
+(This follows maven conventions).
+
+
+Step 1: Create a project (if necessary) for your docbook documentation.
+
+Step 2: Organize the documentation into one or more "books".  
+
+  Directory structure to create:  
+      ... (at some level) ... /your-first-book-name
+      ... (at some level) ... /your-second-book-name
+        etc.
+        
+    Within each book-name, you have subdirectories for chapters.  These
+    are "xi:include-d" into a "master" file, which should be named
+    the same as the book.  So, a typical book looks like:
+    
+      ... (at some level) ... /my-book-name/my-book-name.xml  <<-- the "master" file
+      ... (at some level) ... /my-book-name/my-chapter1-name.xml  <<-- included files
+      ... (at some level) ... /my-book-name/my-chapter2-name.xml  <<-- included files
+                  etc.
+                 
+Step 3: copy the contents of the "samples" directory into your docbook project,
+        in the src/styles directory.  You should end up with 
+        src/styles/top and src/styles/titlepage directories.
+                  
+Step 4: modify the "local.docbook.properties", 
+        to fit your requirements and directory layout
+
+        For each book you want to build, create a custom copy of
+        build_book-name.xml, modified to reference the book you want to build.
+        
+        Edit the files in the "top" directory and correct any relative path
+        specifications as needed to correspond to your directory layout.
+        
+        (Optional) Customize the "style": Change the titlepage files, and/or
+        add overrides to the xsl files in the "top" directory.  For instructions
+        on how to do this, see http://www.sagehill.net/book-description.html
+        (you can view this as an on-line book, or buy the book).  
+
+Step 5: build the book using the build_book-name.xml as an ANT script.
+
+
+=============
+=  T I P S  =
+=============
+
+Recommended editor = XMLBuddy plugin for Eclipse.  This will read the docbook dtd, 
+plus any customized Entities you might declare, and make them available for 
+Eclipse auto-completion and checking.
+
+Entities you declare can be put into shared entity files, and then
+essentially included in other files.  See Chapter 22 of the DocBook XSL, the 
+Complete Guide, for examples.
+
+
+=============================================================
+Path requirements:
+
+The target path must be a top level path in a parallel project directory.  
+The font config currently depends on this.
+
+NOTES:
+
+The functionality for xi:include relative linking when the thing being included was 
+in a different directory from the includer was broken.  
+This showed up in image fileref= attributes being improperly / inconsistently translated
+to src=... attributes in the generated xml.  Work-around: give up for now
+in having subdirectories - put all things into one directory.  (Note - as
+of April 2007 a bug in this area has been fix and this needs to be retested)
+
+The qandaset functionality works but the FOP processor 0.20.5 seems to have trouble
+handling id= attributes; it's giving an incorrect error message about a duplicate id tag,
+when, in fact, there is no duplicate.  Work-around: give up using qandaset - just use
+variablelist instead. (4/2007: Needs retesting on FOP 0.93 and newer level of docbook)
+
+Parameters for Docbook are described in the FO ref:
+http://docbook.sourceforge.net/release/xsl/current/doc/fo/index.html

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/HOW_TO
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/README.FIRST
------------------------------------------------------------------------------
    svn:eol-style = native

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?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml Thu Aug 28 14:53:59 2008
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->
-
-<!-- This file is <imported...> into other files, so the 
-       properties it sets can be referenced there
-  -->
-
-<project name="common-properties-per-build">
-		
-	<target name="all" depends="prepare, copy-docbook-images">
-	  <ant antfile="${docbook.tool.project}/build/process-one-book.xml">
-	    <reference refid="saxon_and_fop.classpath"/>
-	  </ant> 
-	</target>
-	
-	<target name="setup-common-properties-per-build">
-
-		<available property="isJava5orHigher" classname="java.util.concurrent.atomic.AtomicBoolean"/>
-		<fail message="This script requires Java level 5 or better, and won't run on earlier JVM versions"
-  	      unless="isJava5orHigher"/>
-
-		<path id="docbook.tool.project" location="${ant.file.common-properties-per-build}/../.."/>
-		<pathconvert dirsep="/" property="docbook.tool.project" refid="docbook.tool.project"/>
-
-		<property name="jai.version" value="1.1.3"/>
-		<!-- only this version supported in the auto download script -->
-
-		<!-- Load local 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"/>
-
-		<!-- clumsy ant if statements -->
-		<condition property="docbook.fop.extensions" value="fop.extensions">
-			<equals arg1="0.20.5" arg2="${fop.version}"/>
-		</condition>
-		<condition property="fop.main.class" value="org.apache.fop.apps.Fop">
-			<equals arg1="0.20.5" arg2="${fop.version}"/>
-		</condition>
-
-		<condition property="docbook.fop.extensions" value="fop1.extensions">
-			<equals arg1="0.93" arg2="${fop.version}"/>
-		</condition>
-		<condition property="fop.main.class" value="org.apache.fop.cli.Main">
-			<equals arg1="0.93" arg2="${fop.version}"/>
-		</condition>
-
-		<condition property="saxon.main.class" value="com.icl.saxon.StyleSheet">
-			<equals arg1="6.5.5" arg2="${saxon.version}"/>
-		</condition>
-		<condition property="saxon.main.class" value="net.sf.saxon.Transform">
-			<equals arg1="8.9" arg2="${saxon.version}"/>
-		</condition>
-
-		<!-- computed defaults -->
-
-		<property name="src.dir" value="${basedir}/src" />
-		<property name="styles.dir" value="${src.dir}/styles" />
-		<property name="docbook.src.dir" value="${src.dir}/docbook" />
-		<property name="olink.dir" value="${src.dir}/olink" />
-
-		<property name="css.dir" value="${docbook.tool.project}/styles/uima-style/css" />
-		<property name="local.titlepage.dir" value="${styles.dir}/titlepage"/>
-
-		<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"/>
-
-		<path id="olink.dir.path" location="${olink.dir}" />
-		<pathconvert dirsep="/" property="olink.dir.path" refid="olink.dir.path" />
-
-		<property name="target.dir" value="${basedir}/target" />
-		<!-- ======================================================================== -->
-		<!-- ==                                                                    == -->
-		<!-- == 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-2.7.1.jar"/>
-			<pathelement location="${docbook.tools.lib.dir}/xml-apis-1.3.02.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"/>
-
-		<property name="target.dir" value="${basedir}/target"/>
-		<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 -->
-
-	</target>
-
-	<!-- =========================================================================== -->
-	<!-- ==                                                                       == -->
-	<!-- == prepare temporary directories and get components                      == -->
-	<!-- ==                                                                       == -->
-	<!-- =========================================================================== -->
-	<target name="prepare" depends="setup-common-properties-per-build, setup-availables, 
-		make-temp-dir, test-saxon-available, test-docbook-available, test-jai-available">
-	</target>
-	
-	<target name="make-temp-dir">
-		<mkdir dir="${tmp.dir}"/>
-  </target>
-	
-	<target name="setup-availables">
-		<available file="${saxon.dir}/saxon.jar" property="saxon.available"/>
-		<available file="${docbook.xml.dir}/catalog.xml" property="docbook.available"/>
-		<available file="${jai.dir}/jai_core.jar" property="jai.available"/>
-	</target>
-	
-	<target name="test-saxon-available" unless="saxon.available">
-	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-saxon"/>
-	</target>
-
-	<target name="test-docbook-available" unless="docbook.available">
-	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-docbook"/>
-	</target>
-
-	<target name="test-jai-available" unless="jai.available">
-	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-jai"/>
-	</target>
-
-  <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Clean up the target directory                                      == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <target name="clean" depends="setup-common-properties-per-build"
-    description="--> Delete temporary and distribution directories for docs">
-    <delete quiet="true" dir="${target.dir.path}"/>
-  </target>
-
-
-	<!-- ======================================================================== -->
-	<!-- == Subroutine: Copy the docbook system images                         == -->
-	<!-- ======================================================================== -->
-
-	<target name="copy-docbook-images">
-
-		<copy todir="${target.dir.path}/images">
-			<fileset dir="${docbook.xsl.dir}/images/"/>
-		</copy>
-
-	</target>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+
+<!-- This file is <imported...> into other files, so the 
+       properties it sets can be referenced there
+  -->
+
+<project name="common-properties-per-build">
+		
+	<target name="all" depends="prepare, copy-docbook-images">
+	  <ant antfile="${docbook.tool.project}/build/process-one-book.xml">
+	    <reference refid="saxon_and_fop.classpath"/>
+	  </ant> 
+	</target>
+	
+	<target name="setup-common-properties-per-build">
+
+		<available property="isJava5orHigher" classname="java.util.concurrent.atomic.AtomicBoolean"/>
+		<fail message="This script requires Java level 5 or better, and won't run on earlier JVM versions"
+  	      unless="isJava5orHigher"/>
+
+		<path id="docbook.tool.project" location="${ant.file.common-properties-per-build}/../.."/>
+		<pathconvert dirsep="/" property="docbook.tool.project" refid="docbook.tool.project"/>
+
+		<property name="jai.version" value="1.1.3"/>
+		<!-- only this version supported in the auto download script -->
+
+		<!-- Load local 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"/>
+
+		<!-- clumsy ant if statements -->
+		<condition property="docbook.fop.extensions" value="fop.extensions">
+			<equals arg1="0.20.5" arg2="${fop.version}"/>
+		</condition>
+		<condition property="fop.main.class" value="org.apache.fop.apps.Fop">
+			<equals arg1="0.20.5" arg2="${fop.version}"/>
+		</condition>
+
+		<condition property="docbook.fop.extensions" value="fop1.extensions">
+			<equals arg1="0.93" arg2="${fop.version}"/>
+		</condition>
+		<condition property="fop.main.class" value="org.apache.fop.cli.Main">
+			<equals arg1="0.93" arg2="${fop.version}"/>
+		</condition>
+
+		<condition property="saxon.main.class" value="com.icl.saxon.StyleSheet">
+			<equals arg1="6.5.5" arg2="${saxon.version}"/>
+		</condition>
+		<condition property="saxon.main.class" value="net.sf.saxon.Transform">
+			<equals arg1="8.9" arg2="${saxon.version}"/>
+		</condition>
+
+		<!-- computed defaults -->
+
+		<property name="src.dir" value="${basedir}/src" />
+		<property name="styles.dir" value="${src.dir}/styles" />
+		<property name="docbook.src.dir" value="${src.dir}/docbook" />
+		<property name="olink.dir" value="${src.dir}/olink" />
+
+		<property name="css.dir" value="${docbook.tool.project}/styles/uima-style/css" />
+		<property name="local.titlepage.dir" value="${styles.dir}/titlepage"/>
+
+		<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"/>
+
+		<path id="olink.dir.path" location="${olink.dir}" />
+		<pathconvert dirsep="/" property="olink.dir.path" refid="olink.dir.path" />
+
+		<property name="target.dir" value="${basedir}/target" />
+		<!-- ======================================================================== -->
+		<!-- ==                                                                    == -->
+		<!-- == 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-2.7.1.jar"/>
+			<pathelement location="${docbook.tools.lib.dir}/xml-apis-1.3.02.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"/>
+
+		<property name="target.dir" value="${basedir}/target"/>
+		<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 -->
+
+	</target>
+
+	<!-- =========================================================================== -->
+	<!-- ==                                                                       == -->
+	<!-- == prepare temporary directories and get components                      == -->
+	<!-- ==                                                                       == -->
+	<!-- =========================================================================== -->
+	<target name="prepare" depends="setup-common-properties-per-build, setup-availables, 
+		make-temp-dir, test-saxon-available, test-docbook-available, test-jai-available">
+	</target>
+	
+	<target name="make-temp-dir">
+		<mkdir dir="${tmp.dir}"/>
+  </target>
+	
+	<target name="setup-availables">
+		<available file="${saxon.dir}/saxon.jar" property="saxon.available"/>
+		<available file="${docbook.xml.dir}/catalog.xml" property="docbook.available"/>
+		<available file="${jai.dir}/jai_core.jar" property="jai.available"/>
+	</target>
+	
+	<target name="test-saxon-available" unless="saxon.available">
+	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-saxon"/>
+	</target>
+
+	<target name="test-docbook-available" unless="docbook.available">
+	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-docbook"/>
+	</target>
+
+	<target name="test-jai-available" unless="jai.available">
+	  <ant antfile="${docbook.tool.project}/build/get-components.xml" target="get-jai"/>
+	</target>
+
+  <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Clean up the target directory                                      == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <target name="clean" depends="setup-common-properties-per-build"
+    description="--> Delete temporary and distribution directories for docs">
+    <delete quiet="true" dir="${target.dir.path}"/>
+  </target>
+
+
+	<!-- ======================================================================== -->
+	<!-- == Subroutine: Copy the docbook system images                         == -->
+	<!-- ======================================================================== -->
+
+	<target name="copy-docbook-images">
+
+		<copy todir="${target.dir.path}/images">
+			<fileset dir="${docbook.xsl.dir}/images/"/>
+		</copy>
+
+	</target>
 </project>
\ No newline at end of file

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/build/build-docbook.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml Thu Aug 28 14:53:59 2008
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->
-
-<!-- This file is <imported...> into other files, so the 
-       properties it sets can be referenced there
-  -->
-
-<project name="common-properties-per-book">
-
-	<target name="setup-common-properties-per-book">
-
-		<fail message="You must set book_name">
-			<condition>
-				<not>
-					<isset property="book_name" />
-				</not>
-			</condition>
-		</fail>
-		
-		<!-- if chapter_name is not set, set it to the book_name -->
-		<condition property="chapter_name" value="${book_name}">
-			<isset property="book_name" />
-		</condition>
-
-		<condition property="docbook.outname" value="${chapter_name}">
-			<isset property="chapter_name" />
-		</condition>
-
-    <!-- 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>
-
-		<!-- set up to date values for this docbook -->
-		<uptodate property="target-book-pdf-uptodate">
-			<srcfiles dir="${styles.dir}" includes="**/*.*" />
-			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
-			<!--srcfiles dir="${olink.dir.path}" includes="*/pdf-target.db" /-->
-			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
-  		<mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}.pdf" />
-		</uptodate>
-		
-		<uptodate property="target-book-html-single-uptodate">
-			<srcfiles dir="${styles.dir}" includes="**/*.*" />
-			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
-			<!--srcfiles dir="${olink.dir.path}" includes="*/htmlsingle-target.db" /-->
-			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
-  	  <mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}.html" />
-		</uptodate>
-
-		<uptodate property="target-book-html-chunked-uptodate">
-			<srcfiles dir="${styles.dir}" includes="**/*.*" />
-			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
-			<!--srcfiles dir="${olink.dir.path}" includes="*/htmlchunked-target.db" /-->
-			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
-		  <mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}${file.separator}index.html" />
-    </uptodate>
-		
-		<uptodate property="target-book-images-uptodate">
-			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
-  	  <globmapper from="*" 
-	      to="${target.dir}${file.separator}images${file.separator}${book_name}${file.separator}*"/>
-    </uptodate>
-		
-		<condition property="skip-or-uptodate.pdf">
-			<or>
-				<isset property="skip.pdf" />
-				<isset property="target-book-pdf-uptodate" />
-			</or>
-		</condition>
-
-		<condition property="skip-or-uptodate.html-chunked">
-			<or>
-				<isset property="skip.html-chunked" />
-				<isset property="target-book-html-chunked-uptodate" />
-			</or>
-		</condition>
-
-		<condition property="skip-or-uptodate.html-single">
-			<or>
-				<isset property="skip.html-single" />
-				<isset property="target-book-html-single-uptodate" />
-			</or>
-		</condition>
-
-
-	</target>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+
+<!-- This file is <imported...> into other files, so the 
+       properties it sets can be referenced there
+  -->
+
+<project name="common-properties-per-book">
+
+	<target name="setup-common-properties-per-book">
+
+		<fail message="You must set book_name">
+			<condition>
+				<not>
+					<isset property="book_name" />
+				</not>
+			</condition>
+		</fail>
+		
+		<!-- if chapter_name is not set, set it to the book_name -->
+		<condition property="chapter_name" value="${book_name}">
+			<isset property="book_name" />
+		</condition>
+
+		<condition property="docbook.outname" value="${chapter_name}">
+			<isset property="chapter_name" />
+		</condition>
+
+    <!-- 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>
+
+		<!-- set up to date values for this docbook -->
+		<uptodate property="target-book-pdf-uptodate">
+			<srcfiles dir="${styles.dir}" includes="**/*.*" />
+			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
+			<!--srcfiles dir="${olink.dir.path}" includes="*/pdf-target.db" /-->
+			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
+  		<mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}.pdf" />
+		</uptodate>
+		
+		<uptodate property="target-book-html-single-uptodate">
+			<srcfiles dir="${styles.dir}" includes="**/*.*" />
+			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
+			<!--srcfiles dir="${olink.dir.path}" includes="*/htmlsingle-target.db" /-->
+			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
+  	  <mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}.html" />
+		</uptodate>
+
+		<uptodate property="target-book-html-chunked-uptodate">
+			<srcfiles dir="${styles.dir}" includes="**/*.*" />
+			<srcfiles dir="${docbook.src.dir}/${book_name}" includes="*.xml" />
+			<!--srcfiles dir="${olink.dir.path}" includes="*/htmlchunked-target.db" /-->
+			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
+		  <mergemapper to="${target.dir}${file.separator}${book_name}${file.separator}${docbook.outname}${file.separator}index.html" />
+    </uptodate>
+		
+		<uptodate property="target-book-images-uptodate">
+			<srcfiles dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
+  	  <globmapper from="*" 
+	      to="${target.dir}${file.separator}images${file.separator}${book_name}${file.separator}*"/>
+    </uptodate>
+		
+		<condition property="skip-or-uptodate.pdf">
+			<or>
+				<isset property="skip.pdf" />
+				<isset property="target-book-pdf-uptodate" />
+			</or>
+		</condition>
+
+		<condition property="skip-or-uptodate.html-chunked">
+			<or>
+				<isset property="skip.html-chunked" />
+				<isset property="target-book-html-chunked-uptodate" />
+			</or>
+		</condition>
+
+		<condition property="skip-or-uptodate.html-single">
+			<or>
+				<isset property="skip.html-single" />
+				<isset property="target-book-html-single-uptodate" />
+			</or>
+		</condition>
+
+
+	</target>
 </project>
\ No newline at end of file

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/build/common-properties-per-book.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml Thu Aug 28 14:53:59 2008
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->
-
-<project name="get-components">
-
-  <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Subroutines                                                        == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <!-- ======================================================================== -->
-  <!-- == Subroutine: Copy the docbook system images                         == -->
-  <!-- ======================================================================== -->
-  
-  <target name="copy-docbook-images">
-    
-    <copy todir="${target.dir.path}/images">
-      <fileset dir="${docbook.xsl.dir}/images/"/>
-    </copy>
-       
-  </target>
-  
-  <!-- ======================================================================== -->
-  <!-- == Subroutine: Download Saxon                                         == -->
-  <!-- ======================================================================== -->
-  
-  <target name="get-saxon" unless="saxon.available">
-    <input
-      message="Downloading and unzipping (one time) Saxon's free XSLT package,&#xA;
-licensed under the Mozilla Public License Version 1.0;&#xA;
-you may not use this package except in compliance with the License.&#xA;&#xA; 
-You may obtain a copy of the License at http://www.mozilla.org/MPL/&#xA;&#xA;Ok to download?"
-      validargs="y,n" addproperty="ok.download.saxon"/>
-    <condition property="do.download.saxon">
-      <equals arg1="y" arg2="${ok.download.saxon}"/>
-    </condition>
-    <fail unless="do.download.saxon" message="Download aborted by user."/>
-    
-    <get src="http://prdownloads.sourceforge.net/saxon/saxon6-5-5.zip" dest="${tmp.dir}/saxon.zip"/>
-    <unzip src="${tmp.dir}/saxon.zip" dest="${tmp.dir}/saxon"/>
-    <copy file="${tmp.dir}/saxon/saxon.jar" tofile="${saxon.dir}/saxon.jar"/>
-  </target>
-  
-  <!-- ======================================================================== -->
-  <!-- == Subroutine: Download jai                                           == -->
-  <!-- ======================================================================== -->
-  
-  <target name="get-jai" unless="jai.available">
-    <input
-      message="Downloading and unzipping (one time) Java Advanced Imaging package (JAI),&#xA;
-licensed under the specific Sun license for JAI;&#xA;
-You may not use this package except in compliance with the License.&#xA;&#xA; 
-The license is contained in the download.&#xA;&#xA;Ok to download?"
-      validargs="y,n" addproperty="ok.download.jai"/>
-    <condition property="do.download.jai">
-      <equals arg1="y" arg2="${ok.download.jai}"/>
-    </condition>
-    <fail unless="do.download.jai" message="Download aborted by user."/>
-    
-    <get src="http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib.zip"
-      dest="${tmp.dir}/jai.zip"/>
-    <unzip src="${tmp.dir}/jai.zip" dest="${tmp.dir}"/>
-    <copy todir="${jai.dir}">
-      <fileset dir="${tmp.dir}/jai-1_1_3/lib">
-        <include name="jai_codec.jar"/>
-        <include name="jai_core.jar"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <!-- ======================================================================== -->
-  <!-- == Subroutine: Unzip the docbook xml and xslt transformations         == -->
-  <!-- ======================================================================== -->
-  <target name="get-docbook" description="internal: gets and unzips docbook xml and xsl style sheets"
-    unless="docbook.available">
-    
-    <input
-      message="Downloading and unzipping (one time) the free docbook DTDs and XSLT packages.&#xA;
-The DTDs are copyrighted with the following permissions granted:
-  Copyright 1992-2004 HaL Computer Systems, Inc.,&#xA;
-  O'Reilly &amp; Associates, Inc., ArborText, Inc., Fujitsu Software&#xA;
-  Corporation, Norman Walsh, Sun Microsystems, Inc., and the&#xA;
-  Organization for the Advancement of Structured Information&#xA;
-  Standards (OASIS).&#xA;&#xA;
-  Permission to use, copy, modify and distribute the DocBook DTD&#xA;
-  and its accompanying documentation for any purpose and without fee&#xA;
-  is hereby granted in perpetuity, provided that the above copyright&#xA;
-  notice and this paragraph appear in all copies. The copyright&#xA;
-  holders make no representation about the suitability of the DTD for&#xA;
-  any purpose. It is provided &quot;as is&quot; without expressed or implied&#xA;
-  warranty.&#xA;&#xA;
-  If you modify the DocBook DTD in any way, except for declaring and&#xA;
-  referencing additional sets of general entities and declaring&#xA;
-  additional notations, label your DTD as a variant of DocBook. See&#xA;
-  the maintenance documentation for more information. &#xA;&#xA;
-The XSLT transforms come with the following copyright and permissions:&#xA;
-  Permission is hereby granted, free of charge, to any person&#xA;
-  obtaining a copy of this software and associated documentation&#xA;
-  files (the ``Software''), to deal in the Software without&#xA;
-  restriction, including without limitation the rights to use,&#xA;
-  copy, modify, merge, publish, distribute, sublicense, and/or&#xA;
-  sell copies of the Software, and to permit persons to whom the&#xA;
-  Software is furnished to do so, subject to the following&#xA;
-  conditions:&#xA;&#xA;
-  The above copyright notice and this permission notice shall be&#xA;
-  included in all copies or substantial portions of the Software.&#xA;
- 	Except as contained in this notice, the names of individuals&#xA;
- 	credited with contribution to this software shall not be used in&#xA;
- 	advertising or otherwise to promote the sale, use or other&#xA;
- 	dealings in this Software without prior written authorization&#xA;
- 	from the individuals in question.&#xA;&#xA;
- 	Any stylesheet derived from this Software that is publically&#xA;
- 	distributed will be identified with a different name and the&#xA;
- 	version strings in any derived Software will be changed so that&#xA;
- 	no possibility of confusion between the derived package and this&#xA;
- 	Software will exist.&#xA;&#xA;
- 	Warranty&#xA;
- 	--------&#xA;&#xA;
- 	THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,&#xA;
- 	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES&#xA;
- 	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND&#xA;
- 	NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER&#xA;
- 	CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,&#xA;
- 	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING&#xA;
- 	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR&#xA;
- 	OTHER DEALINGS IN THE SOFTWARE.&#xA;
- &#xA;&#xA;Ok to download?"
-      validargs="y,n" addproperty="ok.download.docbooks"/>
-    
-    <condition property="do.download.docbooks">
-      <equals arg1="y" arg2="${ok.download.docbooks}"/>
-    </condition>
-    <fail unless="do.download.docbooks" message="Download aborted by user."/>
-    
-    <mkdir dir="${docbook.xml.dir}"/>
-    <echo message="Downloading and unzipping (one time) docbook-xml-${docbook.xml.version}.zip"/>
-    <get
-      src="http://www.docbook.org/xml/${docbook.xml.version}/docbook-xml-${docbook.xml.version}.zip"
-      dest="${tmp.dir}/docbook-system-xml.zip"/>
-    <unzip src="${tmp.dir}/docbook-system-xml.zip" dest="${docbook.xml.dir}"/>
-    
-    <mkdir dir="${docbook.xsl.dir}"/>
-    <echo message="Downloading and unzipping (one time) docbook-xsl-${docbook.xsl.version}.zip"/>
-    <get src="http://downloads.sourceforge.net/docbook/docbook-xsl-${docbook.xsl.version}.zip"
-      dest="${tmp.dir}/docbook-system-xsl.zip"/>
-    
-    <unzip src="${tmp.dir}/docbook-system-xsl.zip" dest="${docbook.ref.dir}"/>
-  </target>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+
+<project name="get-components">
+
+  <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Subroutines                                                        == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <!-- ======================================================================== -->
+  <!-- == Subroutine: Copy the docbook system images                         == -->
+  <!-- ======================================================================== -->
+  
+  <target name="copy-docbook-images">
+    
+    <copy todir="${target.dir.path}/images">
+      <fileset dir="${docbook.xsl.dir}/images/"/>
+    </copy>
+       
+  </target>
+  
+  <!-- ======================================================================== -->
+  <!-- == Subroutine: Download Saxon                                         == -->
+  <!-- ======================================================================== -->
+  
+  <target name="get-saxon" unless="saxon.available">
+    <input
+      message="Downloading and unzipping (one time) Saxon's free XSLT package,&#xA;
+licensed under the Mozilla Public License Version 1.0;&#xA;
+you may not use this package except in compliance with the License.&#xA;&#xA; 
+You may obtain a copy of the License at http://www.mozilla.org/MPL/&#xA;&#xA;Ok to download?"
+      validargs="y,n" addproperty="ok.download.saxon"/>
+    <condition property="do.download.saxon">
+      <equals arg1="y" arg2="${ok.download.saxon}"/>
+    </condition>
+    <fail unless="do.download.saxon" message="Download aborted by user."/>
+    
+    <get src="http://prdownloads.sourceforge.net/saxon/saxon6-5-5.zip" dest="${tmp.dir}/saxon.zip"/>
+    <unzip src="${tmp.dir}/saxon.zip" dest="${tmp.dir}/saxon"/>
+    <copy file="${tmp.dir}/saxon/saxon.jar" tofile="${saxon.dir}/saxon.jar"/>
+  </target>
+  
+  <!-- ======================================================================== -->
+  <!-- == Subroutine: Download jai                                           == -->
+  <!-- ======================================================================== -->
+  
+  <target name="get-jai" unless="jai.available">
+    <input
+      message="Downloading and unzipping (one time) Java Advanced Imaging package (JAI),&#xA;
+licensed under the specific Sun license for JAI;&#xA;
+You may not use this package except in compliance with the License.&#xA;&#xA; 
+The license is contained in the download.&#xA;&#xA;Ok to download?"
+      validargs="y,n" addproperty="ok.download.jai"/>
+    <condition property="do.download.jai">
+      <equals arg1="y" arg2="${ok.download.jai}"/>
+    </condition>
+    <fail unless="do.download.jai" message="Download aborted by user."/>
+    
+    <get src="http://download.java.net/media/jai/builds/release/1_1_3/jai-1_1_3-lib.zip"
+      dest="${tmp.dir}/jai.zip"/>
+    <unzip src="${tmp.dir}/jai.zip" dest="${tmp.dir}"/>
+    <copy todir="${jai.dir}">
+      <fileset dir="${tmp.dir}/jai-1_1_3/lib">
+        <include name="jai_codec.jar"/>
+        <include name="jai_core.jar"/>
+      </fileset>
+    </copy>
+  </target>
+  
+  <!-- ======================================================================== -->
+  <!-- == Subroutine: Unzip the docbook xml and xslt transformations         == -->
+  <!-- ======================================================================== -->
+  <target name="get-docbook" description="internal: gets and unzips docbook xml and xsl style sheets"
+    unless="docbook.available">
+    
+    <input
+      message="Downloading and unzipping (one time) the free docbook DTDs and XSLT packages.&#xA;
+The DTDs are copyrighted with the following permissions granted:
+  Copyright 1992-2004 HaL Computer Systems, Inc.,&#xA;
+  O'Reilly &amp; Associates, Inc., ArborText, Inc., Fujitsu Software&#xA;
+  Corporation, Norman Walsh, Sun Microsystems, Inc., and the&#xA;
+  Organization for the Advancement of Structured Information&#xA;
+  Standards (OASIS).&#xA;&#xA;
+  Permission to use, copy, modify and distribute the DocBook DTD&#xA;
+  and its accompanying documentation for any purpose and without fee&#xA;
+  is hereby granted in perpetuity, provided that the above copyright&#xA;
+  notice and this paragraph appear in all copies. The copyright&#xA;
+  holders make no representation about the suitability of the DTD for&#xA;
+  any purpose. It is provided &quot;as is&quot; without expressed or implied&#xA;
+  warranty.&#xA;&#xA;
+  If you modify the DocBook DTD in any way, except for declaring and&#xA;
+  referencing additional sets of general entities and declaring&#xA;
+  additional notations, label your DTD as a variant of DocBook. See&#xA;
+  the maintenance documentation for more information. &#xA;&#xA;
+The XSLT transforms come with the following copyright and permissions:&#xA;
+  Permission is hereby granted, free of charge, to any person&#xA;
+  obtaining a copy of this software and associated documentation&#xA;
+  files (the ``Software''), to deal in the Software without&#xA;
+  restriction, including without limitation the rights to use,&#xA;
+  copy, modify, merge, publish, distribute, sublicense, and/or&#xA;
+  sell copies of the Software, and to permit persons to whom the&#xA;
+  Software is furnished to do so, subject to the following&#xA;
+  conditions:&#xA;&#xA;
+  The above copyright notice and this permission notice shall be&#xA;
+  included in all copies or substantial portions of the Software.&#xA;
+ 	Except as contained in this notice, the names of individuals&#xA;
+ 	credited with contribution to this software shall not be used in&#xA;
+ 	advertising or otherwise to promote the sale, use or other&#xA;
+ 	dealings in this Software without prior written authorization&#xA;
+ 	from the individuals in question.&#xA;&#xA;
+ 	Any stylesheet derived from this Software that is publically&#xA;
+ 	distributed will be identified with a different name and the&#xA;
+ 	version strings in any derived Software will be changed so that&#xA;
+ 	no possibility of confusion between the derived package and this&#xA;
+ 	Software will exist.&#xA;&#xA;
+ 	Warranty&#xA;
+ 	--------&#xA;&#xA;
+ 	THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,&#xA;
+ 	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES&#xA;
+ 	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND&#xA;
+ 	NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER&#xA;
+ 	CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,&#xA;
+ 	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING&#xA;
+ 	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR&#xA;
+ 	OTHER DEALINGS IN THE SOFTWARE.&#xA;
+ &#xA;&#xA;Ok to download?"
+      validargs="y,n" addproperty="ok.download.docbooks"/>
+    
+    <condition property="do.download.docbooks">
+      <equals arg1="y" arg2="${ok.download.docbooks}"/>
+    </condition>
+    <fail unless="do.download.docbooks" message="Download aborted by user."/>
+    
+    <mkdir dir="${docbook.xml.dir}"/>
+    <echo message="Downloading and unzipping (one time) docbook-xml-${docbook.xml.version}.zip"/>
+    <get
+      src="http://www.docbook.org/xml/${docbook.xml.version}/docbook-xml-${docbook.xml.version}.zip"
+      dest="${tmp.dir}/docbook-system-xml.zip"/>
+    <unzip src="${tmp.dir}/docbook-system-xml.zip" dest="${docbook.xml.dir}"/>
+    
+    <mkdir dir="${docbook.xsl.dir}"/>
+    <echo message="Downloading and unzipping (one time) docbook-xsl-${docbook.xsl.version}.zip"/>
+    <get src="http://downloads.sourceforge.net/docbook/docbook-xsl-${docbook.xsl.version}.zip"
+      dest="${tmp.dir}/docbook-system-xsl.zip"/>
+    
+    <unzip src="${tmp.dir}/docbook-system-xsl.zip" dest="${docbook.ref.dir}"/>
+  </target>
+
 </project>
\ No newline at end of file

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/build/get-components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml Thu Aug 28 14:53:59 2008
@@ -1,238 +1,238 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
--->
-
-  <!--  Assumes the following preconditions and properties are set:
-    "prepare" task is done
-    
-    properties set or not (flags)
-      skip-or-uptodate.pdf
-      skip-or-uptodate.html-single
-      skip-or-uptodate.html-chunked
-      
-    properties identifying paths and names:
-      ${docbook.src.dir}
-      ${book_name}
-      ${chapter_name}
-      ${target.dir.path}
-      ${docbook.outname}
-      ${styles.dir}
-      ${local.titlepage.dir}
-      ${olink.dir.path}
-      ${docbook.xsl.dir}
-      
-    properties identifying versions:
-      ${fop.version}
-      
-    misc properties:
-      ${paper.type}
-      ${olink_work}
-      ${fop.main.class}
-    
-    references:
-      saxon_and_fop.classpath
-      
-    -->
-
-<project name="process-one-book" default="all">
-  
-	<import file="common-properties-per-book.xml"/>
-	
-  <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == This is the main target to generate all the docs                   == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <target name="all" depends="pdf-c, html-c, htmlsingle-c"
-    description="--> Generate html and pdf documentation"/>
-  
-  <target name="pdf-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.pdf">
-    <antcall target="pdf">
-    	<reference refid="saxon_and_fop.classpath"/>
-  	</antcall>
-  </target>
-
-  <target name="html-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.html-chunked">
-    <antcall target="html">
-	    <reference refid="saxon_and_fop.classpath"/>
-    </antcall>
-  </target>
-  
-  <target name="htmlsingle-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.html-single">
-    <antcall target="htmlsingle">
-	    <reference refid="saxon_and_fop.classpath"/>
-    </antcall>
-  </target>
-
-    <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Create the PDF documentation                                       == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <target name="pdf" 
-    depends="transform-pdf, fop_conditionally"
-    description="--> Generate PDF docs"/>
-  
-  <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}"/-->
-    <!--echo message="olink work = ${olink_work}"/-->
-    <saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
-      output="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"
-      style="${styles.dir}/top/pdf.xsl"
-      params="fop.version=${fop.version} 
-		               paper.type=${paper.type} 
-		               collect.xref.targets=${olink_work} 
-		               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=file:///${docbook.xsl.dir}			             
-			             "/>
-  </target>
-  
-  <target name="transform-title-pdf" unless="title-pdf-uptodate"
-    description="--> internal transform title page for pdf">
-    <saxon input="${local.titlepage.dir}/titlepage-pdf.xml"
-      output="${local.titlepage.dir}/titlepage-pdf.xsl"
-      style="${docbook.xsl.dir}/template/titlepage.xsl"/>
-  </target>
-  
-  <target name="transform-title-html" unless="title-html-uptodate"
-    description="--> internal trnasform title page for html">
-    <saxon input="${local.titlepage.dir}/titlepage-html.xml"
-      output="${local.titlepage.dir}/titlepage-html.xsl"
-      style="${docbook.xsl.dir}/template/titlepage.xsl"/>
-  </target>
-  
-  <target name="fop_conditionally" description="internal - runs fop conditionally"
-    unless="do_olinkdb_only">
-    
-    <java classname="${fop.main.class}" fork="true" maxmemory="256m"
-      dir="${target.dir.path}/${chapter_name}" classpathref="saxon_and_fop.classpath">
-      <arg value="-c"/>
-      <arg value="${fop.config}"/>
-      <arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"/>
-      <arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf"/>
-    </java>
-    
-  </target>
-  
-  <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Create the HTML documentation, many pages                          == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <target name="html"
-    depends="transform-title-html, transform-html-chunked"
-    description="--> Generate HTML docs in multiple files"/>
-
-  <target name="transform-html-chunked">
-    <saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
-      output="${target.dir.path}/${chapter_name}/${docbook.outname}.html"
-      style="${styles.dir}/top/html-chunked.xsl"
-      params="collect.xref.targets=${olink_work} 
-		          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}"/>
-  </target>
-  
-  <!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Create the HTML documentation, one big page                        == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <target name="htmlsingle"
-    depends="transform-title-html, transform-html-single, clean-if-olink-only"
-    description="--> Generate HTML docs in a single, big file"/>
-  
-  <target name="transform-html-single">
-    <!--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.path}/${chapter_name}/${docbook.outname}.html"
-      style="${styles.dir}/top/html-single.xsl"
-      params="collect.xref.targets=${olink_work} 
-		          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}"/>
-  </target>
-  
-	<!-- next target cleans up 0-length output that sometimes appears for olink only -->
-	<target name="clean-if-olink-only" if="do_olinkdb_only">
-		<delete quiet="true" file="${target.dir.path}/${chapter_name}/${docbook.outname}.html"/>
-	</target>			
-		
-  <target name="copy-docbook-images-and-css" unless="${target-book-images-uptodate}">
-
-    <property name="target-book-images-uptodate" value="ignored"/>
-    
-    <copy todir="${target.dir.path}/images/${book_name}">
-      <fileset dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
-    </copy>
-    
-    <copy todir="${target.dir.path}/${chapter_name}/css">
-      <fileset dir="${css.dir}"/>
-    </copy>
-    
-  </target>
-
-	<!-- ======================================================================== -->
-  <!-- ==                                                                    == -->
-  <!-- == Saxon Converter macro that uses commons-resolver                   == -->
-  <!-- ==   and xerces parser (to handle XIncludes)                          == -->
-  <!-- ==                                                                    == -->
-  <!-- == input: The file to transform                                       == -->
-  <!-- == output: The transformation result                                  == -->
-  <!-- == style: The Style Sheet used for the transformation                 == -->
-  <!-- ==                                                                    == -->
-  <!-- ======================================================================== -->
-  <macrodef name="saxon">
-    <attribute name="input"/>
-    <attribute name="output"/>
-    <attribute name="style"/>
-    <attribute name="params" default=""/>
-    <sequential>
-      <!--echo message="input"/>
-      <echo message="@{input}"/-->
-      <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${docbook.tool.project}"
-        classpathref="saxon_and_fop.classpath">
-        <!-- The jvm args install the xerces parser to allow use of XIncludes -->
-        <jvmarg
-          value="-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
-        <jvmarg
-          value="-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
-        <jvmarg
-          value="-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration"/>
-        <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="-T"/-->
-        <arg value="-o"/>
-        <arg value="@{output}"/>
-        <arg value="@{input}"/>
-        <arg value="@{style}"/>
-        <arg line="@{params}"/>
-      </java>
-    </sequential>
-  </macrodef>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+-->
+
+  <!--  Assumes the following preconditions and properties are set:
+    "prepare" task is done
+    
+    properties set or not (flags)
+      skip-or-uptodate.pdf
+      skip-or-uptodate.html-single
+      skip-or-uptodate.html-chunked
+      
+    properties identifying paths and names:
+      ${docbook.src.dir}
+      ${book_name}
+      ${chapter_name}
+      ${target.dir.path}
+      ${docbook.outname}
+      ${styles.dir}
+      ${local.titlepage.dir}
+      ${olink.dir.path}
+      ${docbook.xsl.dir}
+      
+    properties identifying versions:
+      ${fop.version}
+      
+    misc properties:
+      ${paper.type}
+      ${olink_work}
+      ${fop.main.class}
+    
+    references:
+      saxon_and_fop.classpath
+      
+    -->
+
+<project name="process-one-book" default="all">
+  
+	<import file="common-properties-per-book.xml"/>
+	
+  <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == This is the main target to generate all the docs                   == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <target name="all" depends="pdf-c, html-c, htmlsingle-c"
+    description="--> Generate html and pdf documentation"/>
+  
+  <target name="pdf-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.pdf">
+    <antcall target="pdf">
+    	<reference refid="saxon_and_fop.classpath"/>
+  	</antcall>
+  </target>
+
+  <target name="html-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.html-chunked">
+    <antcall target="html">
+	    <reference refid="saxon_and_fop.classpath"/>
+    </antcall>
+  </target>
+  
+  <target name="htmlsingle-c" depends="setup-common-properties-per-book, copy-docbook-images-and-css" unless="skip-or-uptodate.html-single">
+    <antcall target="htmlsingle">
+	    <reference refid="saxon_and_fop.classpath"/>
+    </antcall>
+  </target>
+
+    <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Create the PDF documentation                                       == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <target name="pdf" 
+    depends="transform-pdf, fop_conditionally"
+    description="--> Generate PDF docs"/>
+  
+  <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}"/-->
+    <!--echo message="olink work = ${olink_work}"/-->
+    <saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
+      output="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"
+      style="${styles.dir}/top/pdf.xsl"
+      params="fop.version=${fop.version} 
+		               paper.type=${paper.type} 
+		               collect.xref.targets=${olink_work} 
+		               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=file:///${docbook.xsl.dir}			             
+			             "/>
+  </target>
+  
+  <target name="transform-title-pdf" unless="title-pdf-uptodate"
+    description="--> internal transform title page for pdf">
+    <saxon input="${local.titlepage.dir}/titlepage-pdf.xml"
+      output="${local.titlepage.dir}/titlepage-pdf.xsl"
+      style="${docbook.xsl.dir}/template/titlepage.xsl"/>
+  </target>
+  
+  <target name="transform-title-html" unless="title-html-uptodate"
+    description="--> internal trnasform title page for html">
+    <saxon input="${local.titlepage.dir}/titlepage-html.xml"
+      output="${local.titlepage.dir}/titlepage-html.xsl"
+      style="${docbook.xsl.dir}/template/titlepage.xsl"/>
+  </target>
+  
+  <target name="fop_conditionally" description="internal - runs fop conditionally"
+    unless="do_olinkdb_only">
+    
+    <java classname="${fop.main.class}" fork="true" maxmemory="256m"
+      dir="${target.dir.path}/${chapter_name}" classpathref="saxon_and_fop.classpath">
+      <arg value="-c"/>
+      <arg value="${fop.config}"/>
+      <arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf_src.xml"/>
+      <arg value="${target.dir.path}/${chapter_name}/${docbook.outname}.pdf"/>
+    </java>
+    
+  </target>
+  
+  <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Create the HTML documentation, many pages                          == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <target name="html"
+    depends="transform-title-html, transform-html-chunked"
+    description="--> Generate HTML docs in multiple files"/>
+
+  <target name="transform-html-chunked">
+    <saxon input="${docbook.src.dir}/${book_name}/${chapter_name}.xml"
+      output="${target.dir.path}/${chapter_name}/${docbook.outname}.html"
+      style="${styles.dir}/top/html-chunked.xsl"
+      params="collect.xref.targets=${olink_work} 
+		          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}"/>
+  </target>
+  
+  <!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Create the HTML documentation, one big page                        == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <target name="htmlsingle"
+    depends="transform-title-html, transform-html-single, clean-if-olink-only"
+    description="--> Generate HTML docs in a single, big file"/>
+  
+  <target name="transform-html-single">
+    <!--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.path}/${chapter_name}/${docbook.outname}.html"
+      style="${styles.dir}/top/html-single.xsl"
+      params="collect.xref.targets=${olink_work} 
+		          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}"/>
+  </target>
+  
+	<!-- next target cleans up 0-length output that sometimes appears for olink only -->
+	<target name="clean-if-olink-only" if="do_olinkdb_only">
+		<delete quiet="true" file="${target.dir.path}/${chapter_name}/${docbook.outname}.html"/>
+	</target>			
+		
+  <target name="copy-docbook-images-and-css" unless="${target-book-images-uptodate}">
+
+    <property name="target-book-images-uptodate" value="ignored"/>
+    
+    <copy todir="${target.dir.path}/images/${book_name}">
+      <fileset dir="${docbook.src.dir}/${book_name}/images" excludes="*/*.ppt"/>
+    </copy>
+    
+    <copy todir="${target.dir.path}/${chapter_name}/css">
+      <fileset dir="${css.dir}"/>
+    </copy>
+    
+  </target>
+
+	<!-- ======================================================================== -->
+  <!-- ==                                                                    == -->
+  <!-- == Saxon Converter macro that uses commons-resolver                   == -->
+  <!-- ==   and xerces parser (to handle XIncludes)                          == -->
+  <!-- ==                                                                    == -->
+  <!-- == input: The file to transform                                       == -->
+  <!-- == output: The transformation result                                  == -->
+  <!-- == style: The Style Sheet used for the transformation                 == -->
+  <!-- ==                                                                    == -->
+  <!-- ======================================================================== -->
+  <macrodef name="saxon">
+    <attribute name="input"/>
+    <attribute name="output"/>
+    <attribute name="style"/>
+    <attribute name="params" default=""/>
+    <sequential>
+      <!--echo message="input"/>
+      <echo message="@{input}"/-->
+      <java classname="com.icl.saxon.StyleSheet" fork="true" dir="${docbook.tool.project}"
+        classpathref="saxon_and_fop.classpath">
+        <!-- The jvm args install the xerces parser to allow use of XIncludes -->
+        <jvmarg
+          value="-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+        <jvmarg
+          value="-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
+        <jvmarg
+          value="-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration"/>
+        <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="-T"/-->
+        <arg value="-o"/>
+        <arg value="@{output}"/>
+        <arg value="@{input}"/>
+        <arg value="@{style}"/>
+        <arg line="@{params}"/>
+      </java>
+    </sequential>
+  </macrodef>
+
 </project>
\ No newline at end of file

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/build/process-one-book.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties?rev=690022&r1=690021&r2=690022&view=diff
==============================================================================
--- incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties (original)
+++ incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties Thu Aug 28 14:53:59 2008
@@ -1,38 +1,38 @@
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.    
-
-# see http://xml.apache.org/commons/components/apidocs/resolver/org/apache/xml/resolver/CatalogManager.html
-# for a description of the contents
-
-# 	The semicolon-delimited list of catalog files
-catalogs = catalog/docbook.version_4.4/xml-catalog.xml
-
-relative-catalogs = true
-
-# If non-zero, the Catalog classes will print informative 
-# and debugging messages. The higher the number, the more messages.
-verbosity = 0
-
-prefer = system
-
-# Should a single catalog be constructed for all parsing, 
-# or should a different catalog be created for each parser?
-static-catalog = yes
-
-# If the source document contains "oasis-xml-catalog" processing instructions, 
-# should they be used?
-allow-oasis-xml-catalog-pi = yes
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.    
+
+# see http://xml.apache.org/commons/components/apidocs/resolver/org/apache/xml/resolver/CatalogManager.html
+# for a description of the contents
+
+# 	The semicolon-delimited list of catalog files
+catalogs = catalog/docbook.version_4.4/xml-catalog.xml
+
+relative-catalogs = true
+
+# If non-zero, the Catalog classes will print informative 
+# and debugging messages. The higher the number, the more messages.
+verbosity = 0
+
+prefer = system
+
+# Should a single catalog be constructed for all parsing, 
+# or should a different catalog be created for each parser?
+static-catalog = yes
+
+# If the source document contains "oasis-xml-catalog" processing instructions, 
+# should they be used?
+allow-oasis-xml-catalog-pi = yes

Propchange: incubator/uima/uimaj/trunk/uima-docbook-tool/catalog/docbook.version_4.4/CatalogManager.properties
------------------------------------------------------------------------------
    svn:eol-style = native