[gentoo-commits] proj/javatoolkit:master commit in: src/obsolete/bsfix/, src/obsolete/bsfix/tests/

[Patrice Clement]

commit:     7bee587c7f6694e88a69ebaec66d7447b0e30b7b
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 23:45:34 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 23:45:34 2017 +0000
URL:        https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=7bee587c

remove obsolete directory

 src/obsolete/bsfix/JXSLT.java                   | 141 --------------
 src/obsolete/bsfix/Makefile                     |  36 ----
 src/obsolete/bsfix/bsfix                        |   8 -
 src/obsolete/bsfix/bsfix-eclipse.py             | 105 ----------
 src/obsolete/bsfix/bsfix.py                     |  80 --------
 src/obsolete/bsfix/build-xml-source-target.xslt |  28 ---
 src/obsolete/bsfix/rewrite2-speed-test.sh       |  47 -----
 src/obsolete/bsfix/tests/build.xml              | 247 ------------------------
 8 files changed, 692 deletions(-)

diff --git a/src/obsolete/bsfix/JXSLT.java b/src/obsolete/bsfix/JXSLT.java
deleted file mode 100644
index 3b580f2..0000000
--- a/src/obsolete/bsfix/JXSLT.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2004, Jan Brinkmann <lucky@×××××××××××××.de>
- * Copyright (c) 2004, Karl Trygve Kalleberg <karltk@g.o>
- * Copyright (c) 2004, Thomas Matthijs <axxo@g.o>
- * Copyright (c) 2004, Gentoo Foundation
- * 
- * Licensed under the GNU General Public License, v2
- *
- */
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.*;
-
-public class JXSLT
-{
-    public static void printHelp()
-    {
-        System.err
-                .println("Usage: java JXSLT ( -v <version> || -s <version> -t <version> ) -x <build.xslt> -i <oldbuild.xml> -o <newbuild.xml> ");
-    }
-
-    public static void main(String[] args)
-    {
-        // check if there are enough options given
-        if (args.length <= 8)
-        {
-            System.err.println("missing options");
-            printHelp();
-            System.exit(1);
-        }
-
-        // detailed parsing of command line arguments
-        File oldXmlFile = null, newXmlFile = null, xsltFile = null;
-        String source = null, target = null;
-        int i = 0;
-        while (i < args.length)
-        {
-            boolean match = false;
-            String[] options = {
-                    "-v", "--version", "-s", "--source", "-t", "--target", "-x", "--xsltsource", "-i", "--oldxml", "-o", "--newxml"
-            };
-            
-            if (args[i].substring(0, 1).equals("-"))
-            {
-                if (args[i+1].substring(0, 1).equals("-")) {
-                    System.err.println("missing argument for '"+args[i]+"'");
-                    printHelp();
-                    System.exit(1);
-                }
-                
-                int j = 0;
-                while (j < options.length)
-                {
-                    if (options[j].equals(args[i]))
-                    {
-                        match = true;
-                        break;
-                    }
-                    ++j;
-                }
-
-                if (match != true)
-                {
-                    System.err.println("invalid option '" + args[i] + "'");
-                    printHelp();
-                    System.exit(1);
-                }
-            } 
-
-            if (args[i].equalsIgnoreCase("-v") || args[i].equalsIgnoreCase("--version"))
-            {
-                target = source = args[i + 1];
-            } else if (args[i].equalsIgnoreCase("-s") || args[i].equalsIgnoreCase("--source")) 
-			{
-				source = args[i + 1];
-			}  else if (args[i].equalsIgnoreCase("-t") || args[i].equalsIgnoreCase("--target")) 
-			{
-				target = args[i + 1];
-			} else if (args[i].equalsIgnoreCase("-x")
-                    || args[i].equalsIgnoreCase("--xsltsource"))
-            {
-                xsltFile = new File(args[i + 1]);
-            } else if (args[i].equalsIgnoreCase("-i") || args[i].equalsIgnoreCase("--oldxml"))
-            {
-                oldXmlFile = new File(args[i + 1]);
-            } else if (args[i].equalsIgnoreCase("-o") || args[i].equalsIgnoreCase("--newxml"))
-            {
-                newXmlFile = new File(args[i + 1]);
-            }
-
-            ++i;
-        }
-        
-        // check if files exist
-        Source xmlSource = null, xsltSource = null;
-        if (oldXmlFile.exists())
-        {
-            xmlSource = new StreamSource(oldXmlFile);
-        } else
-        {
-            System.out.println("xml sourcefile doesn't exist");
-            System.exit(1);
-        }
-
-        if (xsltFile.exists())
-        {
-            xsltSource = new StreamSource(xsltFile);
-        } else
-        {
-            System.out.println("xslt sourcefile doesn't exist");
-            System.exit(1);
-        }
-        Result result = new StreamResult(newXmlFile);
-
-        // create a new transformer and perform a transformation
-        TransformerFactory transFact = TransformerFactory.newInstance();
-        Transformer trans = null;
-        try
-        {
-            trans = transFact.newTransformer(xsltSource);
-            trans.setParameter("source", source);
-            trans.setParameter("target", target);
-            trans.transform(xmlSource, result);
-            System.out.println(oldXmlFile + " transformed to " + newXmlFile);
-			System.exit(0);
-        } catch (TransformerConfigurationException e)
-        {
-            e.printStackTrace();
-        } catch (TransformerException e)
-        {
-            e.printStackTrace();
-        }
-    }
-}

diff --git a/src/obsolete/bsfix/Makefile b/src/obsolete/bsfix/Makefile
deleted file mode 100644
index 87b0e32..0000000
--- a/src/obsolete/bsfix/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2004 Karl Trygve Kalleberg <karltk@g.o>
-# Copyright 2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-#
-# $Header: /var/cvsroot/gentoo-src/javatoolkit/src/bsfix/Makefile,v 1.4 2005/01/02 02:30:12 axxo Exp $
-
-include ../../makedefs.mak
-
-all:
-
-dist:
-	mkdir -p ../../$(distdir)/src/bsfix
-	cp Makefile bsfix build-xml-source-target.xslt xml-rewrite.py xml-rewrite-2.py xml-rewrite-3.py class-version-verify.py ../../$(distdir)/src/bsfix
-
-install: all
-	install -m 0755 bsfix $(bindir)/
-	install -d $(DESTDIR)/usr/share/javatoolkit/lib
-	install build-xml-source-target.xslt ${DESTDIR}/usr/share/javatoolkit/
-	install -m 0755 xml-rewrite.py ${bindir}/
-	install -m 0755 xml-rewrite-2.py ${bindir}/
-	install -m 0755 xml-rewrite-3.py ${xmlrewritedir}/
-	install -m 0755 class-version-verify.py ${bindir}/
-
-testdir:=tests
-
-test:
-	# Dom based stuff
-	cat $(testdir)/build.xml | ./xml-rewrite-2.py -g > /dev/null
-	# Sax based stuff
-	cat $(testdir)/build.xml | ./xml-rewrite-2.py \
-		--change -e javac -e xjavac -a classpath -v '$${gentoo.classpath}' | grep gentoo.classpath > /dev/null
-	cp $(testdir)/build.xml $(testdir)/test.xml
-	./xml-rewrite-2.py -f $(testdir)/test.xml \
-		--change -e javac -e xjavac -a classpath -v '$${gentoo.classpath}'
-	grep gentoo.classpath $(testdir)/test.xml > /dev/null
-	rm $(testdir)/test.xml

diff --git a/src/obsolete/bsfix/bsfix b/src/obsolete/bsfix/bsfix
deleted file mode 100755
index 7d7dc79..0000000
--- a/src/obsolete/bsfix/bsfix
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-#
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@g.o>
-# Copyright (c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-
-java -cp /usr/share/javatoolkit/lib/ JXSLT $@

diff --git a/src/obsolete/bsfix/bsfix-eclipse.py b/src/obsolete/bsfix/bsfix-eclipse.py
deleted file mode 100755
index 3109b7d..0000000
--- a/src/obsolete/bsfix/bsfix-eclipse.py
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /usr/bin/python2
-#
-# Copyright(c) 2004, Karl Trygve Kalleberg <karltk@g.o>
-# Copyright(c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-src/javatoolkit/src/bsfix/bsfix-eclipse.py,v 1.1 2004/12/20 19:13:05 karltk Exp $
-
-#
-# Usage:
-#
-# bsfix-eclipse --prefix /usr/lib/eclipse-3 --versions 3.0.0,3.0.1 --varnames eclipse_classpath build.properties
-#
-
-import os
-import re
-import sys
-import optparse	
-
-import javatoolkit.parser as parser
-from javatoolkit.classpath import Classpath
-
-from javatoolkit import die
-	
-__author__ = "Karl Trygve Kalleberg <karltk@g.o>"
-__version__ = "0.1.0"
-__productname__ = "bsfix-eclipse"
-__description__ = "Gentoo Eclipse Build Script Fixer"
-	   
-def find_best_version(path, vers):
-	for ver in vers:
-		x = re.sub("[0-9].[0-9].[0-9]", ver, path)
-		if os.path.exists(x):
-			return ver
-	return None
-
-def resolve_version(doc, var, versions, prefix):
-
-	node = doc.find_node(var)
-	oldcp = Classpath(parser.expand(doc, node.value))
-	newcp = Classpath()
-							
-	for i in range(len(oldcp)):
-		entry = oldcp[i]
-		if entry.startswith(prefix):
-			ver = find_best_version(entry, versions)
-			if ver is None:
-				die(2, "Failed to resolve " + entry)
-				
-			substed_entry = re.sub("[0-9].[0-9].[0-9]", ver, entry)
-			newcp.append(substed_entry)
-		else:
-			newcp.append(entry)
-			
-	node.value = str(newcp)
-	return node
-
-"""
-Print program version to stdout.
-"""
-def print_version():
-	print __productname__ + "(" + __version__ + ") - " + \
-		__description__
-	print "Author(s): " + __author__
-
-"""
-Parse command line arguments
-"""
-def parse_args():
-	
-	parser = optparse.OptionParser(version="%prog " + __version__ )
-
-	parser.add_option("-p", "--prefix-path", dest="prefix_path", 
-			default="", help="path of Eclipse installation")
-
-	parser.add_option("-a", "--allowed-versions", dest="versions", 
-			default=".", help="versions to check for (comma separated)")
-
-	parser.add_option("-n", "--varnames", dest="varnames", 
-			default=".", help="attribute names to be considered as classpaths (comma separated)")
-	
-	(opts, args) = parser.parse_args()		
-	opts.varnames = opts.varnames.split(",")
-	opts.versions = opts.versions.split(",")
-	
-	return (opts, args)
-	
-def main():
-
-	(options, args) = parse_args()
-
-	for arg in args:
-		
-		doc = parser.buildproperties.parse(open(arg))
-		if doc == None:
-			raise "File not readable, '" + arg + "'"
-		
-		for var in options.varnames:
-			resolve_version(doc, var, options.versions, options.prefix_path)
-				
-		doc.dump()
-
-if __name__ == "__main__":
-	main()

diff --git a/src/obsolete/bsfix/bsfix.py b/src/obsolete/bsfix/bsfix.py
deleted file mode 100755
index 9aafe7d..0000000
--- a/src/obsolete/bsfix/bsfix.py
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/python2
-#
-# Copyright(c) 2004, Karl Trygve Kalleberg <karltk@g.o>
-# Copyright(c) 2004, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# $Header: /var/cvsroot/gentoo-src/javatoolkit/src/bsfix/bsfix.py,v 1.1 2004/12/20 19:13:05 karltk Exp $
-
-import os
-import re
-import sys
-import optparse
-
-import javatoolkit.parser as parser
-from javatoolkit.classpath import Classpath
-       
-def find_best_version(path, vers):
-    for ver in vers:
-        x = re.sub("[0-9].[0-9].[0-9]", ver, path)
-        if os.path.exists(x):
-            return ver
-    return None
-
-"""
-Parse command line arguments.
-"""
-def parse_args(args):
-
-	basedir = os.getcwd()
-
-	parser = optparse.OptionParser(version="%prog " + __version__ )
-
-	parser.add_option("-a", "--attribute", dest="attribute", 
-			default="", help="select this attribute")
-
-	parser.add_option("-r", "--replace", dest="replace", 
-			default=".", help="where to store the generated files")
-
-	parser.add_option("-c", "--cache-file", dest="cachefile",
-			default=basedir + "/cache3.db", help="where to store the cache")
-
-	parser.add_option("-m", "--manifest-file", dest="manifestfile",
-			default=basedir + "/manifest.synctool", help="where to store the manifest file")
-
-	parser.add_option("-u", "--update-mode", dest="update_mode",
-			default="quick", help="update mode, either 'generate' or 'quick'")
-
-	parser.add_option("-v", "--verbose", dest="verbosity",
-			default=3, help="verbosity")
-
-	return parser.parse_args()
-
-		        
-if __name__ == "__main__":
-
-    infile = sys.argv[1]
-    r = parser.buildproperties.parse(open(infile))
-
-    alt_versions = sys.argv[2:]
-    
-    n = parser.find_node(r, "eclipse_classpath")
-    cp = Classpath(n.value)
-
-    for i in range(len(cp)):
-        x = cp[i]
-        t = parser.expand(r, x)
-        if t.startswith("/usr/lib/eclipse-3"):
-            ver = find_best_version(t, alt_versions)
-            if ver is None:
-                print "Failed to resolve " + x
-                sys.exit(2)
-                
-            y = re.sub("[0-9].[0-9].[0-9]", ver, x)
-            cp[i] = y
-
-    n.value = str(cp)
-    
-    r.dump()
-

diff --git a/src/obsolete/bsfix/build-xml-source-target.xslt b/src/obsolete/bsfix/build-xml-source-target.xslt
deleted file mode 100644
index fd9bceb..0000000
--- a/src/obsolete/bsfix/build-xml-source-target.xslt
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0"?>
-	<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<xsl:output method="xml" indent="yes" />
-	<xsl:param name="target" />
-	<xsl:param name="source" />
-
-	<xsl:template match="@*|node()">
-		<xsl:copy>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-	<xsl:template match="javac|xjavac|javac.preset">
-		<xsl:copy>
-			<xsl:attribute name="target">
-				<xsl:value-of select="$target"/>
-			</xsl:attribute>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-	<xsl:template match="javac|xjavac|javac.preset|javadoc">
-		<xsl:copy>
-			<xsl:attribute name="source">
-				<xsl:value-of select="$source"/>
-			</xsl:attribute>
-			<xsl:apply-templates select="@*|node()"/>
-		</xsl:copy>
-	</xsl:template>
-</xsl:stylesheet>

diff --git a/src/obsolete/bsfix/rewrite2-speed-test.sh b/src/obsolete/bsfix/rewrite2-speed-test.sh
deleted file mode 100755
index b572206..0000000
--- a/src/obsolete/bsfix/rewrite2-speed-test.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-files=""
-JAVA_PKG_BSFIX_TARGET_TAGS=${JAVA_PKG_BSFIX_TARGET_TAGS:-"javac xjavac javac.preset"}
-JAVA_PKG_BSFIX_SOURCE_TAGS=${JAVA_PKG_BSFIX_SOURCE_TAGS:-"javadoc javac xjavac javac.preset"}
-
-want_source="java-1.4"
-want_target="java-1.5"
-
-NEWPATH="./" # TODO: CHANGEME
-rpath="./xmls"  # TODO: CHANGEME 
-
-for i in $(ls $rpath/b*);
-do
-	files=" $files -f $i"
-done
-
-clean(){
- rm -rf $rpath
- cp -rf $rpath.sav $rpath
-}
-
-old() {
-	xml-rewrite-2.py ${files} \
-	-c -e ${JAVA_PKG_BSFIX_SOURCE_TAGS// / -e } \
-	-a source -v ${want_source} ${output} 
-	xml-rewrite-2.py ${files} \
-	-c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \
-	-a target -v ${want_target} ${output}  
-}
-
-new(){
-    ${NEWPATH}/xml-rewrite-2.py ${files} \
-    -c --source-element ${JAVA_PKG_BSFIX_SOURCE_TAGS// / --source_elements } \
-	--source-attribute source --source-value ${want_source} \
-	--target-element   ${JAVA_PKG_BSFIX_TARGET_TAGS// / --target_elements}  \
-	--target-attribute target --target-value ${want_target} \
-	${output}  
-}
-
-clean
-echo  "_________________time old"
-time old|grep -v "ewrit"
-
-clean
-echo  "_________________time new"
-time new|grep -v "ewrit"  
-

diff --git a/src/obsolete/bsfix/tests/build.xml b/src/obsolete/bsfix/tests/build.xml
deleted file mode 100644
index e8a8aa5..0000000
--- a/src/obsolete/bsfix/tests/build.xml
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0"?>
-<project basedir="." default="lib">
-	<target name="init">
-    <!-- 
-      Default values for most properties. Module specific settings are made
-      in build-default.properties, local overrides go into build.properties
-    -->
-    <property file="${user.home}/.${ant.project.name}-build.properties"/>
-    <property file="${user.home}/.build.properties"/>
-    <property file="build.properties"/>
-    <property file="build-default.properties"/>
-    <property name="module.name" value="${ant.project.name}" />
-    
-    <property name="lib.dir" value="${dist.root}/lib" />
-    <property name="build.lib.dir" value="${dist.root}/build-lib" />
-    <property name="lib-test.dir" value="${dist.root}/tests" />
-    <property name="src.dir" value="src" />
-    <property name="test.dir" value="tests" />
-    <property name="build.dir" value="build" />
-    <property name="doc.dir" value="doc" />
-    <property name="lib-doc.dir" value="${dist.root}/doc" />
-    
-    <property name="module.jar" value="${lib.dir}/${module.name}.jar" />
-    
-    <property name="build.classes" value="${build.dir}/classes" />
-    <property name="build.debug" value="on" />
-    <property name="build.optimize" value="off" />
-    <property name="build.compiler" value="modern" />
-    
-    <property name="test.classes" value="${build.dir}/tests" />
-    <property name="test.results" value="${build.dir}/testresults" />
-    <property name="test.jar" value="${lib-test.dir}/${module.name}-tests.jar" />    
-    <property name="javadoc.packages" value="*" />
-    <property name="javadoc.dir" value="${doc.dir}/api" />
-    <property name="javadoc.bottom" value="Copyright &amp;copy; ${module.year} ${module.contributor}. All Rights reserved." />
-    <property name="javadoc.title" value="${module.fullname} ${module.version} API" />
-    <property name="javadoc.windowtitle" value="${javadoc.title}" />
-    <property name="javadoc.omitindex" value="false" />
-    <property name="javadoc.splitindex" value="true" />
-    <property name="javadoc.showauthor" value="true" />
-    <property name="javadoc.showuse" value="true" />
-    <property name="javadoc.showversion" value="true" />
-    <property name="javadoc.zip" value="${lib-doc.dir}/${module.name}.zip" />
-    
-    <property name="clean.backup-pattern" value="**/*~,**/*.bak" />
-
-
-    <!-- Automatically disable all test related targets if we don't have
-         a test source directory -->
-    <condition property="test.skip">
-      <not>
-        <available file="${test.dir}" />
-      </not>
-    </condition>
-    
-    <!-- Class paths for use in building and testing -->
-    <path id="module.classpath">
-      <pathelement path="${build.classes}"/>
-      <fileset dir="${lib.dir}"
-	       includes="${module.depends}"
-	       excludes="${module.jar}" />
-      <fileset dir="${build.lib.dir}"
-	       includes="${module.depends}"
-	       excludes="${module.jar}" />
-    </path>
-  
-    <path id="test.classpath">
-      <path refid="module.classpath" />
-      <pathelement path="${test.classes}" />
-      <!-- Include the test source dir so that we can find test data and
-           the like via getResource() -->
-      <pathelement path="${test.dir}" />
-      <!-- finally, include all of the junit stuff -->
-      <pathelement path="${build.lib.dir}/junit.jar" />
-      <pathelement path="${build.lib.dir}/junit-ext.jar" />
-      <pathelement path="${build.lib.dir}/junit-tivano.jar" />
-    </path>
-
-    <!-- redefine the junit task so that it uses the provided junit.jar -->
-    <!--<taskdef classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask" name="junit">
-      <classpath>
-        <pathelement path="${build.lib.dir}/junit.jar"/>
-        <pathelement path="${build.lib.dir}/ant-optional.jar"/>
-      </classpath>
-    </taskdef>-->
-  </target>
-  
-  <target name="all" depends="init,clean,compile,tests,dist"
-	  description="Build everything: clean, compile, tests, lib, javadoc, dist">
-  </target>
-
-  <target name="distclean" depends="clean-dist"
-	  description="Alias for 'clean-dist'" />
-  
-  
-  <target name="compile" depends="init"
-	  description="Compile the source files">
-    <mkdir dir="${build.classes}" />
-    <javac srcdir="${src.dir}"
-	   destdir="${build.classes}"
-	   debug="${build.debug}"
-	   optimize="${build.optimize}"
-	   includes="${build.includes}"
-	   excludes="${build.excludes}">
-      <classpath refid="module.classpath"/>
-    </javac>
-  </target>
-
-  <target name="lib" depends="init,compile"
-	  description="Build the module .jar file">
-  	<tstamp/>
-  	<delete file="${module.jar}"/>
-    <jar jarfile="${module.jar}">
-      <fileset file="${dist.root}/../LICENSE-xmlc"/>
-      <fileset dir="${build.classes}" />
-      <fileset dir="${src.dir}"
-	       includes="${module.lib.extra.includes}"
-	       excludes="${module.lib.extra.excludes}" />
-      <manifest>
-        <attribute name="Built-By" value="${user.name}"/>
-        <attribute name="Built-On" value="${TODAY}"/>
-        <section name="org/enhydra/xml/xmlc/taskdef/">
-          <attribute name="Specification-Title" value="Enhydra XMLC Ant Task"/>
-          <attribute name="Specification-Version" value="${module.version}"/>
-          <attribute name="Specification-Vendor" value="ObjectWeb Consortium"/>
-          <attribute name="Implementation-Title" value="org.enhydra.xml.xmlc.taskdef"/>
-          <attribute name="Implementation-Version" value="${module.version}"/> 
-          <attribute name="Implementation-Vendor" value="ObjectWeb Consortium"/>
-          <attribute name="Implementation-Vendor-Id" value="org.objectweb"/>
-          <attribute name="Implementation-URL" value="http://www.enhydra.org/tech/xmlc/"/>
-        </section>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="lib-tests" depends="init,compile-tests" unless="test.skip"
-	  description="Build the unit test .jar file">
-    <jar jarfile="${test.jar}">
-      <fileset dir="${test.classes}" />
-      <fileset dir="${test.dir}"
-	       includes="${test.lib.extra.includes}"
-	       excludes="${test.lib.extra.excludes}" />
-    </jar>
-  </target>
-
-  <target name="compile-tests" depends="init,compile" unless="test.skip"
-	  description="Compile the JUnit unit tests">
-    <mkdir dir="${test.classes}" />
-    <javac srcdir="${test.dir}"
-	   destdir="${test.classes}"
-	   debug="${build.debug}"
-	   optimize="${build.optimize}" >
-      <classpath refid="test.classpath"/>
-    </javac>
-  </target>
-
-  <target name="tests" depends="init,compile-tests" unless="test.skip"
-	  description="Compile and run the JUnit unit tests">
-    <mkdir dir="${test.results}"/>
-    <junit haltonfailure="no" printsummary="yes">
-      <classpath refid="test.classpath" />
-      <formatter type="plain"/>
-      <batchtest fork="yes" todir="${test.results}">
-        <fileset dir="${test.dir}">
-	  <include name="**/*Test.java"/>
-	</fileset>
-      </batchtest>
-    </junit>
-  </target>
-
-  <target name="javadoc" depends="init"
-	  description="Build the API documentation">
-    <mkdir dir="${javadoc.dir}"/>
-
-    <condition property="javadoc.breakiterator" value="-breakiterator" >
-      <or>
-        <equals arg1="${ant.java.version}" arg2="1.4" />
-        <equals arg1="${ant.java.version}" arg2="1.5" />
-      </or>
-    </condition>
-    <property name="javadoc.breakiterator" value="" />
-    <condition property="javadoc.jdk.href" value="http://java.sun.com/products/jdk/1.2/docs/api/">
-        <equals arg1="${ant.java.version}" arg2="1.2" />
-    </condition>
-    <condition property="javadoc.jdk.href" value="http://java.sun.com/j2se/1.3/docs/api/">
-        <equals arg1="${ant.java.version}" arg2="1.3" />
-    </condition>
-    <condition property="javadoc.jdk.href" value="http://java.sun.com/j2se/1.4/docs/api/">
-        <equals arg1="${ant.java.version}" arg2="1.4" />
-    </condition>
-    <condition property="javadoc.jdk.href" value="http://java.sun.com/j2se/1.5/docs/api/">
-        <equals arg1="${ant.java.version}" arg2="1.5" />
-    </condition>
-    <property name="javadoc.jdk.href" value="" />
-
-    <javadoc author="${javadoc.showauthor}" 
-             bottom="${javadoc.bottom}" 
-             destdir="${javadoc.dir}" 
-	     doctitle="${javadoc.title}" 
-             noindex="${javadoc.omitindex}" 
-             packagenames="${javadoc.packages}" 
-             splitindex="${javadoc.splitindex}" 
-             use="${javadoc.showuse}" 
-             version="${javadoc.showversion}" 
-             windowtitle="${javadoc.windowtitle}"
-             package="true"
-             additionalparam="${javadoc.breakiterator}" >
-      <link offline="true" href="${javadoc.url.xml-apis}" packagelistLoc="${javadoc.packagelistLoc.base}/xml-apis" />
-      <link offline="true" href="${javadoc.jdk.href}" packagelistLoc="${javadoc.packagelistLoc.base}/java" />
-      <classpath refid="module.classpath" />
-      <sourcepath>
-	<pathelement path="${src.dir}"/>
-      </sourcepath>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="init,lib,lib-tests,javadoc"
-	  description="Package up the library, unit tests and documentation">
-    <zip basedir="${doc.dir}" zipfile="${javadoc.zip}" />
-  </target>
-
-  <target name="clean" depends="init"
-	  description="Remove .class and backup files">
-    <delete dir="${build.classes}" />
-    <delete dir="${test.classes}" />
-    <delete>
-      <fileset defaultexcludes="no" dir=""
-	       includes="${clean.backup-pattern}" />
-    </delete>
-  </target>
-
-  <target name="clean-dist" depends="init,clean"
-	  description="Remove all generated and backup files">
-    <delete includeEmptyDirs="true" quiet="true">
-       <fileset dir="${doc.dir}" includes="**/*" />
-    </delete>
-    <delete dir="${test.results}" />
-    <delete file="${module.jar}" />
-    <delete file="${test.jar}" />
-    <delete file="${javadoc.zip}" />
-  </target>
-  
-  <target name="dtd" 
-	  description="Regenerate the DTD for this build file">
-    <antstructure output="project.dtd" />
-  </target>
-</project>