From b002eddf94ec3b320791999adbd905f99afc2884 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 17 Jan 2012 10:15:55 +0000
Subject: [PATCH] Fix OPENDJ-407: Upgrade version of Ant included in OpenDJ server sources
---
opends/ext/ant/lib/ant-antlr.jar | 0
opends/ext/ant/etc/maudit-frames.xsl | 1
opends/ext/ant/bin/ant | 23 +
opends/ext/ant/lib/ant-testutil.jar | 0
opends/ext/ant/etc/checkstyle/checkstyle-text.xsl | 1
opends/ext/ant/LICENSE | 272 +++++++++++++++++
opends/ext/ant/etc/junit-frames-xalan1.xsl | 33 +
opends/ext/ant/lib/libraries.properties | 111 ++++--
opends/ext/ant/bin/complete-ant-cmd.pl | 2
opends/ext/ant/etc/junit-noframes.xsl | 22 +
opends/ext/ant/lib/ant-apache-oro.jar | 0
opends/ext/ant/etc/jdepend.xsl | 1
opends/ext/ant/lib/ant-apache-regexp.jar | 0
opends/ext/ant/lib/ant-jdepend.jar | 0
opends/ext/ant/lib/ant-apache-bsf.jar | 0
opends/ext/ant/etc/ant-bootstrap.jar | 0
opends/ext/ant/etc/mmetrics-frames.xsl | 1
opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl | 1
opends/ext/ant/lib/ant-junit.jar | 0
opends/ext/ant/lib/ant-jai.jar | 0
opends/ext/ant/etc/junit-frames.xsl | 47 ++
opends/ext/ant/lib/ant-netrexx.jar | 0
opends/ext/ant/lib/ant-jmf.jar | 0
opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl | 14
opends/ext/ant/etc/jdepend-frames.xsl | 1
opends/ext/ant/lib/ant-javamail.jar | 0
opends/ext/ant/lib/ant-apache-log4j.jar | 0
opends/ext/ant/fetch.xml | 157 ++++++++-
opends/ext/ant/lib/README | 18
opends/ext/ant/lib/ant-apache-bcel.jar | 0
opends/ext/ant/lib/ant-commons-net.jar | 0
opends/ext/ant/lib/ant-junit4.jar | 0
opends/ext/ant/lib/ant-apache-resolver.jar | 0
opends/ext/ant/bin/runant.py | 204 ++++++------
opends/ext/ant/lib/ant-swing.jar | 0
opends/ext/ant/lib/ant-commons-logging.jar | 0
/dev/null | 0
opends/build.xml | 6
opends/ext/ant/lib/ant-apache-xalan2.jar | 0
opends/ext/ant/bin/ant.bat | 14
opends/ext/ant/etc/log.xsl | 1
opends/ext/ant/lib/ant-jsch.jar | 0
opends/ext/ant/lib/ant.jar | 0
opends/ext/ant/etc/coverage-frames.xsl | 1
opends/ext/ant/lib/ant-launcher.jar | 0
opends/ext/ant/etc/tagdiff.xsl | 3
46 files changed, 699 insertions(+), 235 deletions(-)
diff --git a/opends/build.xml b/opends/build.xml
index 8f5eea2..1e91a60 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -164,6 +164,12 @@
<property name="snmp.classes.dir"
location="${classes.dir}/org/opends/server/snmp" />
+
+ <!-- Prevent ant runtime from being included on classpath during
+ compilation. -->
+ <presetdef name="javac">
+ <javac includeantruntime="false" />
+ </presetdef>
<!-- Create a package bundle containing the DSML library. -->
<target name="dsml" depends="predsml,package"
diff --git a/opends/ext/ant/LICENSE b/opends/ext/ant/LICENSE
new file mode 100644
index 0000000..e7789e0
--- /dev/null
+++ b/opends/ext/ant/LICENSE
@@ -0,0 +1,272 @@
+/*
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright [yyyy] [name of copyright owner]
+ *
+ * Licensed 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.
+ */
+
+W3C� SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted) within the body
+ of any redistributed or derivative code.
+ 3. Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from
+ which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+
+Joseph Reagle <site-policy@w3.org>
+
+This license came from: http://www.megginson.com/SAX/copying.html
+ However please note future versions of SAX may be covered
+ under http://saxproject.org/?selected=pd
+
+SAX2 is Free!
+
+I hereby abandon any property rights to SAX 2.0 (the Simple API for
+XML), and release all of the SAX 2.0 source code, compiled code, and
+documentation contained in this distribution into the Public Domain.
+SAX comes with NO WARRANTY or guarantee of fitness for any
+purpose.
+
+David Megginson, david@megginson.com
+2000-05-05
diff --git a/opends/ext/ant/bin/ant b/opends/ext/ant/bin/ant
index bcc63c8..0dc84e0 100755
--- a/opends/ext/ant/bin/ant
+++ b/opends/ext/ant/bin/ant
@@ -80,6 +80,7 @@
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
darwin=false;
+mingw=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
Darwin*) darwin=true
@@ -87,6 +88,7 @@
JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home
fi
;;
+ MINGW*) mingw=true ;;
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
@@ -108,16 +110,23 @@
ANT_HOME=`dirname "$PRG"`/..
# make it fully qualified
- ANT_HOME=`cd "$ANT_HOME" && pwd`
+ ANT_HOME=`cd "$ANT_HOME" > /dev/null && pwd`
fi
-# For Cygwin, ensure paths are in UNIX format before anything is touched
+# For Cygwin and Mingw, ensure paths are in UNIX format before
+# anything is touched
if $cygwin ; then
[ -n "$ANT_HOME" ] &&
ANT_HOME=`cygpath --unix "$ANT_HOME"`
[ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
+if $mingw ; then
+ [ -n "$ANT_HOME" ] &&
+ ANT_HOME="`(cd "$ANT_HOME"; pwd)`"
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+fi
# set ANT_LIB location
ANT_LIB="${ANT_HOME}/lib"
@@ -251,9 +260,9 @@
else
format=windows
fi
- ANT_HOME=`cygpath --$format "$ANT_HOME"`
+ [ -n "$ANT_HOME" ] && ANT_HOME=`cygpath --$format "$ANT_HOME"`
ANT_LIB=`cygpath --$format "$ANT_LIB"`
- JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
if [ -n "$CLASSPATH" ] ; then
@@ -319,8 +328,8 @@
ant_sys_opts="-Djikes.class.path=\"$JIKESPATH\""
fi
fi
-ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\" $ant_exec_args"
+ant_exec_command="exec \"$JAVACMD\" $ANT_OPTS -classpath \"$LOCALCLASSPATH\" -Dant.home=\"$ANT_HOME\" -Dant.library.dir=\"$ANT_LIB\" $ant_sys_opts org.apache.tools.ant.launch.Launcher $ANT_ARGS -cp \"$CLASSPATH\""
if $ant_exec_debug ; then
- echo $ant_exec_command
+ echo $ant_exec_command $ant_exec_args
fi
-eval $ant_exec_command
+eval $ant_exec_command "$ant_exec_args"
diff --git a/opends/ext/ant/bin/ant.bat b/opends/ext/ant/bin/ant.bat
index 6d57c81..3486e14 100644
--- a/opends/ext/ant/bin/ant.bat
+++ b/opends/ext/ant/bin/ant.bat
@@ -59,9 +59,7 @@
rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
+set ANT_CMD_LINE_ARGS=
:setupArgs
if ""%1""=="""" goto doneStart
if ""%1""==""-noclasspath"" goto clearclasspath
@@ -80,7 +78,7 @@
:doneStart
-if _USE_CLASSPATH==no goto findAntHome
+if "%_USE_CLASSPATH%"=="no" goto findAntHome
:stripClasspath
if not _%CLASSPATH:~-1%==_\ goto findAntHome
@@ -193,13 +191,6 @@
if "%ANT_ERROR%"=="0" goto mainEnd
-rem Set the return code if we are not in NT. We can only set
-rem a value of 1, but it's better than nothing.
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
-rem Set the ERRORLEVEL if we are running NT.
-if "%OS%"=="Windows_NT" color 00
-
goto omega
:mainEnd
@@ -224,3 +215,4 @@
:omega
+exit /b %ANT_ERROR%
diff --git a/opends/ext/ant/bin/complete-ant-cmd.pl b/opends/ext/ant/bin/complete-ant-cmd.pl
index b58c26e..3789124 100755
--- a/opends/ext/ant/bin/complete-ant-cmd.pl
+++ b/opends/ext/ant/bin/complete-ant-cmd.pl
@@ -83,7 +83,7 @@
# cache-file.
my $cacheFile = $buildFile;
$cacheFile =~ s|(.*/)?(.*)|${1}.ant-targets-${2}|;
- if ((!-e $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
+ if ((!-e $cacheFile) || (-z $cacheFile) || (-M $buildFile) < (-M $cacheFile)) {
open( CACHE, '>'.$cacheFile ) || die "can\'t write $cacheFile: $!\n";
open( HELP, "$antCmd -projecthelp -f '$buildFile'|" ) || return();
my %targets;
diff --git a/opends/ext/ant/bin/runant.py b/opends/ext/ant/bin/runant.py
index eec549e..0f81a80 100755
--- a/opends/ext/ant/bin/runant.py
+++ b/opends/ext/ant/bin/runant.py
@@ -1,102 +1,102 @@
-#!/usr/bin/python
-# 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.
-#
-
-"""
-
- runant.py
-
- This script is a translation of the runant.pl written by Steve Loughran.
- It runs ant with/out arguments, it should be quite portable (thanks to
- the python os library)
- This script has been tested with Python2.0/Win2K
-
- created: 2001-04-11
- author: Pierre Dittgen pierre.dittgen@criltelecom.com
-
- Assumptions:
-
- - the "java" executable/script is on the command path
-"""
-import os, os.path, string, sys
-
-# Change it to 1 to get extra debug information
-debug = 0
-
-#######################################################################
-
-# If ANT_HOME is not set default to script's parent directory
-if os.environ.has_key('ANT_HOME'):
- ANT_HOME = os.environ['ANT_HOME']
-else:
- ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
-
-# set ANT_LIB location
-ANT_LIB = os.path.join(ANT_HOME, 'lib')
-
-# set JAVACMD (check variables JAVACMD and JAVA_HOME)
-JAVACMD = None
-if not os.environ.has_key('JAVACMD'):
- if os.environ.has_key('JAVA_HOME'):
- if not os.path.exists(os.environ['JAVA_HOME']):
- print "Warning: JAVA_HOME is not defined correctly."
- else:
- JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
- else:
- print "Warning: JAVA_HOME not set."
-else:
- JAVACMD = os.environ['JAVACMD']
-if not JAVACMD:
- JAVACMD = 'java'
-
-launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
-if not os.path.exists(launcher_jar):
- print 'Unable to locate ant-launcher.jar. Expected to find it in %s' % \
- ANT_LIB
-
-# Build up standard classpath (LOCALCLASSPATH)
-LOCALCLASSPATH = launcher_jar
-if os.environ.has_key('LOCALCLASSPATH'):
- LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
-
-ANT_OPTS = ""
-if os.environ.has_key('ANT_OPTS'):
- ANT_OPTS = os.environ['ANT_OPTS']
-
-OPTS = ""
-if os.environ.has_key('JIKESPATH'):
- OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
-
-ANT_ARGS = ""
-if os.environ.has_key('ANT_ARGS'):
- ANT_ARGS = os.environ['ANT_ARGS']
-
-CLASSPATH = ""
-if os.environ.has_key('CLASSPATH'):
- CLASSPATH = os.environ['CLASSPATH']
-
-# Builds the commandline
-cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
- 'org.apache.tools.ant.launch.Launcher %s -lib %s %s') \
- % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
- CLASSPATH, string.join(sys.argv[1:], ' '))
-
-if debug:
- print '\n%s\n\n' % (cmdline)
-sys.stdout.flush()
-
-# Run the biniou!
-os.system(cmdline)
+#!/usr/bin/python
+# 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.
+#
+
+"""
+
+ runant.py
+
+ This script is a translation of the runant.pl written by Steve Loughran.
+ It runs ant with/out arguments, it should be quite portable (thanks to
+ the python os library)
+ This script has been tested with Python2.0/Win2K
+
+ created: 2001-04-11
+ author: Pierre Dittgen pierre.dittgen@criltelecom.com
+
+ Assumptions:
+
+ - the "java" executable/script is on the command path
+"""
+import os, os.path, string, sys
+
+# Change it to 1 to get extra debug information
+debug = 0
+
+#######################################################################
+
+# If ANT_HOME is not set default to script's parent directory
+if os.environ.has_key('ANT_HOME'):
+ ANT_HOME = os.environ['ANT_HOME']
+else:
+ ANT_HOME = os.path.dirname(os.path.dirname(os.path.abspath(sys.argv[0])))
+
+# set ANT_LIB location
+ANT_LIB = os.path.join(ANT_HOME, 'lib')
+
+# set JAVACMD (check variables JAVACMD and JAVA_HOME)
+JAVACMD = None
+if not os.environ.has_key('JAVACMD'):
+ if os.environ.has_key('JAVA_HOME'):
+ if not os.path.exists(os.environ['JAVA_HOME']):
+ print "Warning: JAVA_HOME is not defined correctly."
+ else:
+ JAVACMD = os.path.join(os.environ['JAVA_HOME'], 'bin', 'java')
+ else:
+ print "Warning: JAVA_HOME not set."
+else:
+ JAVACMD = os.environ['JAVACMD']
+if not JAVACMD:
+ JAVACMD = 'java'
+
+launcher_jar = os.path.join(ANT_LIB, 'ant-launcher.jar')
+if not os.path.exists(launcher_jar):
+ print 'Warning: Unable to locate ant-launcher.jar. Expected to find it in %s' % \
+ ANT_LIB
+
+# Build up standard classpath (LOCALCLASSPATH)
+LOCALCLASSPATH = launcher_jar
+if os.environ.has_key('LOCALCLASSPATH'):
+ LOCALCLASSPATH += os.pathsep + os.environ['LOCALCLASSPATH']
+
+ANT_OPTS = ""
+if os.environ.has_key('ANT_OPTS'):
+ ANT_OPTS = os.environ['ANT_OPTS']
+
+OPTS = ""
+if os.environ.has_key('JIKESPATH'):
+ OPTS = '-Djikes.class.path=\"%s\"' % os.environ['JIKESPATH']
+
+ANT_ARGS = ""
+if os.environ.has_key('ANT_ARGS'):
+ ANT_ARGS = os.environ['ANT_ARGS']
+
+CLASSPATH = ""
+if os.environ.has_key('CLASSPATH'):
+ CLASSPATH = "-lib " + os.environ['CLASSPATH']
+
+# Builds the commandline
+cmdline = ('%s %s -classpath %s -Dant.home=%s %s ' + \
+ 'org.apache.tools.ant.launch.Launcher %s %s %s') \
+ % (JAVACMD, ANT_OPTS, LOCALCLASSPATH, ANT_HOME, OPTS, ANT_ARGS, \
+ CLASSPATH, string.join(sys.argv[1:], ' '))
+
+if debug:
+ print '\n%s\n\n' % (cmdline)
+sys.stdout.flush()
+
+# Run the biniou!
+os.system(cmdline)
diff --git a/opends/ext/ant/etc/ant-bootstrap.jar b/opends/ext/ant/etc/ant-bootstrap.jar
index f51b54f..2c6a6b4 100644
--- a/opends/ext/ant/etc/ant-bootstrap.jar
+++ b/opends/ext/ant/etc/ant-bootstrap.jar
Binary files differ
diff --git a/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl b/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
index d381b55..c79c0b7 100644
--- a/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
+++ b/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
@@ -1,6 +1,7 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
- xmlns:redirect="org.apache.xalan.lib.Redirect"
+ xmlns:redirect="http://xml.apache.org/xalan/redirect"
extension-element-prefixes="redirect">
<!--
@@ -224,13 +225,18 @@
-->
<xsl:template name="path">
<xsl:param name="path"/>
- <xsl:if test="contains($path,'/')">
+
+ <!-- Convert a windows path '\' to a unix path '/' for further processing. -->
+ <xsl:variable name="path2" select="translate($path,'\','/')"/>
+
+
+ <xsl:if test="contains($path2,'/')">
<xsl:text>../</xsl:text>
<xsl:call-template name="path">
- <xsl:with-param name="path"><xsl:value-of select="substring-after($path,'/')"/></xsl:with-param>
+ <xsl:with-param name="path"><xsl:value-of select="substring-after($path2,'/')"/></xsl:with-param>
</xsl:call-template>
</xsl:if>
- <xsl:if test="not(contains($path,'/')) and not($path = '')">
+ <xsl:if test="not(contains($path2,'/')) and not($path2 = '')">
<xsl:text>../</xsl:text>
</xsl:if>
</xsl:template>
diff --git a/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl b/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
index 333aecf..7359e41 100644
--- a/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
+++ b/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--
diff --git a/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl b/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
index 4d7ab86..5fc6eab 100644
--- a/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
+++ b/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
diff --git a/opends/ext/ant/etc/coverage-frames.xsl b/opends/ext/ant/etc/coverage-frames.xsl
index bba384b..a55a52a 100644
--- a/opends/ext/ant/etc/coverage-frames.xsl
+++ b/opends/ext/ant/etc/coverage-frames.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
diff --git a/opends/ext/ant/etc/jdepend-frames.xsl b/opends/ext/ant/etc/jdepend-frames.xsl
index 20cc4ef..ccc9dcc 100644
--- a/opends/ext/ant/etc/jdepend-frames.xsl
+++ b/opends/ext/ant/etc/jdepend-frames.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
diff --git a/opends/ext/ant/etc/jdepend.xsl b/opends/ext/ant/etc/jdepend.xsl
index 5acafae..f813297 100644
--- a/opends/ext/ant/etc/jdepend.xsl
+++ b/opends/ext/ant/etc/jdepend.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--
diff --git a/opends/ext/ant/etc/junit-frames-xalan1.xsl b/opends/ext/ant/etc/junit-frames-xalan1.xsl
index f637065..0efb758 100644
--- a/opends/ext/ant/etc/junit-frames-xalan1.xsl
+++ b/opends/ext/ant/etc/junit-frames-xalan1.xsl
@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -96,14 +97,28 @@
<xsl:apply-templates select="." mode="class.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.txt">
- <xsl:value-of select="./system-out" />
- </redirect:write>
+ <redirect:write file="{$output.dir}/{$package.dir}/{@name}-out.html">
+ <html>
+ <head>
+ <title>Standard Output from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-out"/></pre>
+ </body>
+ </html>
+ </redirect:write>
</xsl:if>
<xsl:if test="string-length(./system-err)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.txt">
- <xsl:value-of select="./system-err" />
- </redirect:write>
+ <redirect:write file="{$output.dir}/{$package.dir}/{@name}-err.html">
+ <html>
+ <head>
+ <title>Standard Error from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-err"/></pre>
+ </body>
+ </html>
+ </redirect:write>
</xsl:if>
</xsl:for-each>
</xsl:template>
@@ -263,7 +278,7 @@
<xsl:if test="string-length(./system-out)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of select="@name"/>-out.html</xsl:attribute>
System.out »
</a>
</div>
@@ -271,7 +286,7 @@
<xsl:if test="string-length(./system-err)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of select="@name"/>-err.html</xsl:attribute>
System.err »
</a>
</div>
diff --git a/opends/ext/ant/etc/junit-frames.xsl b/opends/ext/ant/etc/junit-frames.xsl
index 94e4272..535ba82 100644
--- a/opends/ext/ant/etc/junit-frames.xsl
+++ b/opends/ext/ant/etc/junit-frames.xsl
@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils"
extension-element-prefixes="redirect">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
+<xsl:output method="html" indent="yes" encoding="UTF-8"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,6 +32,7 @@
-->
<xsl:param name="output.dir" select="'.'"/>
+<xsl:param name="TITLE">Unit Test Results.</xsl:param>
<xsl:template match="testsuites">
@@ -115,13 +117,27 @@
<xsl:apply-templates select="." mode="class.details"/>
</redirect:write>
<xsl:if test="string-length(./system-out)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.txt">
- <xsl:value-of disable-output-escaping="yes" select="./system-out"/>
+ <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-out.html">
+ <html>
+ <head>
+ <title>Standard Output from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-out"/></pre>
+ </body>
+ </html>
</redirect:write>
</xsl:if>
<xsl:if test="string-length(./system-err)!=0">
- <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.txt">
- <xsl:value-of disable-output-escaping="yes" select="./system-err"/>
+ <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-err.html">
+ <html>
+ <head>
+ <title>Standard Error from <xsl:value-of select="@name"/></title>
+ </head>
+ <body>
+ <pre><xsl:value-of select="./system-err"/></pre>
+ </body>
+ </html>
</redirect:write>
</xsl:if>
<xsl:if test="@failures != 0">
@@ -144,7 +160,7 @@
<xsl:template name="index.html">
<html>
<head>
- <title>Unit Test Results.</title>
+ <title><xsl:value-of select="$TITLE"/></title>
</head>
<frameset cols="20%,80%">
<frameset rows="30%,70%">
@@ -382,7 +398,7 @@
<xsl:if test="string-length(./system-out)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-out.html</xsl:attribute>
System.out »
</a>
</div>
@@ -390,7 +406,7 @@
<xsl:if test="string-length(./system-err)!=0">
<div class="Properties">
<a>
- <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
+ <xsl:attribute name="href">./<xsl:value-of select="@id"/>_<xsl:value-of select="@name"/>-err.html</xsl:attribute>
System.err »
</a>
</div>
@@ -688,7 +704,7 @@
<!-- Page HEADER -->
<xsl:template name="pageHeader">
- <h1>Unit Test Results</h1>
+ <h1><xsl:value-of select="$TITLE"/></h1>
<table width="100%">
<tr>
<td align="left"></td>
@@ -860,7 +876,18 @@
-->
<xsl:template name="br-replace">
<xsl:param name="word"/>
- <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/>
+ <xsl:choose>
+ <xsl:when test="contains($word, '
')">
+ <xsl:value-of select="substring-before($word, '
')"/>
+ <br/>
+ <xsl:call-template name="br-replace">
+ <xsl:with-param name="word" select="substring-after($word, '
')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$word"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template name="display-time">
diff --git a/opends/ext/ant/etc/junit-noframes.xsl b/opends/ext/ant/etc/junit-noframes.xsl
index 5e67587..18177a1 100644
--- a/opends/ext/ant/etc/junit-noframes.xsl
+++ b/opends/ext/ant/etc/junit-noframes.xsl
@@ -1,7 +1,8 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:stringutils="xalan://org.apache.tools.ant.util.StringUtils">
-<xsl:output method="html" indent="yes" encoding="US-ASCII"
+<xsl:output method="html" indent="yes" encoding="UTF-8"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:decimal-format decimal-separator="." grouping-separator="," />
<!--
@@ -21,6 +22,8 @@
limitations under the License.
-->
+<xsl:param name="TITLE">Unit Test Results.</xsl:param>
+
<!--
Sample stylesheet to be used with Ant JUnitReport output.
@@ -32,7 +35,7 @@
<xsl:template match="testsuites">
<html>
<head>
- <title>Unit Test Results</title>
+ <title><xsl:value-of select="$TITLE"/></title>
<style type="text/css">
body {
font:normal 68% verdana,arial,helvetica;
@@ -306,7 +309,7 @@
<!-- Page HEADER -->
<xsl:template name="pageHeader">
- <h1>Unit Test Results</h1>
+ <h1><xsl:value-of select="$TITLE"/></h1>
<table width="100%">
<tr>
<td align="left"></td>
@@ -448,7 +451,18 @@
-->
<xsl:template name="br-replace">
<xsl:param name="word"/>
- <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/>
+ <xsl:choose>
+ <xsl:when test="contains($word, '
')">
+ <xsl:value-of select="substring-before($word, '
')"/>
+ <br/>
+ <xsl:call-template name="br-replace">
+ <xsl:with-param name="word" select="substring-after($word, '
')"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$word"/>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template name="display-time">
diff --git a/opends/ext/ant/etc/log.xsl b/opends/ext/ant/etc/log.xsl
index 63e5729..5040993 100644
--- a/opends/ext/ant/etc/log.xsl
+++ b/opends/ext/ant/etc/log.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<!--
diff --git a/opends/ext/ant/etc/maudit-frames.xsl b/opends/ext/ant/etc/maudit-frames.xsl
index 7ec32f2..257c0c8 100644
--- a/opends/ext/ant/etc/maudit-frames.xsl
+++ b/opends/ext/ant/etc/maudit-frames.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:redirect="org.apache.xalan.lib.Redirect"
diff --git a/opends/ext/ant/etc/mmetrics-frames.xsl b/opends/ext/ant/etc/mmetrics-frames.xsl
index effc184..8b4643a 100644
--- a/opends/ext/ant/etc/mmetrics-frames.xsl
+++ b/opends/ext/ant/etc/mmetrics-frames.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:lxslt="http://xml.apache.org/xslt"
xmlns:xalan="http://xml.apache.org/xalan"
diff --git a/opends/ext/ant/etc/tagdiff.xsl b/opends/ext/ant/etc/tagdiff.xsl
index 38e9366..5d430a7 100644
--- a/opends/ext/ant/etc/tagdiff.xsl
+++ b/opends/ext/ant/etc/tagdiff.xsl
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -163,7 +164,7 @@
<xsl:otherwise>
<xsl:attribute name="href"><xsl:value-of select="$cvsweb"/><xsl:value-of select="$module" />/<xsl:value-of select="name" />?r1=<xsl:value-of select="revision" />&r2=<xsl:value-of select="prevrevision"/>&diff_format=h</xsl:attribute>
</xsl:otherwise>
- </xsl:choose> (<xsl:value-of select="revision"/>)
+ </xsl:choose> (<xsl:if test="count(prevrevision) > 0"> <xsl:value-of select="prevrevision"/> --> </xsl:if> <xsl:value-of select="revision"/>)
</a>
</xsl:if>
</li>
diff --git a/opends/ext/ant/fetch.xml b/opends/ext/ant/fetch.xml
index a0cc2a9..d0628d2 100644
--- a/opends/ext/ant/fetch.xml
+++ b/opends/ext/ant/fetch.xml
@@ -29,8 +29,8 @@
You can choose three locations, by going -Ddest=LOCATION on the command line
-Ddest=user user lib dir ${user.home}/.ant/lib
- -Ddest=system ant lib dir ${ant.home}/lib --Default--
- -Ddest=optional optional dir ${ant.home}/lib/optional (for Ant developers)
+ -Ddest=system ant lib dir ${ant.home}/lib
+ -Ddest=optional optional dir $${basedir}/lib/optional (for Ant developers)
You may also need to set proxy settings. On Java1.5, Ant tries to get
this from the OS, unless you use the -noproxy option.
@@ -60,10 +60,25 @@
<!-- load in our properties table -->
<property file="${lib.dir}/libraries.properties"/>
+ <!-- Temporary cache for working files -->
+ <property name="temp.dir" location="${user.home}/.ant/tempcache" />
+ <property name="keep.temp.dir" value="true" />
+
<import file="get-m2.xml" />
<target name="pick-dest">
- <property name="dest" value="system" />
+ <fail>
+ <condition>
+ <not>
+ <isset property="dest"/>
+ </not>
+ </condition>ERROR
+Set -Ddest=LOCATION on the command line
+ -Ddest=user user lib dir ${user.home}/.ant/lib
+ -Ddest=system ant lib dir ${ant.home}/lib
+ -Ddest=optional optional dir $${basedir}/lib/optional (for Ant developers)
+ </fail>
+
<condition property="dest.dir"
value="${lib.dir}">
<equals arg1="${dest}" arg2="system" />
@@ -88,9 +103,10 @@
<macrodef name="f2">
<attribute name="project" />
<attribute name="archive" default="@{project}"/>
+ <attribute name="repository" default="${m2.repo}"/>
<sequential>
<fail>
- Unknown archive @{archive} -no property @{archive}.version defined.
+ Unknown archive @{archive} -no property @{archive}.version defined in ${lib.dir}/libraries.properties.
<condition>
<not>
<isset property="@{archive}.version"/>
@@ -101,21 +117,83 @@
<dependency groupID="@{project}"
artifactID="@{archive}"
version="${@{archive}.version}"/>
+ <remoteRepository url="@{repository}" />
</artifact:dependencies>
<!-- now we are left with the problem of getting the files
into our directory -->
- <copypath destdir="${dest.dir}" pathref="@{archive}.path">
+ <copy todir="${dest.dir}">
+ <path refid="@{archive}.path" />
<flattenmapper/>
- </copypath>
+ </copy>
</sequential>
</macrodef>
</target>
+ <target name="nonm2-macros" depends="pick-dest">
+ <macrodef name="get-ftp-file">
+ <attribute name="host" />
+ <attribute name="port" default="21"/>
+ <attribute name="remotedir" />
+ <attribute name="filename" />
+ <attribute name="localdir" default="${dest.dir}" />
+ <attribute name="user" default="anonymous"/>
+ <attribute name="pw" default="anonymous"/>
+ <sequential>
+ <ftp server="@{host}" port="@{port}" userid="@{user}" password="@{pw}" passive="true"
+ remotedir="@{remotedir}" action="get" depends="true" preserveLastModified="true"
+ skipFailedTransfers="true">
+ <fileset dir="@{localdir}">
+ <include name="@{filename}" />
+ </fileset>
+ </ftp>
+ </sequential>
+ </macrodef>
+
+ </target>
+
<!-- any init stuff -->
<target name="init" depends="macros" />
+ <target name="init-no-m2" depends="nonm2-macros" />
+
+ <target name="init-cache">
+ <available property="temp.cache.already.exists" file="${temp.dir}" type="dir" />
+ <condition property="user.wants.temp.cache">
+ <and>
+ <isset property="keep.temp.dir" />
+ <not>
+ <or>
+ <equals arg1="${keep.temp.dir}" arg2="false" casesensitive="false" />
+ <equals arg1="${keep.temp.dir}" arg2="no" casesensitive="false" />
+ <equals arg1="${keep.temp.dir}" arg2="off" casesensitive="false" />
+ </or>
+ </not>
+ </and>
+ </condition>
+ <condition property="delete.temp.cache">
+ <and>
+ <not>
+ <isset property="temp.cache.already.exists" />
+ </not>
+ <not>
+ <isset property="user.wants.temp.cache" />
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="-setup-temp-cache" depends="init-cache" unless="temp.cache.already.exists"
+ description="Setup temporary cache for downloaded files">
+ <mkdir dir="${temp.dir}" />
+ </target>
+
+ <target name="-cleanup-temp-cache" depends="init-cache" if="delete.temp.cache"
+ description="Gets rid of the temporary cache directory">
+ <delete dir="${temp.dir}" />
+ </target>
+
<target name="diag" depends="init">
<echoproperties />
@@ -141,26 +219,12 @@
<f2 project="xml-resolver" />
</target>
- <!--
- This is not used as
- 1. we want the names of the libraries to be fixed, or it will break Ant's manifest.
- 2. We like to get the more recent artifacts than are in the repo at the time of writing (2006-10-16)
- 3. Xerces has a dependency on v 1.3.03 of Xml-apis, which is wrong.
- If/when the artifacts stabilize, we could switch to it.
- -->
-
- <target name="xerces"
- description="load an updated version of Xerces"
- depends="init">
- <f2 project="xerces" archive="xercesImpl"/>
- <f2 project="xerces" archive="xmlParserAPIs" />
- </target>
-
<target name="networking"
description="load networking libraries (commons-net; jsch)"
depends="init">
<f2 project="commons-net" />
<f2 project="com.jcraft" archive="jsch"/>
+ <available property="have.commons.net" classname="org.apache.commons.net.ftp.FTPClientConfig"/>
</target>
<target name="regexp"
@@ -220,8 +284,8 @@
</target>
<target name="script"
- description="load script languages"
- depends="bsf,jruby,jython,beanshell,rhino"/>
+ description="load script languages (except jython)"
+ depends="bsf,jruby,beanshell,rhino"/>
<target name="debugging"
description="internal ant debugging"
@@ -229,8 +293,51 @@
<f2 project="which" />
</target>
+ <target name="javamail" depends="init"
+ description="load javamail">
+ <f2 project="javax.mail" archive="mail"/>
+ </target>
+
+ <target name="jspc" depends="init" description="loads Jasper">
+ <f2 project="tomcat" archive="jasper-compiler"/>
+ <f2 project="tomcat" archive="jasper-runtime"/>
+ <f2 project="javax.servlet" archive="servlet-api"/>
+ </target>
+
+ <target name="jai" depends="init"
+ description="load java advanced imaging">
+ <f2 project="javax.media" archive="jai-core" repository="http://repository.jboss.org/maven2"/>
+ <f2 project="com.sun.media" archive="jai-codec" repository="http://repository.jboss.org/maven2"/>
+ </target>
+
+ <target name="netrexx" depends="init-no-m2,-setup-temp-cache,networking,-fetch-netrexx,-fetch-netrexx-no-commons-net,-cleanup-temp-cache"
+ description="load NetRexx compiler" />
+
+ <target name="-fetch-netrexx" depends="-setup-temp-cache"
+ description="FTPs NetRexx compiler from IBM site" if="have.commons.net">
+ <get-ftp-file host="ftp.software.ibm.com" remotedir="/software/awdtools/netrexx"
+ filename="NetRexx.zip" localdir="${temp.dir}" />
+ <copy todir="${dest.dir}" flatten="true">
+ <zipfileset src="${temp.dir}/NetRexx.zip">
+ <include name="NetRexx\lib\NetRexxC.jar" />
+ <include name="NetRexx\browse\license.txt" />
+ </zipfileset>
+ </copy>
+ </target>
+
+ <target name="-fetch-netrexx-no-commons-net" depends="-setup-temp-cache"
+ description="FTPs NetRexx compiler from IBM site" unless="have.commons.net">
+ <get src="ftp://ftp.software.ibm.com/software/awdtools/netrexx/NetRexx.zip" dest="${temp.dir}/NetRexx.zip" skipexisting="true"/>
+ <copy todir="${dest.dir}" flatten="true">
+ <zipfileset src="${temp.dir}/NetRexx.zip">
+ <include name="NetRexx\lib\NetRexxC.jar" />
+ <include name="NetRexx\browse\license.txt" />
+ </zipfileset>
+ </copy>
+ </target>
+
<target name="all"
- description="load all the libraries"
- depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script" />
+ description="load all the libraries (except jython)"
+ depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script,javamail,jspc,jai,netrexx" />
</project>
diff --git a/opends/ext/ant/lib/README b/opends/ext/ant/lib/README
index a056be2..35aa2c7 100644
--- a/opends/ext/ant/lib/README
+++ b/opends/ext/ant/lib/README
@@ -1,15 +1,3 @@
-Please refer to the Ant manual under Installing Ant / Library
-Dependencies for a list of the jar requirements for various optional
-tasks and features.
-
-This directory contains xercesImpl.jar from the 2.6.2 release of
-Apache Xerces. For more information or newer releases see
-<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for
-the terms of distribution.
-
-It also contains xml-apis.jar, an Apache-controlled collection of
-standard classes from the 1.0b2 release of the Apache XML-Commons
-release. For more information or newer releases see
-<http://xml.apache.org/commons/>. See the files LICENSE.dom and
-LICENSE.sax for the terms of distribution.
-
+Please refer to the Ant manual under Installing Ant / Library
+Dependencies for a list of the jar requirements for various optional
+tasks and features.
diff --git a/opends/ext/ant/lib/ant-antlr.jar b/opends/ext/ant/lib/ant-antlr.jar
index 5b127f9..7d32582 100644
--- a/opends/ext/ant/lib/ant-antlr.jar
+++ b/opends/ext/ant/lib/ant-antlr.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-bcel.jar b/opends/ext/ant/lib/ant-apache-bcel.jar
index cdc5202..04f82d7 100644
--- a/opends/ext/ant/lib/ant-apache-bcel.jar
+++ b/opends/ext/ant/lib/ant-apache-bcel.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-bsf.jar b/opends/ext/ant/lib/ant-apache-bsf.jar
index 0ee68ac..2e75648 100644
--- a/opends/ext/ant/lib/ant-apache-bsf.jar
+++ b/opends/ext/ant/lib/ant-apache-bsf.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-log4j.jar b/opends/ext/ant/lib/ant-apache-log4j.jar
index 4c9427e..78c2133 100644
--- a/opends/ext/ant/lib/ant-apache-log4j.jar
+++ b/opends/ext/ant/lib/ant-apache-log4j.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-oro.jar b/opends/ext/ant/lib/ant-apache-oro.jar
index 30013ba..4978148 100644
--- a/opends/ext/ant/lib/ant-apache-oro.jar
+++ b/opends/ext/ant/lib/ant-apache-oro.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-regexp.jar b/opends/ext/ant/lib/ant-apache-regexp.jar
index a393a3c..dfedea3 100644
--- a/opends/ext/ant/lib/ant-apache-regexp.jar
+++ b/opends/ext/ant/lib/ant-apache-regexp.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-resolver.jar b/opends/ext/ant/lib/ant-apache-resolver.jar
index 119a41d..ed8004e 100644
--- a/opends/ext/ant/lib/ant-apache-resolver.jar
+++ b/opends/ext/ant/lib/ant-apache-resolver.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-apache-xalan2.jar b/opends/ext/ant/lib/ant-apache-xalan2.jar
new file mode 100644
index 0000000..91376a3
--- /dev/null
+++ b/opends/ext/ant/lib/ant-apache-xalan2.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-commons-logging.jar b/opends/ext/ant/lib/ant-commons-logging.jar
index fcba217..b7e1dee 100644
--- a/opends/ext/ant/lib/ant-commons-logging.jar
+++ b/opends/ext/ant/lib/ant-commons-logging.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-commons-net.jar b/opends/ext/ant/lib/ant-commons-net.jar
index b490c96..25b7fe6 100644
--- a/opends/ext/ant/lib/ant-commons-net.jar
+++ b/opends/ext/ant/lib/ant-commons-net.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-contrib-1.0b3.jar b/opends/ext/ant/lib/ant-contrib-1.0b3.jar
deleted file mode 100644
index 0625376..0000000
--- a/opends/ext/ant/lib/ant-contrib-1.0b3.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-icontract.jar b/opends/ext/ant/lib/ant-icontract.jar
deleted file mode 100644
index 66bcc15..0000000
--- a/opends/ext/ant/lib/ant-icontract.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-jai.jar b/opends/ext/ant/lib/ant-jai.jar
index 26901f3..613adaf 100644
--- a/opends/ext/ant/lib/ant-jai.jar
+++ b/opends/ext/ant/lib/ant-jai.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-javamail.jar b/opends/ext/ant/lib/ant-javamail.jar
index 8778e93..7ac7755 100644
--- a/opends/ext/ant/lib/ant-javamail.jar
+++ b/opends/ext/ant/lib/ant-javamail.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-jdepend.jar b/opends/ext/ant/lib/ant-jdepend.jar
index 37cd86f..9ff68d0 100644
--- a/opends/ext/ant/lib/ant-jdepend.jar
+++ b/opends/ext/ant/lib/ant-jdepend.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-jmf.jar b/opends/ext/ant/lib/ant-jmf.jar
index 036385c..01365c2 100644
--- a/opends/ext/ant/lib/ant-jmf.jar
+++ b/opends/ext/ant/lib/ant-jmf.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-jsch.jar b/opends/ext/ant/lib/ant-jsch.jar
index 5466269..59f5fd1 100644
--- a/opends/ext/ant/lib/ant-jsch.jar
+++ b/opends/ext/ant/lib/ant-jsch.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-junit.jar b/opends/ext/ant/lib/ant-junit.jar
index fa43fb2..d2b1665 100644
--- a/opends/ext/ant/lib/ant-junit.jar
+++ b/opends/ext/ant/lib/ant-junit.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-junit4.jar b/opends/ext/ant/lib/ant-junit4.jar
new file mode 100644
index 0000000..8f98434
--- /dev/null
+++ b/opends/ext/ant/lib/ant-junit4.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-launcher.jar b/opends/ext/ant/lib/ant-launcher.jar
index 12a1e78..939abb5 100644
--- a/opends/ext/ant/lib/ant-launcher.jar
+++ b/opends/ext/ant/lib/ant-launcher.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-netrexx.jar b/opends/ext/ant/lib/ant-netrexx.jar
index d646fd7..6d38a98 100644
--- a/opends/ext/ant/lib/ant-netrexx.jar
+++ b/opends/ext/ant/lib/ant-netrexx.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-nodeps.jar b/opends/ext/ant/lib/ant-nodeps.jar
deleted file mode 100644
index 2d209fa..0000000
--- a/opends/ext/ant/lib/ant-nodeps.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-starteam.jar b/opends/ext/ant/lib/ant-starteam.jar
deleted file mode 100644
index 668b190..0000000
--- a/opends/ext/ant/lib/ant-starteam.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-stylebook.jar b/opends/ext/ant/lib/ant-stylebook.jar
deleted file mode 100644
index 2d6ab23..0000000
--- a/opends/ext/ant/lib/ant-stylebook.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-swing.jar b/opends/ext/ant/lib/ant-swing.jar
index 60c3981..0069327 100644
--- a/opends/ext/ant/lib/ant-swing.jar
+++ b/opends/ext/ant/lib/ant-swing.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-testutil.jar b/opends/ext/ant/lib/ant-testutil.jar
new file mode 100644
index 0000000..cc73c8d
--- /dev/null
+++ b/opends/ext/ant/lib/ant-testutil.jar
Binary files differ
diff --git a/opends/ext/ant/lib/ant-trax.jar b/opends/ext/ant/lib/ant-trax.jar
deleted file mode 100644
index ef838ec..0000000
--- a/opends/ext/ant/lib/ant-trax.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-vaj.jar b/opends/ext/ant/lib/ant-vaj.jar
deleted file mode 100644
index 36b838b..0000000
--- a/opends/ext/ant/lib/ant-vaj.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-weblogic.jar b/opends/ext/ant/lib/ant-weblogic.jar
deleted file mode 100644
index 9f0de19..0000000
--- a/opends/ext/ant/lib/ant-weblogic.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-xalan1.jar b/opends/ext/ant/lib/ant-xalan1.jar
deleted file mode 100644
index b50b733..0000000
--- a/opends/ext/ant/lib/ant-xalan1.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant-xslp.jar b/opends/ext/ant/lib/ant-xslp.jar
deleted file mode 100644
index 4e055a6..0000000
--- a/opends/ext/ant/lib/ant-xslp.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/ant.jar b/opends/ext/ant/lib/ant.jar
index 0a56a58..7f5be4a 100644
--- a/opends/ext/ant/lib/ant.jar
+++ b/opends/ext/ant/lib/ant.jar
Binary files differ
diff --git a/opends/ext/ant/lib/libraries.properties b/opends/ext/ant/lib/libraries.properties
index 40b21d5..799448e 100644
--- a/opends/ext/ant/lib/libraries.properties
+++ b/opends/ext/ant/lib/libraries.properties
@@ -1,46 +1,65 @@
-#this file declares the libraries for use in
-#a given release of the components
-
-#if you change this, change the checksum to match
-m2.version=2.0.4
-m2.url=http://ibiblio.org/maven2/
-m2.artifact-name=maven-artifact-ant
-m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar
-#this is the URL of the antlib library, that is pulled down for everything else.
-m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name}
-#this is the sha1 checksum of the artifact
-m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
-
-
-#versions of different libraries. Please keep in alphabetical order, except
-#when a specific dependency forces them to be out-of-order
-antlr.version=2.7.2
-bcel.version=5.1
-bsf.version=2.4.0
-bsh.version=2.0b4
-bsh-core.version=${bsh.version}
-commons-net.version=1.4.0
-commons-logging.version=1.0.4
-commons-logging-api.version=${commons-logging.version}
-jdepend.version=2.7
-jruby.version=0.8.3
-junit.version=3.8.2
-jsch.version=0.1.29
-jython.version=2.1
-log4j.version=1.2.13
-#js is the javascript implementation of the rhino project
-js.version=1.6R3
-oro.version=2.0.8
-regexp.version=1.3
-which.version=1.0
-xerces.version=2.8.1
-xercesImpl.version=${xerces.version}
-#should be in sync w/ xerces, but not in the maven repository
-#xmlParserAPIs.version=${xerces.version}
-xmlParserAPIs.version=2.6.1
-xalan.version=2.7.0
-xml-resolver.version=1.1
-
-#paired
-jacl.version=1.2.6
-tcljava.version=${jacl.version}
+# 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 declares the libraries for use in
+#a given release of the components
+
+#if you change this, change the checksum to match
+m2.version=2.0.4
+m2.url=http://ibiblio.org/maven2/
+m2.artifact-name=maven-artifact-ant
+m2.jar.name=${m2.artifact-name}-${m2.version}-dep.jar
+#this is the URL of the antlib library, that is pulled down for everything else.
+m2.antlib.url=${m2.url}/org/apache/maven/${m2.artifact-name}/${m2.version}/${m2.jar.name}
+#this is the sha1 checksum of the artifact
+m2.sha1.checksum=4e7ddfdb91600e9b59bb965ff8eef2f06015df50
+
+# Repository to use by default for fetching dependencies.
+m2.repo=http://repo1.maven.org/maven2/
+
+#versions of different libraries. Please keep in alphabetical order, except
+#when a specific dependency forces them to be out-of-order
+antlr.version=2.7.7
+bcel.version=5.1
+bsf.version=2.4.0
+bsh.version=2.0b4
+bsh-core.version=${bsh.version}
+commons-net.version=1.4.1
+commons-logging.version=1.1
+commons-logging-api.version=${commons-logging.version}
+jai-core.version=1.1.3
+jai-codec.version=1.1.3
+jasper-compiler.version=4.1.36
+jasper-runtime.version=${jasper-compiler.version}
+jdepend.version=2.9.1
+jruby.version=0.9.8
+junit.version=4.8.1
+jsch.version=0.1.42
+jython.version=2.1
+#log4j 1.2.15 requires JMS and a few other Sun jars that are not in the m2 repo
+log4j.version=1.2.14
+#js is the javascript implementation of the rhino project
+#17R1 is compiled with Java5 so we can't use the jar when building with JDK 1.4
+js.version=1.6R7
+oro.version=2.0.8
+regexp.version=1.3
+servlet-api.version=2.3
+which.version=1.0
+xalan.version=2.7.1
+xml-resolver.version=1.2
+mail.version=1.4
+#paired
+jacl.version=1.2.6
+tcljava.version=${jacl.version}
diff --git a/opends/ext/ant/lib/xercesImpl.jar b/opends/ext/ant/lib/xercesImpl.jar
deleted file mode 100644
index 3b351f6..0000000
--- a/opends/ext/ant/lib/xercesImpl.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/ant/lib/xml-apis.jar b/opends/ext/ant/lib/xml-apis.jar
deleted file mode 100644
index b338fb6..0000000
--- a/opends/ext/ant/lib/xml-apis.jar
+++ /dev/null
Binary files differ
--
Gitblit v1.10.0