Delete all remaining docbook contents, download them instead

Actually, only fop:fop:0.20.5 and batik:batik-1.5-fop:0.20-5 are really
used in addition to lib/saxon/saxon.jar (saxon:saxon:6.5.3). So the rest
does not need to be replaced and can just be wiped.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/.gitignore b/.gitignore
index 09bc5c982d3e8663526f0b1eb52c81f6119ea746..f279fa9bc3409efefe8ab1b5eeb3e36acd58bd3c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,9 +35,7 @@ bin/
 /lib/ant/
 /lib/asm/
 /lib/commons/
-/lib/docbook/docbook-dtd/
-/lib/docbook/docbook-xsl/
-/lib/docbook/doc*.zip
+/lib/docbook/
 /lib/jarjar/
 /lib/jdtcore-aj/
 /lib/junit/

diff --git a/docs/build.xml b/docs/build.xml
index e9f0e9b8b969071466195570d792886d9fc52c66..ba81c73d3e6f6e4372cc08ae7be5edc560c5e6ca 100644 (file)
--- a/docs/build.xml
+++ b/docs/build.xml
@@ -463,15 +463,9 @@
                  classname="org.apache.fop.tools.anttasks.Fop"
         >
             <classpath>
-                <fileset dir="${aspectj.modules.lib.dir}/docbook/fop">
+                <fileset dir="${aspectj.modules.lib.dir}/docbook">
                     <include name="fop.jar" />
                     <include name="batik.jar" />
-                    <include name="avalon.jar" /> <!-- lib/docbook/fop/avalon-framework-cvs-20020806.jar: wrong path, but build works anyway -->
-                </fileset>
-                <fileset dir="${aspectj.modules.lib.dir}/ant">
-                    <include name="xalan.jar" /> <!-- lib/docbook/fop/xalan.jar: wrong path, but build works anyway -->
-                    <include name="xercesImpl.jar" /> <!-- lib/ant/lib/xercesImpl.jar: wrong path, but build works anyway -->
-                    <include name="xml-apis.jar" /> <!-- lib/ant/lib/xml-apis.jar: wrong path, but build works anyway -->
                 </fileset>
             </classpath>
         </taskdef>

diff --git a/lib/docbook/fop/LICENSE b/lib/docbook/fop/LICENSE
deleted file mode 100644 (file)
index 831c658..0000000
--- a/lib/docbook/fop/LICENSE
+++ /dev/null
@@ -1,48 +0,0 @@
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
- Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
-    endorse  or promote  products derived  from this  software without  prior
-    written permission. For written permission, please contact
-    apache@apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 

diff --git a/lib/docbook/fop/avalon-framework-cvs-20020806.jar b/lib/docbook/fop/avalon-framework-cvs-20020806.jar
deleted file mode 100644 (file)
index 7db7299..0000000
Binary files a/lib/docbook/fop/avalon-framework-cvs-20020806.jar and /dev/null differ

diff --git a/lib/docbook/fop/batik.jar b/lib/docbook/fop/batik.jar
deleted file mode 100644 (file)
index 28c8bac..0000000
Binary files a/lib/docbook/fop/batik.jar and /dev/null differ

diff --git a/lib/docbook/fop/fop.jar b/lib/docbook/fop/fop.jar
deleted file mode 100644 (file)
index f7a3a2c..0000000
Binary files a/lib/docbook/fop/fop.jar and /dev/null differ

diff --git a/lib/docbook/fop/readme-fop.txt b/lib/docbook/fop/readme-fop.txt
deleted file mode 100644 (file)
index 758efcb..0000000
--- a/lib/docbook/fop/readme-fop.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-These are from fop-0.20.5-bin.zip, available from http://xml.apache.org/fop
-under the Apache 1.1 license.  They are used (only) in the docs module
-build.xml file for docbook transforms to PDF.

diff --git a/lib/docbook/fop/xalan.jar b/lib/docbook/fop/xalan.jar
deleted file mode 100644 (file)
index 3e50f5f..0000000
Binary files a/lib/docbook/fop/xalan.jar and /dev/null differ

diff --git a/lib/pom.xml b/lib/pom.xml
index 621c49def5fe8daa6c67e21371dba7186e7a2b40..c8b1edc649ff054b0f2f5a5431100e2823c5977e 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -363,6 +363,28 @@
                   <destFileName>commons-logging-${lib.commons.logging.version}.jar</destFileName>
                 </artifactItem>
 
+                <!-- Libraries used to create HTML docs from XML DocBook files -->
+                <artifactItem>
+                  <!-- Binary is identical to committed version -->
+                  <groupId>fop</groupId>
+                  <artifactId>fop</artifactId>
+                  <version>0.20.5</version>
+                  <type>jar</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>docbook</outputDirectory>
+                  <destFileName>fop.jar</destFileName>
+                </artifactItem>
+                <artifactItem>
+                  <!-- Binary is identical to committed version -->
+                  <groupId>batik</groupId>
+                  <artifactId>batik-1.5-fop</artifactId>
+                  <version>0.20-5</version>
+                  <type>jar</type>
+                  <overWrite>false</overWrite>
+                  <outputDirectory>docbook</outputDirectory>
+                  <destFileName>batik.jar</destFileName>
+                </artifactItem>
+
               </artifactItems>
             </configuration>
           </execution>

diff --git a/pom.xml b/pom.xml
index f10c16d5f252ad0eda216fc73bf85648cc855798..e94ede8c5bb6d503b28f73780d6592b90614a918 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -273,6 +273,8 @@
                                                                                <file>${lib.directory}/commons/commons.jar</file>
                                                                                <file>${lib.directory}/docbook/docbook-dtd/docbookx.dtd</file>
                                                                                <file>${lib.directory}/docbook/docbook-xsl/html/chunk.xsl</file>
+                                                                               <file>${lib.directory}/docbook/fop.jar</file>
+                                                                               <file>${lib.directory}/docbook/batik.jar</file>
                                                                                <file>${lib.directory}/jarjar/jarjar-1.3.jar</file>
                                                                                <file>${lib.directory}/jdtcore-aj/jdtcore-for-aspectj.jar</file>
                                                                                <file>${lib.directory}/junit/junit.jar</file>