From b8483a936be2ceebaf404dacd499aa7bb2a0d34d Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Sun, 18 Feb 2007 07:20:02 +0000
Subject: [PATCH] move from ant 1.6.5 to 1.7.0
---
opendj-sdk/opends/ext/ant/bin/lcp.bat | 17
opendj-sdk/opends/ext/ant/lib/ant-netrexx.jar | 0
opendj-sdk/opends/ext/ant/bin/antRun | 28
opendj-sdk/opends/ext/ant/fetch.xml | 236 ++++++
opendj-sdk/opends/ext/ant/lib/ant-apache-resolver.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-commons-logging.jar | 0
opendj-sdk/opends/ext/ant/bin/runant.pl | 11
opendj-sdk/opends/ext/ant/etc/ant-bootstrap.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-apache-bsf.jar | 0
opendj-sdk/opends/ext/ant/etc/junit-frames.xsl | 259 +++++-
opendj-sdk/opends/ext/ant/lib/ant-javamail.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-apache-bcel.jar | 0
opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl | 28
opendj-sdk/opends/ext/ant/bin/runant.py | 12
opendj-sdk/opends/ext/ant/bin/ant.bat | 164 +++
opendj-sdk/opends/ext/ant/lib/ant-trax.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-jmf.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-stylebook.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-jdepend.jar | 0
opendj-sdk/opends/ext/ant/etc/mmetrics-frames.xsl | 36
opendj-sdk/opends/ext/ant/lib/ant-starteam.jar | 0
opendj-sdk/opends/ext/ant/etc/changelog.xsl | 29
opendj-sdk/opends/ext/ant/lib/ant-launcher.jar | 0
opendj-sdk/opends/ext/ant/bin/complete-ant-cmd.pl | 11
opendj-sdk/opends/ext/ant/bin/ant | 84 +
opendj-sdk/opends/ext/ant/bin/antRun.pl | 11
opendj-sdk/opends/ext/ant/bin/ant.cmd | 185 ++--
opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl | 28
opendj-sdk/opends/ext/ant/lib/ant-antlr.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-commons-net.jar | 0
opendj-sdk/opends/ext/ant/lib/xercesImpl.jar | 0
opendj-sdk/opends/ext/ant/bin/runrc.cmd | 119 +-
opendj-sdk/opends/ext/ant/lib/ant-junit.jar | 0
opendj-sdk/opends/ext/ant/etc/tagdiff.xsl | 71
opendj-sdk/opends/ext/ant/bin/envset.cmd | 261 +++---
opendj-sdk/opends/ext/ant/etc/junit-noframes.xsl | 93 +-
opendj-sdk/opends/ext/ant/lib/ant-swing.jar | 0
opendj-sdk/opends/ext/ant/lib/ant.jar | 0
opendj-sdk/opends/ext/ant/etc/maudit-frames.xsl | 36
opendj-sdk/opends/ext/ant/lib/ant-apache-oro.jar | 0
opendj-sdk/opends/ext/ant/bin/antRun.bat | 31
opendj-sdk/opends/ext/ant/lib/ant-apache-regexp.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-nodeps.jar | 0
opendj-sdk/opends/ext/ant/etc/coverage-frames.xsl | 36
opendj-sdk/opends/ext/ant/etc/log.xsl | 38
opendj-sdk/opends/ext/ant/lib/ant-weblogic.jar | 0
opendj-sdk/opends/ext/ant/get-m2.xml | 121 +++
opendj-sdk/opends/ext/ant/lib/ant-jai.jar | 0
opendj-sdk/opends/ext/ant/etc/jdepend.xsl | 28
opendj-sdk/opends/ext/ant/etc/junit-frames-xalan1.xsl | 16
opendj-sdk/opends/ext/ant/etc/jdepend-frames.xsl | 27
opendj-sdk/opends/ext/ant/bin/antenv.cmd | 197 ++--
opendj-sdk/opends/ext/ant/lib/README | 5
opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl | 28
opendj-sdk/opends/ext/ant/lib/ant-apache-log4j.jar | 0
opendj-sdk/opends/ext/ant/lib/ant-jsch.jar | 0
opendj-sdk/opends/ext/ant/lib/libraries.properties | 46 +
opendj-sdk/opends/ext/ant/lib/xml-apis.jar | 0
58 files changed, 1,493 insertions(+), 799 deletions(-)
diff --git a/opendj-sdk/opends/ext/ant/bin/ant b/opendj-sdk/opends/ext/ant/bin/ant
index 14fc591..bcc63c8 100755
--- a/opendj-sdk/opends/ext/ant/bin/ant
+++ b/opendj-sdk/opends/ext/ant/bin/ant
@@ -1,18 +1,19 @@
#! /bin/sh
-# Copyright 2001-2004 The Apache Software Foundation
+# 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
#
-# 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
#
-# 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.
+# 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.
# Extract launch and ant arguments, (see details below).
ant_exec_args=
@@ -43,9 +44,11 @@
rpm_mode=false
usejikes=$use_jikes_default
else
- # load system-wide ant configuration
- if [ -f "/etc/ant.conf" ] ; then
- . /etc/ant.conf
+ # load system-wide ant configuration (ONLY if ANT_HOME has NOT been set)
+ if [ -z "$ANT_HOME" -o "$ANT_HOME" = "/usr/share/ant" ]; then
+ if [ -f "/etc/ant.conf" ] ; then
+ . /etc/ant.conf
+ fi
fi
# load user ant configuration
@@ -87,15 +90,6 @@
esac
if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
- # try to find ANT
- if [ -d /opt/ant ] ; then
- ANT_HOME=/opt/ant
- fi
-
- if [ -d "${HOME}/opt/ant" ] ; then
- ANT_HOME="${HOME}/opt/ant"
- fi
-
## resolve links - $0 may be a link to ant's home
PRG="$0"
progname=`basename "$0"`
@@ -130,9 +124,11 @@
if [ -z "$JAVACMD" ] ; then
if [ -n "$JAVA_HOME" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
+ elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
+ JAVACMD="$JAVA_HOME/jre/bin/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
@@ -153,12 +149,34 @@
# Build local classpath using just the launcher in non-rpm mode or
# use the Jpackage helper in rpm mode with basic and default jars
# specified in the ant.conf configuration. Because the launcher is
-# used, libraries linked in ANT_HOME will also be include, but this
+# used, libraries linked in ANT_HOME/lib will also be included, but this
# is discouraged as it is not java-version safe. A user should
# request optional jars and their dependencies via the OPT_JAR_LIST
# variable
-if $rpm_mode && [ -f /usr/bin/build-classpath ] ; then
+if $rpm_mode && [ -x /usr/bin/build-classpath ] ; then
LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)"
+
+ # If no optional jars have been specified then build the default list
+ if [ -z "$OPT_JAR_LIST" ] ; then
+ for file in /etc/ant.d/*; do
+ if [ -f "$file" ]; then
+ case "$file" in
+ *~) ;;
+ *#*) ;;
+ *.rpmsave) ;;
+ *.rpmnew) ;;
+ *)
+ for dep in `cat "$file"`; do
+ case "$OPT_JAR_LIST" in
+ *"$dep"*) ;;
+ *) OPT_JAR_LIST="$OPT_JAR_LIST${OPT_JAR_LIST:+ }$dep"
+ esac
+ done
+ esac
+ fi
+ done
+ fi
+
# If the user requested to try to add some other jars to the classpath
if [ -n "$OPT_JAR_LIST" ] ; then
_OPTCLASSPATH="$(/usr/bin/build-classpath $OPT_JAR_LIST 2> /dev/null)"
@@ -192,7 +210,7 @@
LOCALCLASSPATH="$LOCALCLASSPATH:$CLASSPATH"
fi
- # remove class path from launcher -lib option
+ # remove class path from launcher -cp option
CLASSPATH=""
fi
else
@@ -223,6 +241,10 @@
fi
# For Cygwin, switch paths to appropriate format before running java
+# For PATHs convert to unix format first, then to windows format to ensure
+# both formats are supported. Probably this will fail on directories with ;
+# in the name in the path. Let's assume that paths containing ; are more
+# rare than windows style paths on cygwin.
if $cygwin; then
if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then
format=mixed
@@ -232,9 +254,11 @@
ANT_HOME=`cygpath --$format "$ANT_HOME"`
ANT_LIB=`cygpath --$format "$ANT_LIB"`
JAVA_HOME=`cygpath --$format "$JAVA_HOME"`
- LOCALCLASSPATH=`cygpath --path --$format "$LOCALCLASSPATH"`
+ LCP_TEMP=`cygpath --path --unix "$LOCALCLASSPATH"`
+ LOCALCLASSPATH=`cygpath --path --$format "$LCP_TEMP"`
if [ -n "$CLASSPATH" ] ; then
- CLASSPATH=`cygpath --path --$format "$CLASSPATH"`
+ CP_TEMP=`cygpath --path --unix "$CLASSPATH"`
+ CLASSPATH=`cygpath --path --$format "$CP_TEMP"`
fi
CYGHOME=`cygpath --$format "$HOME"`
fi
@@ -295,7 +319,7 @@
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 -lib \"$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\" $ant_exec_args"
if $ant_exec_debug ; then
echo $ant_exec_command
fi
diff --git a/opendj-sdk/opends/ext/ant/bin/ant.bat b/opendj-sdk/opends/ext/ant/bin/ant.bat
index 57a958e..6d57c81 100644
--- a/opendj-sdk/opends/ext/ant/bin/ant.bat
+++ b/opendj-sdk/opends/ext/ant/bin/ant.bat
@@ -1,28 +1,61 @@
@echo off
-REM Copyright 2001,2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
+REM This is an inordinately troublesome piece of code, particularly because it
+REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
+REM support, things would be much easier, but sadly, it is not yet time.
+REM Be cautious about editing this, and only add WinNT specific stuff in code that
+REM only runs on WinNT.
+
+if "%HOME%"=="" goto homeDrivePathPre
if exist "%HOME%\antrc_pre.bat" call "%HOME%\antrc_pre.bat"
+:homeDrivePathPre
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_pre.bat"
+
+:userProfilePre
+if "%USERPROFILE%"=="" goto alpha
+if "%USERPROFILE%"=="%HOME%" goto alpha
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
+if exist "%USERPROFILE%\antrc_pre.bat" call "%USERPROFILE%\antrc_pre.bat"
+
+:alpha
+
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+if "%ANT_HOME%"=="" goto setDefaultAntHome
+
+:stripAntHome
+if not _%ANT_HOME:~-1%==_\ goto checkClasspath
+set ANT_HOME=%ANT_HOME:~0,-1%
+goto stripAntHome
+
+:setDefaultAntHome
rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_ANT_HOME=%~dp0..
+set ANT_HOME=%~dp0..
-if "%ANT_HOME%"=="" set ANT_HOME=%DEFAULT_ANT_HOME%
-set DEFAULT_ANT_HOME=
+:checkClasspath
+set _USE_CLASSPATH=yes
+rem CLASSPATH must not be used if it is equal to ""
+if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
+if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
rem Slurp the command line arguments. This loop allows for an unlimited number
rem of arguments (up to the command line limit, anyway).
@@ -31,13 +64,30 @@
shift
:setupArgs
if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
shift
goto setupArgs
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
rem This label provides a place for the argument list loop to break out
rem and for NT handling to skip to.
:doneStart
+
+if _USE_CLASSPATH==no goto findAntHome
+
+:stripClasspath
+if not _%CLASSPATH:~-1%==_\ goto findAntHome
+set CLASSPATH=%CLASSPATH:~0,-1%
+goto stripClasspath
+
+:findAntHome
rem find ANT_HOME if it does not exist due to either an invalid value passed
rem by the user or the %0 problem on Windows 9x
if exist "%ANT_HOME%\lib\ant.jar" goto checkJava
@@ -78,29 +128,99 @@
if not "%JIKESPATH%"=="" goto runAntWithJikes
:runAnt
-if not "%CLASSPATH%"=="" goto runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
goto end
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+:runAntNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
goto end
:runAntWithJikes
-if not "%CLASSPATH%"=="" goto runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
-goto end
+
+if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
+set JIKESPATH=%JIKESPATH:~0,-1%
+goto runAntWithJikes
+
+:checkJikesAndClasspath
+
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -lib "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
goto end
-:end
-set _JAVACMD=
-set ANT_CMD_LINE_ARGS=
+:runAntWithJikesNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath "%ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%ANT_HOME%" "-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS% %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
-if "%OS%"=="Windows_NT" @endlocal
+:onError
+rem Windows 9x way of checking the error code. It matches via brute force.
+for %%i in (1 10 100) do set err%%i=
+for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
+if %err100%==2 goto onError200
+if %err100%==0 set err100=
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
+if "%err100%"=="" if %err10%==0 set err10=
+:onError1
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
+goto onErrorEnd
+:onError200
+for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
+if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
+if not err10==5 goto onError1
+:onErrorEnd
+set ANT_ERROR=%err100%%err10%%err1%
+for %%i in (1 10 100) do set err%%i=
+
+:end
+rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
+if not "%_JAVACMD%"=="" set _JAVACMD=
+if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
+
+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
+
+rem If there were no errors, we run the post script.
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+if "%HOME%"=="" goto homeDrivePathPost
if exist "%HOME%\antrc_post.bat" call "%HOME%\antrc_post.bat"
+:homeDrivePathPost
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
+if exist "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat" call "%HOMEDRIVE%%HOMEPATH%\antrc_post.bat"
+
+:userProfilePost
+if "%USERPROFILE%"=="" goto omega
+if "%USERPROFILE%"=="%HOME%" goto omega
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
+if exist "%USERPROFILE%\antrc_post.bat" call "%USERPROFILE%\antrc_post.bat"
+
+:omega
+
diff --git a/opendj-sdk/opends/ext/ant/bin/ant.cmd b/opendj-sdk/opends/ext/ant/bin/ant.cmd
index 4bb903f..70665c0 100644
--- a/opendj-sdk/opends/ext/ant/bin/ant.cmd
+++ b/opendj-sdk/opends/ext/ant/bin/ant.cmd
@@ -1,92 +1,93 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
- Run ant
-*/
-
-'@echo off'
-parse arg mode envarg '::' antarg
-
-if mode\='.' & mode\='..' & mode\='/' then do
- envarg = mode envarg
- mode = ''
-end
-
-if antarg = '' then do
- antarg = envarg
- envarg = ''
-end
-
-x = setlocal()
-
-env="OS2ENVIRONMENT"
-antenv = _getenv_('antenv')
-if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
-
-if mode = '' then mode = _getenv_('ANT_MODE' '..')
-if mode \= '/' then do
- runrc = _getenv_('runrc')
- antrc = _getenv_('antrc' 'antrc.cmd')
- if mode = '..' then mode = '-r'
- else mode = ''
- interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
-end
-
-if _testenv_() = 0 then do
- say 'Ant environment is not set properly'
- x = endlocal()
- exit 16
-end
-
-settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
-
-java = _getenv_('javacmd' 'java')
-opts = value('ANT_OPTS',,env)
-args = value('ANT_ARGS',,env)
-lcp = value('LOCALCLASSPATH',,env)
-cp = value('CLASSPATH',,env)
-if value('ANT_USE_CP',,env) \= '' then do
- if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
- lcp = lcp || cp
- 'SET CLASSPATH='
-end
-if lcp\='' then lcp = '-classpath' lcp
-
-cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
-launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
-if launcher = '' then entry = 'org.apache.tools.ant.Main'
-else entry = 'org.apache.tools.ant.launch.Launcher'
-java opts lcp entry settings args antarg
-
-x = endlocal()
-
-return rc
-
-_testenv_: procedure expose env ANT_HOME JAVA_HOME
-ANT_HOME = value('ANT_HOME',,env)
-if ANT_HOME = '' then return 0
-JAVA_HOME = value('JAVA_HOME',,env)
-if JAVA_HOME = '' then return 0
-cp = translate(value('CLASSPATH',,env))
-if pos(translate(ANT_HOME), cp) = 0 then return 0
-if pos(translate(JAVA_HOME), cp) = 0 then return 0
-return 1
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+ 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.
+
+ Run ant
+*/
+
+'@echo off'
+parse arg mode envarg '::' antarg
+
+if mode\='.' & mode\='..' & mode\='/' then do
+ envarg = mode envarg
+ mode = ''
+end
+
+if antarg = '' then do
+ antarg = envarg
+ envarg = ''
+end
+
+x = setlocal()
+
+env="OS2ENVIRONMENT"
+antenv = _getenv_('antenv')
+if _testenv_() = 0 then interpret 'call "' || antenv || '"' '"' || envarg || '"'
+
+if mode = '' then mode = _getenv_('ANT_MODE' '..')
+if mode \= '/' then do
+ runrc = _getenv_('runrc')
+ antrc = _getenv_('antrc' 'antrc.cmd')
+ if mode = '..' then mode = '-r'
+ else mode = ''
+ interpret 'call "' || runrc || '"' antrc '"' || mode || '"'
+end
+
+if _testenv_() = 0 then do
+ say 'Ant environment is not set properly'
+ x = endlocal()
+ exit 16
+end
+
+settings = '-Dant.home=' || ANT_HOME '-Djava.home=' || JAVA_HOME
+
+java = _getenv_('javacmd' 'java')
+opts = value('ANT_OPTS',,env)
+args = value('ANT_ARGS',,env)
+lcp = value('LOCALCLASSPATH',,env)
+cp = value('CLASSPATH',,env)
+if value('ANT_USE_CP',,env) \= '' then do
+ if lcp \= '' & right(lcp, 1) \= ';' then lcp = lcp || ';'
+ lcp = lcp || cp
+ 'SET CLASSPATH='
+end
+if lcp\='' then lcp = '-classpath' lcp
+
+cmd = java opts lcp '-jar' ANT_HOME ||'\lib\ant-launcher.jar' settings args antarg
+launcher = stream(ANT_HOME ||'\lib\ant-launcher.jar', 'C', 'query exists')
+if launcher = '' then entry = 'org.apache.tools.ant.Main'
+else entry = 'org.apache.tools.ant.launch.Launcher'
+java opts lcp entry settings args antarg
+
+x = endlocal()
+
+return rc
+
+_testenv_: procedure expose env ANT_HOME JAVA_HOME
+ANT_HOME = value('ANT_HOME',,env)
+if ANT_HOME = '' then return 0
+JAVA_HOME = value('JAVA_HOME',,env)
+if JAVA_HOME = '' then return 0
+cp = translate(value('CLASSPATH',,env))
+if pos(translate(ANT_HOME), cp) = 0 then return 0
+if pos(translate(JAVA_HOME), cp) = 0 then return 0
+return 1
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/opendj-sdk/opends/ext/ant/bin/antRun b/opendj-sdk/opends/ext/ant/bin/antRun
index baddd71..8110f86 100755
--- a/opendj-sdk/opends/ext/ant/bin/antRun
+++ b/opendj-sdk/opends/ext/ant/bin/antRun
@@ -1,21 +1,19 @@
-#!/bin/sh
+#! /bin/sh
+# 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
#
-# Copyright 2001-2002,2004 The Apache Software Foundation
-#
-# 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.
-#
+# 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.
# Args: DIR command
cd "$1"
diff --git a/opendj-sdk/opends/ext/ant/bin/antRun.bat b/opendj-sdk/opends/ext/ant/bin/antRun.bat
index cff480c..10d2bbc 100644
--- a/opendj-sdk/opends/ext/ant/bin/antRun.bat
+++ b/opendj-sdk/opends/ext/ant/bin/antRun.bat
@@ -1,33 +1,37 @@
@echo off
-REM
-REM Copyright 2001-2002,2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
REM See the License for the specific language governing permissions and
REM limitations under the License.
-REM
-REM
if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
if ""%1""=="""" goto runCommand
rem Change drive and directory to %1
-if "%OS%"=="Windows_NT" cd /d ""%1""
-if not "%OS%"=="Windows_NT" cd ""%1""
+if "%OS%"=="Windows_NT" goto nt_cd
+if "%OS%"=="WINNT" goto nt_cd
+cd ""%1""
+goto end_cd
+:nt_cd
+cd /d ""%1""
+:end_cd
shift
rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of agruments (up to the command line limit, anyway).
+rem of arguments (up to the command line limit, anyway).
set ANT_RUN_CMD=%1
if ""%1""=="""" goto runCommand
shift
@@ -42,4 +46,5 @@
%ANT_RUN_CMD%
if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
diff --git a/opendj-sdk/opends/ext/ant/bin/antRun.pl b/opendj-sdk/opends/ext/ant/bin/antRun.pl
index 7cdd868..dbea10f 100755
--- a/opendj-sdk/opends/ext/ant/bin/antRun.pl
+++ b/opendj-sdk/opends/ext/ant/bin/antRun.pl
@@ -1,10 +1,11 @@
#!/usr/bin/perl
#
-# Copyright 2001,2003-2004 The Apache Software Foundation
-#
-# 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
+# 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
#
diff --git a/opendj-sdk/opends/ext/ant/bin/antenv.cmd b/opendj-sdk/opends/ext/ant/bin/antenv.cmd
index b9b0db4..0460266 100644
--- a/opendj-sdk/opends/ext/ant/bin/antenv.cmd
+++ b/opendj-sdk/opends/ext/ant/bin/antenv.cmd
@@ -1,99 +1,98 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
- Ant environment
-*/
-
-'@echo off'
-call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
-call SysLoadFuncs
-
-/* Prepare the parameters for later use */
-parse arg argv
-mode = ''
-args = ''
-opts = ''
-cp = ''
-lcp = ''
-
-do i = 1 to words(argv)
- param = word(argv, i)
- select
- when param='-lcp' then mode = 'l'
- when param='-cp' | param='-classpath' then mode = 'c'
- when abbrev('-opts', param, 4) then mode = 'o'
- when abbrev('-args', param, 4) then mode = 'a'
- otherwise
- select
- when mode = 'a' then args = space(args param, 1)
- when mode = 'c' then cp = space(cp param, 1)
- when mode = 'l' then lcp = space(lcp param, 1)
- when mode = 'o' then opts = space(opts param, 1)
- otherwise
- say 'Option' param 'ignored'
- end
- end
-end
-
-env="OS2ENVIRONMENT"
-antconf = _getenv_('antconf' 'antconf.cmd')
-runrc = _getenv_('runrc')
-interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
-ANT_HOME = value('ANT_HOME',,env)
-JAVA_HOME = value('JAVA_HOME',,env)
-classpath = value('CLASSPATH',,env)
-classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
-if classes \= '' then classpath = prepend(classpath classes)
-
-classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
-'SET CLASSPATH=' || classpath
-
-/* Setting classpathes, options and arguments */
-envset = _getenv_('envset')
-if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
-if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
-if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
-if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
-
-exit 0
-
-addpath: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if substr(path, length(path)) = ';' then glue = ''
-else glue = ';'
-if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
-return path
-
-prepend: procedure
-parse arg path elem
-if elem = '' then do
- if path\='' & right(path, 1)\=';' then path = path || ';'
- return path
-end
-if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
-return path
-
-_getenv_: procedure expose env
-parse arg envar default
-if default = '' then default = envar
-var = value(translate(envar),,env)
-if var = '' then var = default
-return var
+/*
+ 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.
+*/
+
+'@echo off'
+call RxFuncAdd "SysLoadFuncs", "RexxUtil", "SysLoadFuncs"
+call SysLoadFuncs
+
+/* Prepare the parameters for later use */
+parse arg argv
+mode = ''
+args = ''
+opts = ''
+cp = ''
+lcp = ''
+
+do i = 1 to words(argv)
+ param = word(argv, i)
+ select
+ when param='-lcp' then mode = 'l'
+ when param='-cp' | param='-classpath' then mode = 'c'
+ when abbrev('-opts', param, 4) then mode = 'o'
+ when abbrev('-args', param, 4) then mode = 'a'
+ otherwise
+ select
+ when mode = 'a' then args = space(args param, 1)
+ when mode = 'c' then cp = space(cp param, 1)
+ when mode = 'l' then lcp = space(lcp param, 1)
+ when mode = 'o' then opts = space(opts param, 1)
+ otherwise
+ say 'Option' param 'ignored'
+ end
+ end
+end
+
+env="OS2ENVIRONMENT"
+antconf = _getenv_('antconf' 'antconf.cmd')
+runrc = _getenv_('runrc')
+interpret 'call "' || runrc || '"' '"' || antconf || '"' 'ETC'
+ANT_HOME = value('ANT_HOME',,env)
+JAVA_HOME = value('JAVA_HOME',,env)
+classpath = value('CLASSPATH',,env)
+classes = stream(JAVA_HOME || "\lib\classes.zip", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+classes = stream(JAVA_HOME || "\lib\tools.jar", "C", "QUERY EXISTS")
+if classes \= '' then classpath = prepend(classpath classes)
+
+classpath = prepend(classpath ANT_HOME || '\lib\ant-launcher.jar')
+'SET CLASSPATH=' || classpath
+
+/* Setting classpathes, options and arguments */
+envset = _getenv_('envset')
+if cp\='' then interpret 'call "' || envset || '"' '"; CLASSPATH"' '"' || cp || '"'
+if lcp\='' then interpret 'call "' || envset || '"' '"; LOCALCLASSPATH"' '"' || lcp || '"'
+if opts\='' then interpret 'call "' || envset || '"' '"-D ANT_OPTS"' '"' || opts || '"'
+if args\='' then interpret 'call "' || envset || '"' '"ANT_ARGS"' '"' || args || '"'
+
+exit 0
+
+addpath: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if substr(path, length(path)) = ';' then glue = ''
+else glue = ';'
+if pos(translate(elem), translate(path)) = 0 then path = path || glue || elem || ';'
+return path
+
+prepend: procedure
+parse arg path elem
+if elem = '' then do
+ if path\='' & right(path, 1)\=';' then path = path || ';'
+ return path
+end
+if pos(translate(elem), translate(path)) = 0 then path = elem || ';' || path
+return path
+
+_getenv_: procedure expose env
+parse arg envar default
+if default = '' then default = envar
+var = value(translate(envar),,env)
+if var = '' then var = default
+return var
diff --git a/opendj-sdk/opends/ext/ant/bin/complete-ant-cmd.pl b/opendj-sdk/opends/ext/ant/bin/complete-ant-cmd.pl
index 20dd476..b58c26e 100755
--- a/opendj-sdk/opends/ext/ant/bin/complete-ant-cmd.pl
+++ b/opendj-sdk/opends/ext/ant/bin/complete-ant-cmd.pl
@@ -1,10 +1,11 @@
#!/usr/bin/perl
#
-# Copyright 2001,2004 The Apache Software Foundation
-#
-# 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
+# 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
#
diff --git a/opendj-sdk/opends/ext/ant/bin/envset.cmd b/opendj-sdk/opends/ext/ant/bin/envset.cmd
index cb91d87..3149be4 100644
--- a/opendj-sdk/opends/ext/ant/bin/envset.cmd
+++ b/opendj-sdk/opends/ext/ant/bin/envset.cmd
@@ -1,130 +1,131 @@
-/*
-
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
-SET environment variables
-First optional parameter:
- ; parameters are considered parts of a path variable, semicolons are
- appended to each element if not already present
- -D parameters are properties for Java or Makefile etc., -D will be
- prepended and the parameters will be separated by a space
- =D the same as above but equal sign is not required
- , parameters should be comma separated in the environment variable
- - parameters should be separated by the next parameter
- Other values mean that the first parameter is missing and the environment
- variable will be set to the space separated parameters
-
-Second parameter: name of the environment variable
-
-Next parameters: values
-; implies that the equal sign is considered a part of the parameter and is
-not interpreted
-
--D requires parameters in the form name=value. If the equal sign is not found,
-the parameters are changed to name=expanded_name
-
-Other options have optional equal sign. If it is found, only the part after
-the equal sign will be oprionally expanded.
-
-If the parameter is the minus sign, the next parameter will not be expanded.
-If the parameter is a single dot, it will be replaced with the value of the
-environment variable as it existed before envset was invoked.
-
-For other parameters the batch looks for the environment variable with the
-same name (in uppercase). If it is found, it forms the expanded_name. If
-the environment variable with such a name does not exist, the expanded_name
-will hold the parameter name without case conversion.
-*/
-
-parse arg mode envar args
-
-equal = 0
-sep = ' '
-
-/* Parse command line parameters */
-select
- when mode='-' then do
- sep = envar
- parse var args envar args
- end
- when mode=';' then do
- sep = ''
- equal = -1
- end
- when mode='-D' then equal = 1
- when mode='=D' then mode = '-D'
- when mode=',' then sep = ','
-otherwise
- args = envar args
- envar = mode
- mode = ''
-end
-
-env = 'OS2ENVIRONMENT'
-envar = translate(envar)
-orig = value(envar,,env)
-newval = ''
-expand = 1
-
-/* for each parameter... */
-do i = 1 to words(args)
- if expand > 0 & word(args, i) = '-' then expand = 0
- else call addval word(args, i)
-end
-
-/* Optionally enclose path variable by quotes */
-if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
-
-/* Set the new value, 'SET' cannot be used since it does not allow '=' */
-x = value(envar, newval, env)
-exit 0
-
-addval: procedure expose sep equal orig expand newval mode env
-parse arg var
-
-if var = '.' then expvar = orig
-else do
- if equal >= 0 then do
- parse var var name '=' val
- if val = '' then var = name
- else var = val
- end
- if expand = 0 then expvar = var
- else expvar = value(translate(var),,env)
- if expvar = '' then expvar = var
- if equal >= 0 then do
- if val = '' then do
- parse var expvar key '=' val
- if val <> '' then name = key
- else do
- if equal > 0 then val = key
- else name = key
- end
- end
- else val = expvar
- if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
- if val = '' then expvar = name
- else expvar = name || '=' || val
- end
- if mode = '-D' then expvar = '-D' || expvar
- if mode = ';' then do
- if right(expvar, 1) <> ';' then expvar = expvar || ';'
- end
-end
-
-if newval = '' then newval = expvar
-else newval = newval || sep || expvar
-expand = 1
-return
+/*
+
+ 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.
+
+SET environment variables
+First optional parameter:
+ ; parameters are considered parts of a path variable, semicolons are
+ appended to each element if not already present
+ -D parameters are properties for Java or Makefile etc., -D will be
+ prepended and the parameters will be separated by a space
+ =D the same as above but equal sign is not required
+ , parameters should be comma separated in the environment variable
+ - parameters should be separated by the next parameter
+ Other values mean that the first parameter is missing and the environment
+ variable will be set to the space separated parameters
+
+Second parameter: name of the environment variable
+
+Next parameters: values
+; implies that the equal sign is considered a part of the parameter and is
+not interpreted
+
+-D requires parameters in the form name=value. If the equal sign is not found,
+the parameters are changed to name=expanded_name
+
+Other options have optional equal sign. If it is found, only the part after
+the equal sign will be oprionally expanded.
+
+If the parameter is the minus sign, the next parameter will not be expanded.
+If the parameter is a single dot, it will be replaced with the value of the
+environment variable as it existed before envset was invoked.
+
+For other parameters the batch looks for the environment variable with the
+same name (in uppercase). If it is found, it forms the expanded_name. If
+the environment variable with such a name does not exist, the expanded_name
+will hold the parameter name without case conversion.
+*/
+
+parse arg mode envar args
+
+equal = 0
+sep = ' '
+
+/* Parse command line parameters */
+select
+ when mode='-' then do
+ sep = envar
+ parse var args envar args
+ end
+ when mode=';' then do
+ sep = ''
+ equal = -1
+ end
+ when mode='-D' then equal = 1
+ when mode='=D' then mode = '-D'
+ when mode=',' then sep = ','
+otherwise
+ args = envar args
+ envar = mode
+ mode = ''
+end
+
+env = 'OS2ENVIRONMENT'
+envar = translate(envar)
+orig = value(envar,,env)
+newval = ''
+expand = 1
+
+/* for each parameter... */
+do i = 1 to words(args)
+ if expand > 0 & word(args, i) = '-' then expand = 0
+ else call addval word(args, i)
+end
+
+/* Optionally enclose path variable by quotes */
+if mode = ';' & pos(' ', newval) > 0 then newval = '"' || newval || '"'
+
+/* Set the new value, 'SET' cannot be used since it does not allow '=' */
+x = value(envar, newval, env)
+exit 0
+
+addval: procedure expose sep equal orig expand newval mode env
+parse arg var
+
+if var = '.' then expvar = orig
+else do
+ if equal >= 0 then do
+ parse var var name '=' val
+ if val = '' then var = name
+ else var = val
+ end
+ if expand = 0 then expvar = var
+ else expvar = value(translate(var),,env)
+ if expvar = '' then expvar = var
+ if equal >= 0 then do
+ if val = '' then do
+ parse var expvar key '=' val
+ if val <> '' then name = key
+ else do
+ if equal > 0 then val = key
+ else name = key
+ end
+ end
+ else val = expvar
+ if pos(' ', val) > 0 | pos('=', val) > 0 then val = '"' || val || '"'
+ if val = '' then expvar = name
+ else expvar = name || '=' || val
+ end
+ if mode = '-D' then expvar = '-D' || expvar
+ if mode = ';' then do
+ if right(expvar, 1) <> ';' then expvar = expvar || ';'
+ end
+end
+
+if newval = '' then newval = expvar
+else newval = newval || sep || expvar
+expand = 1
+return
diff --git a/opendj-sdk/opends/ext/ant/bin/lcp.bat b/opendj-sdk/opends/ext/ant/bin/lcp.bat
index eed6a82..4bf2e7c 100644
--- a/opendj-sdk/opends/ext/ant/bin/lcp.bat
+++ b/opendj-sdk/opends/ext/ant/bin/lcp.bat
@@ -1,12 +1,13 @@
REM
-REM Copyright 2001-2004 The Apache Software Foundation
-REM
-REM Licensed under the Apache License, Version 2.0 (the "License");
-REM you may not use this file except in compliance with the License.
-REM You may obtain a copy of the License at
-REM
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
REM http://www.apache.org/licenses/LICENSE-2.0
-REM
+REM
REM Unless required by applicable law or agreed to in writing, software
REM distributed under the License is distributed on an "AS IS" BASIS,
REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -26,5 +27,5 @@
goto argCheck
:gotAllArgs
-set LOCALCLASSPATH=%_CLASSPATHCOMPONENT%;%LOCALCLASSPATH%
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%_CLASSPATHCOMPONENT%
diff --git a/opendj-sdk/opends/ext/ant/bin/runant.pl b/opendj-sdk/opends/ext/ant/bin/runant.pl
index eca4708..5f8307a 100755
--- a/opendj-sdk/opends/ext/ant/bin/runant.pl
+++ b/opendj-sdk/opends/ext/ant/bin/runant.pl
@@ -1,10 +1,11 @@
#!/usr/bin/perl
#
-# Copyright 2000-2004 The Apache Software Foundation
-#
-# 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
+# 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
#
diff --git a/opendj-sdk/opends/ext/ant/bin/runant.py b/opendj-sdk/opends/ext/ant/bin/runant.py
index c7b53b6..eec549e 100755
--- a/opendj-sdk/opends/ext/ant/bin/runant.py
+++ b/opendj-sdk/opends/ext/ant/bin/runant.py
@@ -1,9 +1,10 @@
#!/usr/bin/python
-# Copyright 2001,2003-2004 The Apache Software Foundation
-#
-# 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
+# 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
#
@@ -95,6 +96,7 @@
if debug:
print '\n%s\n\n' % (cmdline)
+sys.stdout.flush()
# Run the biniou!
os.system(cmdline)
diff --git a/opendj-sdk/opends/ext/ant/bin/runrc.cmd b/opendj-sdk/opends/ext/ant/bin/runrc.cmd
index 0337a80..34b4f5d 100644
--- a/opendj-sdk/opends/ext/ant/bin/runrc.cmd
+++ b/opendj-sdk/opends/ext/ant/bin/runrc.cmd
@@ -1,59 +1,60 @@
-/*
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
- Run RC file, name is in the first arg, second arg is either PATH
- ENV or -r or nothing
-*/
-
-parse arg name path rest
-
-if name = '' then do
- say 'RC file name is missing'
- exit 1
-end
-
-if rest \= '' then do
- say 'Too many parameters'
- exit 1
-end
-
-call runit name path
-exit 0
-
-runit: procedure
-parse arg name path dir
-
-if path \= '' & path \= '-r' then do
- dir = value(translate(path),,'OS2ENVIRONMENT')
- if dir = '' then return
- dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
-end
-
-if dir = '' then dir = directory()
-
-if path = '-r' then do /* recursive call */
- subdir = filespec('path', dir)
- if subdir \= '\' then do
- subdir = left(subdir, length(subdir)-1)
- call runit name path filespec('drive', dir) || subdir
- end
-end
-
-/* Look for the file and run it */
-if right(dir, 1) \= '\' then dir = dir || '\'
-rcfile = stream(dir || name, 'c', 'query exists')
-if rcfile \= '' then interpret 'call "' || rcfile || '"'
-
-return
+/*
+ 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.
+
+ Run RC file, name is in the first arg, second arg is either PATH
+ ENV or -r or nothing
+*/
+
+parse arg name path rest
+
+if name = '' then do
+ say 'RC file name is missing'
+ exit 1
+end
+
+if rest \= '' then do
+ say 'Too many parameters'
+ exit 1
+end
+
+call runit name path
+exit 0
+
+runit: procedure
+parse arg name path dir
+
+if path \= '' & path \= '-r' then do
+ dir = value(translate(path),,'OS2ENVIRONMENT')
+ if dir = '' then return
+ dir = translate(dir, '\', '/') /* change UNIX-like path to OS/2 */
+end
+
+if dir = '' then dir = directory()
+
+if path = '-r' then do /* recursive call */
+ subdir = filespec('path', dir)
+ if subdir \= '\' then do
+ subdir = left(subdir, length(subdir)-1)
+ call runit name path filespec('drive', dir) || subdir
+ end
+end
+
+/* Look for the file and run it */
+if right(dir, 1) \= '\' then dir = dir || '\'
+rcfile = stream(dir || name, 'c', 'query exists')
+if rcfile \= '' then interpret 'call "' || rcfile || '"'
+
+return
diff --git a/opendj-sdk/opends/ext/ant/etc/ant-bootstrap.jar b/opendj-sdk/opends/ext/ant/etc/ant-bootstrap.jar
index d133f90..f51b54f 100644
--- a/opendj-sdk/opends/ext/ant/etc/ant-bootstrap.jar
+++ b/opendj-sdk/opends/ext/ant/etc/ant-bootstrap.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/etc/changelog.xsl b/opendj-sdk/opends/ext/ant/etc/changelog.xsl
index e9bac34..c6aef8f 100644
--- a/opendj-sdk/opends/ext/ant/etc/changelog.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/changelog.xsl
@@ -5,19 +5,20 @@
version='1.0'>
<!--
- Copyright 2002,2004 The Apache Software Foundation
-
- 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.
+ 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.
-->
<xsl:param name="title"/>
@@ -75,7 +76,7 @@
<h1>
<a name="top"><xsl:value-of select="$title"/></a>
</h1>
- <p style="text-align: right">Designed for use with <a href="http://jakarta.apache.org/ant/">Ant</a>.</p>
+ <p style="text-align: right">Designed for use with <a href="http://ant.apache.org/">Apache Ant</a>.</p>
<hr/>
<table border="0" width="100%" cellspacing="1">
diff --git a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
index dcaa8b7..d381b55 100644
--- a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-frames.xsl
@@ -4,20 +4,20 @@
extension-element-prefixes="redirect">
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
diff --git a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
index 91d496c..333aecf 100644
--- a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-text.xsl
@@ -1,20 +1,20 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<xsl:strip-space elements="checkstyle"/>
diff --git a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
index d23ac0e..4d7ab86 100644
--- a/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/checkstyle/checkstyle-xdoc.xsl
@@ -4,20 +4,20 @@
extension-element-prefixes="redirect">
<!--
- Copyright 2003-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<xsl:output method="xml" indent="yes"/>
diff --git a/opendj-sdk/opends/ext/ant/etc/coverage-frames.xsl b/opendj-sdk/opends/ext/ant/etc/coverage-frames.xsl
index f808908..bba384b 100644
--- a/opendj-sdk/opends/ext/ant/etc/coverage-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/coverage-frames.xsl
@@ -5,20 +5,20 @@
<xsl:output method="html" indent="yes"/>
<xsl:decimal-format decimal-separator="." grouping-separator="," />
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<!--
@@ -408,14 +408,6 @@
<!-- Page Footer -->
<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
</xsl:template>
diff --git a/opendj-sdk/opends/ext/ant/etc/jdepend-frames.xsl b/opendj-sdk/opends/ext/ant/etc/jdepend-frames.xsl
index 7a2a8ae..20cc4ef 100644
--- a/opendj-sdk/opends/ext/ant/etc/jdepend-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/jdepend-frames.xsl
@@ -4,19 +4,20 @@
extension-element-prefixes="redirect">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<!--
- Copyright 2002-2004 The Apache Software Foundation
-
- 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.
+ 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.
-->
<!--
diff --git a/opendj-sdk/opends/ext/ant/etc/jdepend.xsl b/opendj-sdk/opends/ext/ant/etc/jdepend.xsl
index e1e5e2d..5acafae 100644
--- a/opendj-sdk/opends/ext/ant/etc/jdepend.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/jdepend.xsl
@@ -1,20 +1,20 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!--
- Copyright 2002,2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
diff --git a/opendj-sdk/opends/ext/ant/etc/junit-frames-xalan1.xsl b/opendj-sdk/opends/ext/ant/etc/junit-frames-xalan1.xsl
index 114e459..f637065 100644
--- a/opendj-sdk/opends/ext/ant/etc/junit-frames-xalan1.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/junit-frames-xalan1.xsl
@@ -6,11 +6,12 @@
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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
+ 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
@@ -202,7 +203,8 @@
<script type="text/javascript" language="JavaScript"><![CDATA[
function displayProperties (name) {
var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
- var doc = win.document.open();
+ var doc = win.document;
+ doc.open();
doc.write("<html><head><title>Properties of " + name + "</title>");
doc.write("<style type=\"text/css\">");
doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
@@ -571,7 +573,7 @@
<table width="100%">
<tr>
<td align="left"></td>
- <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://jakarta.apache.org/">Ant</a>.</td>
+ <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
</tr>
</table>
<hr size="1"/>
diff --git a/opendj-sdk/opends/ext/ant/etc/junit-frames.xsl b/opendj-sdk/opends/ext/ant/etc/junit-frames.xsl
index 0b0e731..94e4272 100644
--- a/opendj-sdk/opends/ext/ant/etc/junit-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/junit-frames.xsl
@@ -6,11 +6,12 @@
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator=","/>
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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
+ 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
@@ -28,10 +29,6 @@
It creates a set of HTML files a la javadoc where you can browse easily
through all packages and classes.
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
- @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
- @author Martijn Kruithof <a href="mailto:martijn@kruithof.xs4all.nl"/>
-
-->
<xsl:param name="output.dir" select="'.'"/>
@@ -62,7 +59,26 @@
<xsl:apply-templates select="." mode="all.classes"/>
</redirect:write>
- <!-- process all packages -->
+ <!-- create the all-tests.html at the root -->
+ <redirect:write file="{$output.dir}/all-tests.html">
+ <xsl:apply-templates select="." mode="all.tests"/>
+ </redirect:write>
+
+ <!-- create the alltests-fails.html at the root -->
+ <redirect:write file="{$output.dir}/alltests-fails.html">
+ <xsl:apply-templates select="." mode="all.tests">
+ <xsl:with-param name="type" select="'fails'"/>
+ </xsl:apply-templates>
+ </redirect:write>
+
+ <!-- create the alltests-errors.html at the root -->
+ <redirect:write file="{$output.dir}/alltests-errors.html">
+ <xsl:apply-templates select="." mode="all.tests">
+ <xsl:with-param name="type" select="'errors'"/>
+ </xsl:apply-templates>
+ </redirect:write>
+
+ <!-- process all packages -->
<xsl:for-each select="./testsuite[not(./@package = preceding-sibling::testsuite/@package)]">
<xsl:call-template name="package">
<xsl:with-param name="name" select="@package"/>
@@ -94,21 +110,35 @@
<!-- for each class, creates a @name.html -->
<!-- @bug there will be a problem with inner classes having the same name, it will be overwritten -->
- <xsl:for-each select="/testsuites/testsuite[@package = $name]">
- <redirect:write file="{$output.dir}/{$package.dir}/{@name}.html">
- <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>
- </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>
- </xsl:if>
- </xsl:for-each>
+ <xsl:for-each select="/testsuites/testsuite[@package = $name]">
+ <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}.html">
+ <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>
+ </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>
+ </xsl:if>
+ <xsl:if test="@failures != 0">
+ <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-fails.html">
+ <xsl:apply-templates select="." mode="class.details">
+ <xsl:with-param name="type" select="'fails'"/>
+ </xsl:apply-templates>
+ </redirect:write>
+ </xsl:if>
+ <xsl:if test="@errors != 0">
+ <redirect:write file="{$output.dir}/{$package.dir}/{@id}_{@name}-errors.html">
+ <xsl:apply-templates select="." mode="class.details">
+ <xsl:with-param name="type" select="'errors'"/>
+ </xsl:apply-templates>
+ </redirect:write>
+ </xsl:if>
+ </xsl:for-each>
</xsl:template>
<xsl:template name="index.html">
@@ -183,6 +213,71 @@
}
</xsl:template>
+<!-- Create list of all/failed/errored tests -->
+<xsl:template match="testsuites" mode="all.tests">
+ <xsl:param name="type" select="'all'"/>
+ <html>
+ <xsl:variable name="title">
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <xsl:text>All Failures</xsl:text>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <xsl:text>All Errors</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:text>All Tests</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <head>
+ <title>Unit Test Results: <xsl:value-of select="$title"/></title>
+ <xsl:call-template name="create.stylesheet.link">
+ <xsl:with-param name="package.name"/>
+ </xsl:call-template>
+ </head>
+ <body>
+ <xsl:attribute name="onload">open('allclasses-frame.html','classListFrame')</xsl:attribute>
+ <xsl:call-template name="pageHeader"/>
+ <h2><xsl:value-of select="$title"/></h2>
+
+ <table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
+ <xsl:call-template name="testcase.test.header">
+ <xsl:with-param name="show.class" select="'yes'"/>
+ </xsl:call-template>
+ <!--
+ test can even not be started at all (failure to load the class)
+ so report the error directly
+ -->
+ <xsl:if test="./error">
+ <tr class="Error">
+ <td colspan="4">
+ <xsl:apply-templates select="./error"/>
+ </td>
+ </tr>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <xsl:apply-templates select=".//testcase[failure]" mode="print.test">
+ <xsl:with-param name="show.class" select="'yes'"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <xsl:apply-templates select=".//testcase[error]" mode="print.test">
+ <xsl:with-param name="show.class" select="'yes'"/>
+ </xsl:apply-templates>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select=".//testcase" mode="print.test">
+ <xsl:with-param name="show.class" select="'yes'"/>
+ </xsl:apply-templates>
+ </xsl:otherwise>
+ </xsl:choose>
+ </table>
+ </body>
+ </html>
+</xsl:template>
+
<!-- ======================================================================
This page is created for every testsuite class.
@@ -190,6 +285,7 @@
testcase methods.
====================================================================== -->
<xsl:template match="testsuite" mode="class.details">
+ <xsl:param name="type" select="'all'"/>
<xsl:variable name="package.name" select="@package"/>
<xsl:variable name="class.name"><xsl:if test="not($package.name = '')"><xsl:value-of select="$package.name"/>.</xsl:if><xsl:value-of select="@name"/></xsl:variable>
<html>
@@ -206,7 +302,8 @@
<script type="text/javascript" language="JavaScript"><![CDATA[
function displayProperties (name) {
var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
- var doc = win.document.open();
+ var doc = win.document;
+ doc.open();
doc.write("<html><head><title>Properties of " + name + "</title>");
doc.write("<style type=\"text/css\">");
doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
@@ -242,19 +339,39 @@
<xsl:apply-templates select="." mode="print.test"/>
</table>
- <h2>Tests</h2>
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <h2>Failures</h2>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <h2>Errors</h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Tests</h2>
+ </xsl:otherwise>
+ </xsl:choose>
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
- <xsl:call-template name="testcase.test.header"/>
- <!--
- test can even not be started at all (failure to load the class)
- so report the error directly
- -->
+ <xsl:call-template name="testcase.test.header"/>
+ <!--
+ test can even not be started at all (failure to load the class)
+ so report the error directly
+ -->
<xsl:if test="./error">
<tr class="Error">
<td colspan="4"><xsl:apply-templates select="./error"/></td>
</tr>
</xsl:if>
- <xsl:apply-templates select="./testcase" mode="print.test"/>
+ <xsl:choose>
+ <xsl:when test="$type = 'fails'">
+ <xsl:apply-templates select="./testcase[failure]" mode="print.test"/>
+ </xsl:when>
+ <xsl:when test="$type = 'errors'">
+ <xsl:apply-templates select="./testcase[error]" mode="print.test"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="./testcase" mode="print.test"/>
+ </xsl:otherwise>
+ </xsl:choose>
</table>
<div class="Properties">
<a>
@@ -265,7 +382,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="@id"/>_<xsl:value-of select="@name"/>-out.txt</xsl:attribute>
System.out »
</a>
</div>
@@ -273,7 +390,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="@id"/>_<xsl:value-of select="@name"/>-err.txt</xsl:attribute>
System.err »
</a>
</div>
@@ -328,7 +445,7 @@
<xsl:sort select="@name"/>
<tr>
<td nowrap="nowrap">
- <a href="{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
+ <a href="{@id}_{@name}.html" target="classFrame"><xsl:value-of select="@name"/></a>
</td>
</tr>
</xsl:for-each>
@@ -369,7 +486,7 @@
<xsl:attribute name="href">
<xsl:if test="not($package.name='')">
<xsl:value-of select="translate($package.name,'.','/')"/><xsl:text>/</xsl:text>
- </xsl:if><xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
+ </xsl:if><xsl:value-of select="@id"/>_<xsl:value-of select="@name"/><xsl:text>.html</xsl:text>
</xsl:attribute>
<xsl:value-of select="@name"/>
</a>
@@ -448,9 +565,9 @@
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <td><xsl:value-of select="$testCount"/></td>
- <td><xsl:value-of select="$failureCount"/></td>
- <td><xsl:value-of select="$errorCount"/></td>
+ <td><a title="Display all tests" href="all-tests.html"><xsl:value-of select="$testCount"/></a></td>
+ <td><a title="Display all failures" href="alltests-fails.html"><xsl:value-of select="$failureCount"/></a></td>
+ <td><a title="Display all errors" href="alltests-errors.html"><xsl:value-of select="$errorCount"/></a></td>
<td>
<xsl:call-template name="display-percent">
<xsl:with-param name="value" select="$successRate"/>
@@ -461,7 +578,6 @@
<xsl:with-param name="value" select="$timeCount"/>
</xsl:call-template>
</td>
-
</tr>
</table>
<table border="0" width="95%">
@@ -500,6 +616,8 @@
<xsl:with-param name="value" select="sum($insamepackage/@time)"/>
</xsl:call-template>
</td>
+ <td><xsl:value-of select="$insamepackage/@timestamp"/></td>
+ <td><xsl:value-of select="$insamepackage/@hostname"/></td>
</tr>
</xsl:for-each>
</table>
@@ -574,7 +692,7 @@
<table width="100%">
<tr>
<td align="left"></td>
- <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://jakarta.apache.org/">Ant</a>.</td>
+ <td align="right">Designed for use with <a href="http://www.junit.org/">JUnit</a> and <a href="http://ant.apache.org/">Ant</a>.</td>
</tr>
</table>
<hr size="1"/>
@@ -588,12 +706,18 @@
<th>Errors</th>
<th>Failures</th>
<th nowrap="nowrap">Time(s)</th>
+ <th nowrap="nowrap">Time Stamp</th>
+ <th>Host</th>
</tr>
</xsl:template>
<!-- method header -->
<xsl:template name="testcase.test.header">
+ <xsl:param name="show.class" select="''"/>
<tr valign="top">
+ <xsl:if test="boolean($show.class)">
+ <th>Class</th>
+ </xsl:if>
<th>Name</th>
<th>Status</th>
<th width="80%">Type</th>
@@ -612,18 +736,39 @@
<xsl:otherwise>Pass</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <td><a href="{@name}.html"><xsl:value-of select="@name"/></a></td>
- <td><xsl:apply-templates select="@tests"/></td>
- <td><xsl:apply-templates select="@errors"/></td>
- <td><xsl:apply-templates select="@failures"/></td>
+ <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:value-of select="@name"/></a></td>
+ <td><a title="Display all tests" href="{@id}_{@name}.html"><xsl:apply-templates select="@tests"/></a></td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="@errors != 0">
+ <a title="Display only errors" href="{@id}_{@name}-errors.html"><xsl:apply-templates select="@errors"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="@errors"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
+ <xsl:choose>
+ <xsl:when test="@failures != 0">
+ <a title="Display only failures" href="{@id}_{@name}-fails.html"><xsl:apply-templates select="@failures"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="@failures"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<td><xsl:call-template name="display-time">
<xsl:with-param name="value" select="@time"/>
</xsl:call-template>
</td>
+ <td><xsl:apply-templates select="@timestamp"/></td>
+ <td><xsl:apply-templates select="@hostname"/></td>
</tr>
</xsl:template>
<xsl:template match="testcase" mode="print.test">
+ <xsl:param name="show.class" select="''"/>
<tr valign="top">
<xsl:attribute name="class">
<xsl:choose>
@@ -632,7 +777,23 @@
<xsl:otherwise>TableRowColor</xsl:otherwise>
</xsl:choose>
</xsl:attribute>
- <td><xsl:value-of select="@name"/></td>
+ <xsl:variable name="class.href">
+ <xsl:value-of select="concat(translate(../@package,'.','/'), '/', ../@id, '_', ../@name, '.html')"/>
+ </xsl:variable>
+ <xsl:if test="boolean($show.class)">
+ <td><a href="{$class.href}"><xsl:value-of select="../@name"/></a></td>
+ </xsl:if>
+ <td>
+ <a name="{@name}"/>
+ <xsl:choose>
+ <xsl:when test="boolean($show.class)">
+ <a href="{concat($class.href, '#', @name)}"><xsl:value-of select="@name"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@name"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </td>
<xsl:choose>
<xsl:when test="failure">
<td>Failure</td>
@@ -699,8 +860,7 @@
-->
<xsl:template name="br-replace">
<xsl:param name="word"/>
- <xsl:param name="br"><br/></xsl:param>
- <xsl:value-of select='stringutils:replace(string($word),"
",$br)'/>
+ <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/>
</xsl:template>
<xsl:template name="display-time">
@@ -713,4 +873,3 @@
<xsl:value-of select="format-number($value,'0.00%')"/>
</xsl:template>
</xsl:stylesheet>
-
diff --git a/opendj-sdk/opends/ext/ant/etc/junit-noframes.xsl b/opendj-sdk/opends/ext/ant/etc/junit-noframes.xsl
index 25487f8..5e67587 100644
--- a/opendj-sdk/opends/ext/ant/etc/junit-noframes.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/junit-noframes.xsl
@@ -1,15 +1,16 @@
<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">
+ 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"
doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" />
<xsl:decimal-format decimal-separator="." grouping-separator="," />
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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
+ 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
@@ -19,17 +20,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
<!--
-
+
Sample stylesheet to be used with Ant JUnitReport output.
-
+
It creates a non-framed report that can be useful to send via
e-mail or such.
-
- @author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
- @author Erik Hatcher <a href="mailto:ehatcher@apache.org"/>
-
+
-->
<xsl:template match="testsuites">
<html>
@@ -51,7 +49,7 @@
table.details tr td{
background:#eeeee0;
}
-
+
p {
line-height:1.5em;
margin-top:0.5em; margin-bottom:1.0em;
@@ -87,7 +85,7 @@
<script type="text/javascript" language="JavaScript">
var TestCases = new Array();
var cur;
- <xsl:for-each select="./testsuite">
+ <xsl:for-each select="./testsuite">
<xsl:apply-templates select="properties"/>
</xsl:for-each>
@@ -95,7 +93,8 @@
<script type="text/javascript" language="JavaScript"><![CDATA[
function displayProperties (name) {
var win = window.open('','JUnitSystemProperties','scrollbars=1,resizable=1');
- var doc = win.document.open();
+ var doc = win.document;
+ doc.open();
doc.write("<html><head><title>Properties of " + name + "</title>");
doc.write("<style>")
doc.write("body {font:normal 68% verdana,arial,helvetica; color:#000000; }");
@@ -118,39 +117,39 @@
doc.close();
win.focus();
}
- ]]>
+ ]]>
</script>
</head>
<body>
<a name="top"></a>
- <xsl:call-template name="pageHeader"/>
-
+ <xsl:call-template name="pageHeader"/>
+
<!-- Summary part -->
<xsl:call-template name="summary"/>
<hr size="1" width="95%" align="left"/>
-
+
<!-- Package List part -->
<xsl:call-template name="packagelist"/>
<hr size="1" width="95%" align="left"/>
-
+
<!-- For each package create its part -->
<xsl:call-template name="packages"/>
<hr size="1" width="95%" align="left"/>
-
+
<!-- For each class create the part -->
<xsl:call-template name="classes"/>
-
+
</body>
</html>
</xsl:template>
-
-
-
+
+
+
<!-- ================================================================== -->
<!-- Write a list of all packages with an hyperlink to the anchor of -->
<!-- of the package name. -->
<!-- ================================================================== -->
- <xsl:template name="packagelist">
+ <xsl:template name="packagelist">
<h2>Packages</h2>
Note: package statistics are not computed recursively, they only sum up all of its testsuites numbers.
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
@@ -163,7 +162,7 @@
<xsl:variable name="errorCount" select="sum($testsuites-in-package/@errors)"/>
<xsl:variable name="failureCount" select="sum($testsuites-in-package/@failures)"/>
<xsl:variable name="timeCount" select="sum($testsuites-in-package/@time)"/>
-
+
<!-- write a summary for the package -->
<tr valign="top">
<!-- set a nice color depending if there is an error/failure -->
@@ -182,12 +181,14 @@
<xsl:with-param name="value" select="$timeCount"/>
</xsl:call-template>
</td>
+ <td><xsl:value-of select="$testsuites-in-package/@timestamp"/></td>
+ <td><xsl:value-of select="$testsuites-in-package/@hostname"/></td>
</tr>
</xsl:for-each>
- </table>
+ </table>
</xsl:template>
-
-
+
+
<!-- ================================================================== -->
<!-- Write a package level report -->
<!-- It creates a table with values from the document: -->
@@ -199,10 +200,10 @@
<xsl:sort select="@package"/>
<a name="{@package}"></a>
<h3>Package <xsl:value-of select="@package"/></h3>
-
+
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
<xsl:call-template name="testsuite.test.header"/>
-
+
<!-- match the testsuites of this package -->
<xsl:apply-templates select="/testsuites/testsuite[./@package = current()/@package]" mode="print.test"/>
</table>
@@ -211,14 +212,14 @@
<p/>
</xsl:for-each>
</xsl:template>
-
+
<xsl:template name="classes">
<xsl:for-each select="testsuite">
<xsl:sort select="@name"/>
<!-- create an anchor to this class name -->
<a name="{@name}"></a>
<h3>TestCase <xsl:value-of select="@name"/></h3>
-
+
<table class="details" border="0" cellpadding="5" cellspacing="2" width="95%">
<xsl:call-template name="testcase.test.header"/>
<!--
@@ -239,11 +240,11 @@
</a>
</div>
<p/>
-
+
<a href="#top">Back to top</a>
</xsl:for-each>
</xsl:template>
-
+
<xsl:template name="summary">
<h2>Summary</h2>
<xsl:variable name="testCount" select="sum(testsuite/@tests)"/>
@@ -290,7 +291,7 @@
</tr>
</table>
</xsl:template>
-
+
<!--
Write properties into a JavaScript data structure.
This is based on the original idea by Erik Hatcher (ehatcher@apache.org)
@@ -302,14 +303,14 @@
cur['<xsl:value-of select="@name"/>'] = '<xsl:call-template name="JS-escape"><xsl:with-param name="string" select="@value"/></xsl:call-template>';
</xsl:for-each>
</xsl:template>
-
+
<!-- Page HEADER -->
<xsl:template name="pageHeader">
<h1>Unit Test Results</h1>
<table width="100%">
<tr>
<td align="left"></td>
- <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://jakarta.apache.org/ant'>Ant</a>.</td>
+ <td align="right">Designed for use with <a href='http://www.junit.org'>JUnit</a> and <a href='http://ant.apache.org/ant'>Ant</a>.</td>
</tr>
</table>
<hr size="1"/>
@@ -333,6 +334,8 @@
<th>Errors</th>
<th>Failures</th>
<th nowrap="nowrap">Time(s)</th>
+ <th nowrap="nowrap">Time Stamp</th>
+ <th>Host</th>
</tr>
</xsl:template>
@@ -357,7 +360,7 @@
<xsl:when test="@errors[.> 0]">Error</xsl:when>
</xsl:choose>
</xsl:attribute>
-
+
<!-- print testsuite information -->
<td><a href="#{@name}"><xsl:value-of select="@name"/></a></td>
<td><xsl:value-of select="@tests"/></td>
@@ -368,6 +371,8 @@
<xsl:with-param name="value" select="@time"/>
</xsl:call-template>
</td>
+ <td><xsl:apply-templates select="@timestamp"/></td>
+ <td><xsl:apply-templates select="@hostname"/></td>
</tr>
</xsl:template>
@@ -443,8 +448,7 @@
-->
<xsl:template name="br-replace">
<xsl:param name="word"/>
- <xsl:param name="br"><br/></xsl:param>
- <xsl:value-of select='stringutils:replace(string($word),"
",$br)'/>
+ <xsl:value-of disable-output-escaping="yes" select='stringutils:replace(string($word),"
","<br/>")'/>
</xsl:template>
<xsl:template name="display-time">
@@ -458,4 +462,3 @@
</xsl:template>
</xsl:stylesheet>
-
diff --git a/opendj-sdk/opends/ext/ant/etc/log.xsl b/opendj-sdk/opends/ext/ant/etc/log.xsl
index 2272790..63e5729 100644
--- a/opendj-sdk/opends/ext/ant/etc/log.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/log.xsl
@@ -1,19 +1,20 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<!--
- Copyright 2000-2004 The Apache Software Foundation
-
- 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.
+ 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.
-->
@@ -112,7 +113,7 @@
</a>
</td>
<td style="text-align:right;vertical-align:bottom">
- <a href="http://jakarta.apache.org/ant">Apache Ant</a>
+ <a href="http://ant.apache.org/">Apache Ant</a>
</td>
</tr>
</table>
@@ -123,15 +124,6 @@
<xsl:apply-templates select="build"/>
- <!-- FOOTER -->
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 2000-2002, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
</body>
</html>
</xsl:template>
diff --git a/opendj-sdk/opends/ext/ant/etc/maudit-frames.xsl b/opendj-sdk/opends/ext/ant/etc/maudit-frames.xsl
index eaaf180..7ec32f2 100644
--- a/opendj-sdk/opends/ext/ant/etc/maudit-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/maudit-frames.xsl
@@ -5,20 +5,20 @@
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator="," />
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<!--
@@ -453,14 +453,6 @@
<!-- Page HEADER -->
<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
</xsl:template>
diff --git a/opendj-sdk/opends/ext/ant/etc/mmetrics-frames.xsl b/opendj-sdk/opends/ext/ant/etc/mmetrics-frames.xsl
index f105ea8..effc184 100644
--- a/opendj-sdk/opends/ext/ant/etc/mmetrics-frames.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/mmetrics-frames.xsl
@@ -7,20 +7,20 @@
<xsl:output method="html" indent="yes" encoding="US-ASCII"/>
<xsl:decimal-format decimal-separator="." grouping-separator="," />
<!--
- Copyright 2001-2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<!--
@author Stephane Bailliez <a href="mailto:sbailliez@apache.org"/>
@@ -799,14 +799,6 @@
<!-- Page Footer -->
<xsl:template name="pageFooter">
- <table width="100%">
- <tr><td><hr noshade="yes" size="1"/></td></tr>
- <tr><td>
- <div align="center"><font color="#525D76" size="-1"><em>
- Copyright © 1999-2001, Apache Software Foundation
- </em></font></div>
- </td></tr>
- </table>
</xsl:template>
<!-- class header -->
diff --git a/opendj-sdk/opends/ext/ant/etc/tagdiff.xsl b/opendj-sdk/opends/ext/ant/etc/tagdiff.xsl
index 12a1e6f..38e9366 100644
--- a/opendj-sdk/opends/ext/ant/etc/tagdiff.xsl
+++ b/opendj-sdk/opends/ext/ant/etc/tagdiff.xsl
@@ -1,18 +1,18 @@
<!--
- Copyright 2004 The Apache Software Foundation
-
- 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.
-
+ 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.
-->
<!-- a stylesheet to display changelogs ala netbeans -->
<xsl:stylesheet
@@ -35,11 +35,9 @@
</xsl:template>
<xsl:template match="tagdiff">
- <HTML>
- <HEAD>
- <TITLE><xsl:value-of select="$title"/></TITLE>
- </HEAD>
- <BODY link="#000000" alink="#000000" vlink="#000000" text="#000000">
+ <html>
+ <head>
+ <title><xsl:value-of select="$title"/></title>
<style type="text/css">
body, p {
font-family: verdana,arial,helvetica;
@@ -58,7 +56,9 @@
font-size: 80%;
background:#eeeee0;
}
- </style>
+ </style>
+ </head>
+ <body link="#000000" alink="#000000" vlink="#000000" text="#000000">
<h1>
<a name="top"><xsl:value-of select="$title"/></a>
</h1>
@@ -76,7 +76,7 @@
</td>
</tr>
</table>
- <TABLE BORDER="0" WIDTH="100%" CELLPADDING="3" CELLSPACING="1">
+ <table border="0" width="100%" cellpadding="3" cellspacing="1">
<xsl:call-template name="show-entries">
<xsl:with-param name="title">New Files</xsl:with-param>
<xsl:with-param name="anchor">New</xsl:with-param>
@@ -89,40 +89,41 @@
<xsl:with-param name="entries" select=".//entry[file/revision][file/prevrevision]"/>
</xsl:call-template>
+ <!-- change to entries select to address bug #36827 -->
<xsl:call-template name="show-entries">
<xsl:with-param name="title">Removed Files</xsl:with-param>
<xsl:with-param name="anchor">Removed</xsl:with-param>
- <xsl:with-param name="entries" select=".//entry[not(file/revision)][not(file/prevrevision)]"/>
+ <xsl:with-param name="entries" select=".//entry[not(file/revision)][file/prevrevision]"/>
</xsl:call-template>
- </TABLE>
+ </table>
- </BODY>
- </HTML>
+ </body>
+ </html>
</xsl:template>
<xsl:template name="show-entries">
<xsl:param name="title"/>
<xsl:param name="anchor"/>
<xsl:param name="entries"/>
- <TR>
- <TD colspan="2" class="dateAndAuthor">
+ <tr>
+ <td colspan="2" class="dateAndAuthor">
<a>
<xsl:attribute name="name"><xsl:value-of select="$anchor"/></xsl:attribute>
<xsl:value-of select="$title"/> - <xsl:value-of select="count($entries)"/> entries
</a>
<a href="#TOP">(back to top)</a>
- </TD>
- </TR>
- <TR>
- <TD width="20">
+ </td>
+ </tr>
+ <tr>
+ <td width="20">
<xsl:text> </xsl:text>
- </TD>
- <TD>
+ </td>
+ <td>
<ul>
<xsl:apply-templates select="$entries"/>
</ul>
- </TD>
- </TR>
+ </td>
+ </tr>
</xsl:template>
<xsl:template match="entry">
diff --git a/opendj-sdk/opends/ext/ant/fetch.xml b/opendj-sdk/opends/ext/ant/fetch.xml
new file mode 100644
index 0000000..a0cc2a9
--- /dev/null
+++ b/opendj-sdk/opends/ext/ant/fetch.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+<!--
+ =======================================================================
+ Build file to fetch optional libraries for Apache Ant
+ =======================================================================
+-->
+<project name="fetch" default="all" basedir=".">
+
+<description>
+ This build file downloads JAR files that optional Ant tasks use,
+ and installs them in a location that is accessible the next time Ant runs.
+
+ 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)
+
+ 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.
+
+ Proxies can be configured manually setting the JVM proxy values in the
+ ANT_OPTS environment variable.
+
+ For example, to set the proxy up in the tcsh shell, the command would be
+ something like:
+
+ For csh/tcsh:
+ setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+ For bash:
+ export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+ For Windows, set the environment variable in the appropriate dialog box
+ and open a new console. or, by hand
+ set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
+</description>
+
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it) -->
+ <property file="${user.home}/.ant/ant.properties"/>
+ <property name="lib.dir" location="lib" />
+ <property name="optional.dir" location="${lib.dir}/optional" />
+ <property name="userlib.dir" location="${user.home}/.ant/lib" />
+
+ <!-- load in our properties table -->
+ <property file="${lib.dir}/libraries.properties"/>
+
+ <import file="get-m2.xml" />
+
+ <target name="pick-dest">
+ <property name="dest" value="system" />
+ <condition property="dest.dir"
+ value="${lib.dir}">
+ <equals arg1="${dest}" arg2="system" />
+ </condition>
+ <condition property="dest.dir"
+ value="${optional.dir}">
+ <equals arg1="${dest}" arg2="optional" />
+ </condition>
+ <condition property="dest.dir"
+ value="${userlib.dir}">
+ <equals arg1="${dest}" arg2="user" />
+ </condition>
+ <fail unless="dest.dir">Unknown destination : ${dest}</fail>
+ <echo>Downloading to ${dest.dir}</echo>
+ <property name="m2.dest.dir" value="${dest.dir}" />
+ </target>
+
+
+ <target name="macros" depends="pick-dest,get-m2"
+ xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <macrodef name="f2">
+ <attribute name="project" />
+ <attribute name="archive" default="@{project}"/>
+ <sequential>
+ <fail>
+ Unknown archive @{archive} -no property @{archive}.version defined.
+ <condition>
+ <not>
+ <isset property="@{archive}.version"/>
+ </not>
+ </condition>
+ </fail>
+ <artifact:dependencies pathID="@{archive}.path">
+ <dependency groupID="@{project}"
+ artifactID="@{archive}"
+ version="${@{archive}.version}"/>
+ </artifact:dependencies>
+ <!-- now we are left with the problem of getting the files
+ into our directory -->
+ <copypath destdir="${dest.dir}" pathref="@{archive}.path">
+ <flattenmapper/>
+ </copypath>
+ </sequential>
+ </macrodef>
+ </target>
+
+
+
+ <!-- any init stuff -->
+ <target name="init" depends="macros" />
+
+
+ <target name="diag" depends="init">
+ <echoproperties />
+ </target>
+
+ <target name="logging"
+ description="load logging libraries"
+ depends="init">
+ <f2 project="log4j" />
+ <f2 project="commons-logging" archive="commons-logging-api" />
+ </target>
+
+ <target name="junit"
+ description="load junit libraries"
+ depends="init">
+ <f2 project="junit" />
+ </target>
+
+ <target name="xml"
+ description="load full XML libraries (xalan, resolver)"
+ depends="init">
+ <f2 project="xalan" />
+ <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"/>
+ </target>
+
+ <target name="regexp"
+ description="load regexp libraries"
+ depends="init">
+ <f2 project="regexp" />
+ <f2 project="oro" />
+ </target>
+
+ <target name="antlr"
+ description="load antlr libraries"
+ depends="init">
+ <f2 project="antlr" />
+ </target>
+
+ <target name="bcel"
+ description="load bcel libraries"
+ depends="init">
+ <f2 project="bcel" />
+ </target>
+
+ <target name="jdepend"
+ description="load jdepend libraries"
+ depends="init">
+ <f2 project="jdepend" />
+ </target>
+
+ <target name="bsf"
+ description="load bsf libraries"
+ depends="init">
+ <f2 project="bsf" />
+ </target>
+
+ <target name="jruby"
+ description="load jruby"
+ depends="bsf">
+ <f2 project="org.jruby" archive="jruby"/>
+ </target>
+
+ <target name="beanshell"
+ description="load beanshell support"
+ depends="bsf">
+ <f2 project="org.beanshell" archive="bsh"/>
+ <f2 project="org.beanshell" archive="bsh-core"/>
+ </target>
+
+ <target name="jython"
+ description="load jython"
+ depends="bsf">
+ <f2 project="jython" archive="jython"/>
+ </target>
+
+ <target name="rhino"
+ description="load rhino"
+ depends="bsf">
+ <f2 project="rhino" archive="js"/>
+ </target>
+
+ <target name="script"
+ description="load script languages"
+ depends="bsf,jruby,jython,beanshell,rhino"/>
+
+ <target name="debugging"
+ description="internal ant debugging"
+ depends="init">
+ <f2 project="which" />
+ </target>
+
+ <target name="all"
+ description="load all the libraries"
+ depends="logging,junit,xml,networking,regexp,antlr,bcel,jdepend,bsf,debugging,script" />
+
+</project>
diff --git a/opendj-sdk/opends/ext/ant/get-m2.xml b/opendj-sdk/opends/ext/ant/get-m2.xml
new file mode 100644
index 0000000..4111e81
--- /dev/null
+++ b/opendj-sdk/opends/ext/ant/get-m2.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0"?>
+
+<!--
+ 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.
+-->
+<!--
+ =======================================================================
+ Build file to fetch maven2 tasks; extracted from (Ant's) fetch.xml
+ =======================================================================
+-->
+<project name="get-m2" default="get-m2" basedir=".">
+
+<description>
+ This build file downloads the Maven2 Ant tasks,
+ and installs them in the location specified by the m2.dest.dir property.
+
+ You may need to set proxy settings. On Java1.5, Ant tries to get
+ this from the OS, unless you use the -noproxy option.
+
+ Proxies can be configured manually setting the JVM proxy values in the
+ ANT_OPTS environment variable.
+
+ For example, to set the proxy up in the tcsh shell, the command would be
+ something like:
+
+ For csh/tcsh:
+ setenv ANT_OPTS "-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+ For bash:
+ export ANT_OPTS="-Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080"
+ For Windows, set the environment variable in the appropriate dialog box
+ and open a new console. or, by hand
+ set ANT_OPTS = -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080
+</description>
+
+ <property file="get-m2.properties" />
+
+ <property name="m2.antlib.resource"
+ value="org/apache/maven/artifact/ant/antlib.xml" />
+
+ <property name="m2.antlib.uri"
+ value="antlib:org.apache.maven.artifact.ant" />
+
+ <macrodef name="require">
+ <attribute name="property" />
+ <sequential>
+ <fail unless="@{property}">$${@{property}} not specified</fail>
+ </sequential>
+ </macrodef>
+
+ <target name="probe-m2">
+ <require property="m2.dest.dir" />
+ <require property="m2.jar.name" />
+
+ <!-- Look for M2 ant tasks in our classpath-->
+ <property name="m2.artifact" location="${m2.dest.dir}/${m2.jar.name}" />
+ <available property="m2.antlib.found" resource="${m2.antlib.resource}" />
+ <condition property="m2.antlib.typefound">
+ <typefound name="${m2.antlib.uri}:artifact" />
+ </condition>
+ <available property="m2.artifact.found" file="${m2.artifact}" type="file" />
+ </target>
+
+ <target name="download-m2" depends="probe-m2" unless="m2.artifact.found">
+ <require property="m2.antlib.url" />
+ <echo>Downloading to ${m2.dest.dir}</echo>
+
+ <mkdir dir="${m2.dest.dir}" />
+ <!-- fetch M2 ant tasks into our repository, if it is not there-->
+ <get src="${m2.antlib.url}"
+ dest="${m2.artifact}"
+ verbose="true"
+ usetimestamp="false" />
+ </target>
+
+ <target name="dont-validate-m2-checksum" depends="probe-m2"
+ if="m2.artifact.found">
+ <property name="checksum.equal" value="true" />
+ </target>
+
+ <target name="validate-m2-checksum"
+ depends="download-m2,dont-validate-m2-checksum"
+ if="m2.sha1.checksum" unless="m2.artifact.found">
+ <checksum file="${m2.artifact}"
+ algorithm="SHA"
+ property="${m2.sha1.checksum}"
+ verifyProperty="checksum.equal" />
+ </target>
+
+ <target name="checksum-mismatch" depends="validate-m2-checksum"
+ if="m2.sha1.checksum" unless="checksum.equal">
+ <delete file="${m2.artifact}" />
+ <fail>
+ Failed to verify the downloaded file ${m2.antlib.url}" against the checksum
+ coded into libraries.properties.
+ The local copy has been deleted, for security reasons
+ </fail>
+ </target>
+
+ <target name="checksum-match" depends="checksum-mismatch"
+ unless="m2.antlib.found">
+ <taskdef classpath="${m2.artifact}" resource="${m2.antlib.resource}"
+ uri="${m2.antlib.uri}" />
+ </target>
+
+ <target name="get-m2" depends="checksum-match"
+ description="Download the Maven2 Ant tasks" />
+
+</project>
diff --git a/opendj-sdk/opends/ext/ant/lib/README b/opendj-sdk/opends/ext/ant/lib/README
index 38fa1fa..a056be2 100644
--- a/opendj-sdk/opends/ext/ant/lib/README
+++ b/opendj-sdk/opends/ext/ant/lib/README
@@ -7,8 +7,9 @@
<http://xml.apache.org/xerces2-j/>. See the file LICENSE.xerces for
the terms of distribution.
-It also contains xml-apis.jar from the 2.6.2 release of Apache Xerces.
-For more information or newer releases see
+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.
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-antlr.jar b/opendj-sdk/opends/ext/ant/lib/ant-antlr.jar
index 74a3277..5b127f9 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-antlr.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-antlr.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-bcel.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-bcel.jar
index ad415ce..cdc5202 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-bcel.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-bcel.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-bsf.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-bsf.jar
index 2b11ff3..0ee68ac 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-bsf.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-bsf.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-log4j.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-log4j.jar
index e3e5bca..4c9427e 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-log4j.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-log4j.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-oro.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-oro.jar
index f14b5ee..30013ba 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-oro.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-oro.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-regexp.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-regexp.jar
index 8336461..a393a3c 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-regexp.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-regexp.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-apache-resolver.jar b/opendj-sdk/opends/ext/ant/lib/ant-apache-resolver.jar
index 9b04635..119a41d 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-apache-resolver.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-apache-resolver.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-commons-logging.jar b/opendj-sdk/opends/ext/ant/lib/ant-commons-logging.jar
index 3eb1f2b..fcba217 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-commons-logging.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-commons-logging.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-commons-net.jar b/opendj-sdk/opends/ext/ant/lib/ant-commons-net.jar
index 1dcfc5f..b490c96 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-commons-net.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-commons-net.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-jai.jar b/opendj-sdk/opends/ext/ant/lib/ant-jai.jar
index 3fe361d..26901f3 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-jai.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-jai.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-javamail.jar b/opendj-sdk/opends/ext/ant/lib/ant-javamail.jar
index 39d5165..8778e93 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-javamail.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-javamail.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-jdepend.jar b/opendj-sdk/opends/ext/ant/lib/ant-jdepend.jar
index 1d03ea6..37cd86f 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-jdepend.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-jdepend.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-jmf.jar b/opendj-sdk/opends/ext/ant/lib/ant-jmf.jar
index 030463b..036385c 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-jmf.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-jmf.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-jsch.jar b/opendj-sdk/opends/ext/ant/lib/ant-jsch.jar
index 4c1d368..5466269 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-jsch.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-jsch.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-junit.jar b/opendj-sdk/opends/ext/ant/lib/ant-junit.jar
index 1a2d293..fa43fb2 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-junit.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-junit.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-launcher.jar b/opendj-sdk/opends/ext/ant/lib/ant-launcher.jar
index 1e35f68..12a1e78 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-launcher.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-launcher.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-netrexx.jar b/opendj-sdk/opends/ext/ant/lib/ant-netrexx.jar
index 42f30ee..d646fd7 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-netrexx.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-netrexx.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-nodeps.jar b/opendj-sdk/opends/ext/ant/lib/ant-nodeps.jar
index 5b11dcf..2d209fa 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-nodeps.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-nodeps.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-starteam.jar b/opendj-sdk/opends/ext/ant/lib/ant-starteam.jar
index c168518..668b190 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-starteam.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-starteam.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-stylebook.jar b/opendj-sdk/opends/ext/ant/lib/ant-stylebook.jar
index d8b2515..2d6ab23 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-stylebook.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-stylebook.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-swing.jar b/opendj-sdk/opends/ext/ant/lib/ant-swing.jar
index aa41326..60c3981 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-swing.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-swing.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-trax.jar b/opendj-sdk/opends/ext/ant/lib/ant-trax.jar
index 60da27c..ef838ec 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-trax.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-trax.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant-weblogic.jar b/opendj-sdk/opends/ext/ant/lib/ant-weblogic.jar
index eac34f7..9f0de19 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant-weblogic.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant-weblogic.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/ant.jar b/opendj-sdk/opends/ext/ant/lib/ant.jar
index 3a67607..0a56a58 100644
--- a/opendj-sdk/opends/ext/ant/lib/ant.jar
+++ b/opendj-sdk/opends/ext/ant/lib/ant.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/libraries.properties b/opendj-sdk/opends/ext/ant/lib/libraries.properties
new file mode 100644
index 0000000..40b21d5
--- /dev/null
+++ b/opendj-sdk/opends/ext/ant/lib/libraries.properties
@@ -0,0 +1,46 @@
+#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}
diff --git a/opendj-sdk/opends/ext/ant/lib/xercesImpl.jar b/opendj-sdk/opends/ext/ant/lib/xercesImpl.jar
index f0fb0e8..3b351f6 100644
--- a/opendj-sdk/opends/ext/ant/lib/xercesImpl.jar
+++ b/opendj-sdk/opends/ext/ant/lib/xercesImpl.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/ant/lib/xml-apis.jar b/opendj-sdk/opends/ext/ant/lib/xml-apis.jar
index 2dd8377..b338fb6 100644
--- a/opendj-sdk/opends/ext/ant/lib/xml-apis.jar
+++ b/opendj-sdk/opends/ext/ant/lib/xml-apis.jar
Binary files differ
--
Gitblit v1.10.0