From 7921288fd0265b80c92ab76a3347d6604fa7c718 Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Thu, 26 Jul 2012 10:04:10 +0000
Subject: [PATCH] Fix OPENDJ-551: Update svnkit to 1.7.5-v1
---
opendj-sdk/opends/ext/svnkit/jsvnlook | 103 ++-
opendj-sdk/opends/ext/svnkit/README.txt | 5
opendj-sdk/opends/ext/svnkit/jsvnsync | 103 ++-
opendj-sdk/opends/ext/svnkit/ANTLR-LICENSE | 26 +
opendj-sdk/opends/ext/svnkit/jsvndumpfilter.bat | 99 +++
opendj-sdk/opends/ext/svnkit/svnkit-javahl.jar | 0
opendj-sdk/opends/ext/svnkit/changelog.txt | 203 ++++++++
opendj-sdk/opends/ext/svnkit/sqljet.jar | 0
opendj-sdk/opends/ext/svnkit/svnkit-cli.jar | 0
opendj-sdk/opends/ext/svnkit/svnkit.build.properties | 17
opendj-sdk/opends/ext/svnkit/antlr-runtime.jar | 0
opendj-sdk/opends/ext/svnkit/SQLJET-LICENSE | 19
opendj-sdk/opends/ext/svnkit/trilead.jar | 0
opendj-sdk/opends/ext/svnkit/jsvnadmin | 103 ++-
opendj-sdk/opends/ext/svnkit/COPYING | 2
opendj-sdk/opends/ext/svnkit/jsvn.bat | 99 +++
opendj-sdk/opends/ext/svnkit/jsvnadmin.bat | 99 +++
opendj-sdk/opends/ext/svnkit/jsvndumpfilter | 103 ++-
opendj-sdk/opends/ext/svnkit/jsvnversion.bat | 99 +++
opendj-sdk/opends/ext/svnkit/svnkitsrc.zip | 0
opendj-sdk/opends/ext/svnkit/svnkit.jar | 0
opendj-sdk/opends/ext/svnkit/jna.jar | 0
opendj-sdk/opends/ext/svnkit/jsvn | 103 ++-
opendj-sdk/opends/ext/svnkit/jsvnversion | 103 ++-
/dev/null | 0
opendj-sdk/opends/ext/svnkit/sequence-library.jar | 0
opendj-sdk/opends/ext/svnkit/jsvnsetup.openvms | 14
opendj-sdk/opends/ext/svnkit/jsvnsync.bat | 99 +++
opendj-sdk/opends/ext/svnkit/jsvnlook.bat | 99 +++
29 files changed, 1,265 insertions(+), 233 deletions(-)
diff --git a/opendj-sdk/opends/ext/svnkit/ANTLR-LICENSE b/opendj-sdk/opends/ext/svnkit/ANTLR-LICENSE
new file mode 100644
index 0000000..67e047c
--- /dev/null
+++ b/opendj-sdk/opends/ext/svnkit/ANTLR-LICENSE
@@ -0,0 +1,26 @@
+[The "BSD licence"]
+Copyright (c) 2003-2008 Terence Parr
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/opendj-sdk/opends/ext/svnkit/COPYING b/opendj-sdk/opends/ext/svnkit/COPYING
index 817c939..3634918 100644
--- a/opendj-sdk/opends/ext/svnkit/COPYING
+++ b/opendj-sdk/opends/ext/svnkit/COPYING
@@ -6,7 +6,7 @@
All the source code and compiled classes in package org.tigris.subversion.javahl
except SvnClient class are covered by the license in JAVAHL-LICENSE file
-Copyright (c) 2004-2009 TMate Software. All rights reserved.
+Copyright (c) 2004-2012 TMate Software. All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
diff --git a/opendj-sdk/opends/ext/svnkit/README.txt b/opendj-sdk/opends/ext/svnkit/README.txt
index 793a6e2..dbbe18b 100644
--- a/opendj-sdk/opends/ext/svnkit/README.txt
+++ b/opendj-sdk/opends/ext/svnkit/README.txt
@@ -26,7 +26,10 @@
direct repository access as well as support for all high level Subversion operation that are
available with the command line Subversion client.
-This version of SVNKit supports all Subversion 1.6.2 features and supports older Subversion repositories.
+This version of SVNKit supports all major Subversion 1.7.6 features.
+
+This version of SVNKit supports both new (1.7, sqlite db) and old (1.6 and older) working copy formats
+as well as all versions of Subversion repositories since 1.0.
4. RESOURCES
diff --git a/opendj-sdk/opends/ext/svnkit/SQLJET-LICENSE b/opendj-sdk/opends/ext/svnkit/SQLJET-LICENSE
new file mode 100644
index 0000000..1f637d4
--- /dev/null
+++ b/opendj-sdk/opends/ext/svnkit/SQLJET-LICENSE
@@ -0,0 +1,19 @@
+Copyright (C) 2009-2010 TMate Software Ltd
+
+As part of SVNKit library, SQLJet library is distributed under
+the terms of TMate Open Source License (see http://svnkit.com/license.html).
+Otherwise, outside of SVNKit library, the following licensing terms
+are applicable for SQLJet library:
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; version 2 of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+For information on how to redistribute this software under
+the terms of a license other than GNU General Public License
+contact TMate Software at support@sqljet.com
\ No newline at end of file
diff --git a/opendj-sdk/opends/ext/svnkit/antlr-runtime.jar b/opendj-sdk/opends/ext/svnkit/antlr-runtime.jar
new file mode 100644
index 0000000..865a537
--- /dev/null
+++ b/opendj-sdk/opends/ext/svnkit/antlr-runtime.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/changelog.txt b/opendj-sdk/opends/ext/svnkit/changelog.txt
index d9ee096..1490f72 100644
--- a/opendj-sdk/opends/ext/svnkit/changelog.txt
+++ b/opendj-sdk/opends/ext/svnkit/changelog.txt
@@ -1,3 +1,205 @@
+== version 1.7.5-v1 ==
+
++ SVNLookClient.doGetChangedDirectories failed on revision 0, fixed.
++ Text changes might not be reported properly after native Subversion operated on
+ the working copy in 1.6 format, fixed.
++ Symbolic link last modified time now reported properly.
++ Pristine files ref count values may become invalid, fixed.
++ Empty strings might be stored as a DAV URL cache values, fixed.
++ SqlJet library 1.1.4 is used
++ Other minor stability improvements and bugfixes.
+
+== version 1.7.5 ==
+
++ File externals merge issues fixed.
++ SVNStatus reported for old and new working copy formats made more consistent.
++ Existing credentials in default cache
+ are no longer overwritten by truncated ones when store-passwords option is set to false.
++ Deleting a file remotely resulted in grand-parent directory access, fixed.
++ SVNLogClient.doList(recursive=false) now uses SVNDepth.IMMEDIATES, not FILES.
++ SqlJet 1.1.3 is used and potential NPE on concurrent working copy access fixed.
++ Other minor stability improvements and bugfixes.
+
+== version 1.7.4-v1 ==
+
++ SVNLogClient.doList() method issues fixed.
++ Potential PRISTINE wc.db table corruption fixed.
++ SVNWCClient.doResolve() was choosing wrong file version when resolving conflict, fixed.
++ JavaHL SVNClient reported wrong version, fixed.
++ Minor stability improvements and bugfixes.
++ Build script upgraded to use Gradle 1.0-rc3.
+
+== version 1.7.4 ==
+
++ Minor diff generator improvements
++ ISvnOperationHandler callback added to let users
+ receive notifications before and after operation.
+
+== version 1.7.4-rc5 ==
+
++ All snapshot dependencies are replaced with fixed versions.
++ NPE on remote proplist opertation fixed.
++ Incompatibility with GitHub Subversion bridge fixed (commit did not work)
+
+== version 1.7.4-rc4 ==
+
++ Fixed issue with Eclipse update site.
++ Fixed critical issue with switch leaving invalid wc props,
+ thus resulting in potentially wrong commits destination.
+
+== version 1.7.4-rc3 ==
+
++ Few backward compatibility issues fixed.
++ SqlJet Library dependency upgraded to 1.1.0
++ Added: SVNStatus.getCombinedNodeAndContentsStatus() method
++ Added: More javadoc documentation
+
+== version 1.7.4-rc2 ==
+
+* Fixed: JavaHL ConflictDescriptor object contained relative paths in place of absolute, fixed
+* Fixed: base checksum were not passed to the ISVNEditor callback on file update over DAV.
+* Fixed: Repository to repository copy did not work with old working copy in certain cases.
++ Added: More javadoc documentation
+
+== version 1.7.4-rc1 ==
+
++ Performance and stability improvements
+* Version bumped to match that of compatible native Subversion
+
+== version 1.7.0-beta3 ==
+
++ Performance and stability improvements
++ Diff operation improvements
+* This is a beta version and it may not be stable enough for production environment
+
+== version 1.7.0-beta2 ==
+
++ Performance and stability improvements
+* This is a beta version and it may not be stable enough for production environment
+
+== version 1.7.0-beta1 ==
+
+* First beta version with new Subversion 1.7 working copy format support
++ Lot of fixes and improvements in the new working copy format support, since alpha2
+* This is a beta version and it may not be stable enough for production environment
+
+== version 1.7.0-alpha2 ==
+
++ New JavaHL API (org.apache.subversion.javahl) implementation
++ Lot of fixes and improvements in the new working copy format support
+
+* This is alpha version and it may not be stable enough for production environment
+* The following operations are not yet implemented for the new working copy format:
+ - merge
+ - diff
+
+== version 1.7.0-alpha1 ==
+
++ New Subversion 1.7 working copy format support
++ New high-level API (see org.tmatesoft.svnkit.core.wc2)
+
+* This is alpha version and it may not be stable enough for production environment
+* The following operations are not yet implemented for the new working copy format:
+ - merge
+ - mergeinfo
+ - diff
+ - resolve, mark resolved
+ - cleanup
+* new JavaHL API is not yet implemented in this version
+
+== version 1.3.7 ==
+
++ 1.7 Subversion servers compatibility issues fixed.
++ Export operation failed on missing directories, fixed.
+
+* For new 1.7 Subversion working copy format support
+ please use SVNKit 1.7.0-alpha version.
+
+== version 1.3.6.1 ==
+
++ OSGi bundle exports JavaHL API package.
+
+== version 1.3.6 ==
+
++ Changes made in Subversion since version 1.6.15 implemented,
+ all Subversion 1.6.17 features are supported.
+
++ SSH connections pool reimplemented, number of race conditions
+ and potential deadlocks fixed by that new implementation.
++ Memory consumption decreased significantly for status operation.
++ GNOME keyring support
++ HTTP Digest and Basic authentication methods did not work
+ with non Keep-Alive connection, fixed.
++ SQLJet library upgraded to v1.0.7
+
++ Other minor bugfixes and improvements.
+
+== version 1.3.5 ==
+
++ Changes made in Subversion since version 1.6.12 implemented,
+ all Subversion 1.6.15 features are supported.
+
++ Support for OS X Keychain as credentials storage added.
++ SSL client certificate passphrase is cached in a way
+ compatible with that of the native Subversion.
++ HTTP cookies are handled properly.
++ SQLJet library upgraded to v1.0.4
+
++ Other minor bugfixes and improvements.
+
+== version 1.3.4 ==
+
++ Changes made in Subversion since version 1.6.11 implemented,
+ all Subversion 1.6.12 features are supported.
+
++ Added support for SSH host fingerprints verification.
++ Name conflict status added which is reported on
+ case-insensitive filesystems for files which name differs only in case.
++ HTTP digest authentication support improved.
++ svnkit:charset property support significantly improved.
++ SQLJet library upgraded to v1.0.3
++ JNA library upgraded to v3.2.7
+
++ Other minor bugfixes and improvements.
+
+== version 1.3.3 ==
+
++ Changes made in Subversion since version 1.6.6 implemented,
+ all Subversion 1.6.11 features are supported.
+
++ HTTP Negotiate authentication improvements.
++ Support of MSCAPI SSL certificates added.
++ SQLJet library upgraded to version 1.0.2
++ File externals support improved
+
++ Other bugfixes
+
+== version 1.3.2 ==
+
++ Changes made in Subversion since version 1.6.5 implemented,
+ all Subversion 1.6.6 features are supported.
+
+ * Negotiate authorization mechanism was not used when multiple authorization
+ schemes were offered to client by server.
+ * SQLJet library upgraded to version 1.0.1.
+ * JNA library upgraded to version 3.2.3.
+
++ Bugfixes and performance improvements.
+
+== version 1.3.1 ==
+
++ Changes made in Subversion since version 1.6.2 implemented,
+ all Subversion 1.6.5 features are supported.
+
+ * Representation cache DB support, using SQLJet (http://sqljet.com) library.
+ * Added implementations for couple of missing JavaHL methods.
+ * Fixed 'svn: Checksum mismatch while reading representation' exception on
+ reading vdelta from local repositories.
+ * Several dump and load operation issues fixed.
+ * JNA library upgraded to version 3.1.0.
+
++ Other bugfixes and performance improvements.
+
== version 1.3.0
+ Changes made in Subversion since version 1.5.6 implemented,
@@ -17,6 +219,7 @@
all Subversion 1.6.1 features are supported.
+ Bugfixes since version 1.3.0-beta2
+
== version 1.3.0-beta2
+ Changes made in Subversion since version 1.5.6 implemented,
diff --git a/opendj-sdk/opends/ext/svnkit/doc.tar.gz b/opendj-sdk/opends/ext/svnkit/doc.tar.gz
deleted file mode 100644
index 3e0a572..0000000
--- a/opendj-sdk/opends/ext/svnkit/doc.tar.gz
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/jna.jar b/opendj-sdk/opends/ext/svnkit/jna.jar
index 33461ec..cd906f9 100644
--- a/opendj-sdk/opends/ext/svnkit/jna.jar
+++ b/opendj-sdk/opends/ext/svnkit/jna.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/jsvn b/opendj-sdk/opends/ext/svnkit/jsvn
index 3d0ebf0..ceb3977 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvn
+++ b/opendj-sdk/opends/ext/svnkit/jsvn
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svn.SVN
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVN \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvn.bat b/opendj-sdk/opends/ext/svnkit/jsvn.bat
index 3e1468f..7d3c6ea 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvn.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvn.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svn.SVN
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVN %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnadmin b/opendj-sdk/opends/ext/svnkit/jsvnadmin
index c0b85a0..ecd1d5e 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvnadmin
+++ b/opendj-sdk/opends/ext/svnkit/jsvnadmin
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnadmin.SVNAdmin
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVNAdmin \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnadmin.bat b/opendj-sdk/opends/ext/svnkit/jsvnadmin.bat
index c888830..4b49b46 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvnadmin.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvnadmin.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnadmin.SVNAdmin
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVNAdmin %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/jsvndumpfilter b/opendj-sdk/opends/ext/svnkit/jsvndumpfilter
index 970915d..9ade85b 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvndumpfilter
+++ b/opendj-sdk/opends/ext/svnkit/jsvndumpfilter
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svndumpfilter.SVNDumpFilter
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVNDumpFilter \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvndumpfilter.bat b/opendj-sdk/opends/ext/svnkit/jsvndumpfilter.bat
index f28a166..8b4cecf 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvndumpfilter.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvndumpfilter.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svndumpfilter.SVNDumpFilter
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVNDumpFilter %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnlook b/opendj-sdk/opends/ext/svnkit/jsvnlook
index a07f8ea..8434685 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvnlook
+++ b/opendj-sdk/opends/ext/svnkit/jsvnlook
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnlook.SVNLook
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVNLook \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnlook.bat b/opendj-sdk/opends/ext/svnkit/jsvnlook.bat
index 63ff0dc..052f9c6 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvnlook.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvnlook.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnlook.SVNLook
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVNLook %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnsetup.openvms b/opendj-sdk/opends/ext/svnkit/jsvnsetup.openvms
index 8730f9b..9f2c2cf 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvnsetup.openvms
+++ b/opendj-sdk/opends/ext/svnkit/jsvnsetup.openvms
@@ -19,12 +19,16 @@
$ endif
$!
$!
-$ CP = "/svnkit_home/svnkit.jar"
-$ CP = CP + ":/svnkit_home/svnkit-cli.jar"
-$ CP = CP + ":/svnkit_home/trilead.jar"
-$ CP = CP + ":/svnkit_home/jna.jar"
+$ CP = "/svnkit_home/../lib"
+$ CP = CP + ":/svnkit_home/../lib/svnkit-1.7.5-v1.jar
+$ CP = CP + ":/svnkit_home/../lib/sequence-library-1.0.2.jar
+$ CP = CP + ":/svnkit_home/../lib/antlr-runtime-3.4.jar
+$ CP = CP + ":/svnkit_home/../lib/sqljet-1.1.4.jar
+$ CP = CP + ":/svnkit_home/../lib/jna-3.4.0.jar
+$ CP = CP + ":/svnkit_home/../lib/trilead-ssh2-1.0.0-build215.jar
+$ CP = CP + ":/svnkit_home/../lib/svnkit-cli-1.7.5-v1.jar
$ OPT = ""
-$! OPT = "-Djava.util.logging.config.file=/svnkit_home/logging.properties"
+$! OPT = "-Djava.util.logging.config.file=/svnkit_home/../conf/logging.properties"
$!
$ JV = f$edit(java,"collapse")
$ jsvn == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svn.SVN"""
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnsync b/opendj-sdk/opends/ext/svnkit/jsvnsync
index 28526b6..11aa5be 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvnsync
+++ b/opendj-sdk/opends/ext/svnkit/jsvnsync
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnsync.SVNSync
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVNSync \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnsync.bat b/opendj-sdk/opends/ext/svnkit/jsvnsync.bat
index 6fe23fe..2437208 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvnsync.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvnsync.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnsync.SVNSync
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVNSync %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnversion b/opendj-sdk/opends/ext/svnkit/jsvnversion
index e892609..273eb7d 100755
--- a/opendj-sdk/opends/ext/svnkit/jsvnversion
+++ b/opendj-sdk/opends/ext/svnkit/jsvnversion
@@ -1,40 +1,83 @@
-#!/bin/sh
+BASEDIR=`dirname $0`/..
+BASEDIR=`(cd "$BASEDIR"; pwd)`
cygwin=false;
+darwin=false;
case "`uname`" in
CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ] ; then
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ ;;
esac
-old_wd=`pwd`
-
-progname=`basename "$0"`
-linkdir=`dirname "$0"`
-
-cd "$linkdir"
-prg="$progname"
-
-while [ -h "$prg" ] ; do
- ls=`ls -ld "$prg"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- prg="$link"
- else
- prg="`dirname $prg`/$link"
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
fi
-done
-
-SVNKIT_HOME=`dirname $prg`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-cd "$old_wd"
-
-SVNKIT_CP="$SVNKIT_HOME/svnkit.jar":"$SVNKIT_HOME/svnkit-cli.jar":"$SVNKIT_HOME/trilead.jar":"$SVNKIT_HOME/jna.jar"
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
fi
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnversion.SVNVersion
-"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ 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"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+ echo "Error: JAVA_HOME is not defined correctly."
+ echo " We cannot execute $JAVACMD"
+ exit 1
+fi
+
+if [ -z "$SVNKIT_LIB" ]
+then
+ SVNKIT_LIB="$BASEDIR"/lib
+fi
+
+CLASSPATH="$BASEDIR/conf"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sequence-library-1.0.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/antlr-runtime-3.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.4.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.4.0.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build215.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.7.5-v1.jar"
+LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+ [ -n "$HOME" ] && HOME=`cygpath --path --windows "$HOME"`
+ [ -n "$BASEDIR" ] && BASEDIR=`cygpath --path --windows "$BASEDIR"`
+ [ -n "$REPO" ] && REPO=`cygpath --path --windows "$REPO"`
+ [ -n "$LOGGING_PROPERTIES_PATH" ] && REPO=`cygpath --path --windows "$LOGGING_PROPERTIES_PATH"`
+fi
+
+EXTRA_JVM_ARGUMENTS="-Djava.util.logging.config.file=$LOGGING_PROPERTIES_PATH -Dsun.io.useCanonCaches=false"
+
+exec "$JAVACMD" $JAVA_OPTS \
+ $EXTRA_JVM_ARGUMENTS \
+ -classpath "$CLASSPATH" \
+ org.tmatesoft.svn.cli.SVNVersion \
+ "$@"
diff --git a/opendj-sdk/opends/ext/svnkit/jsvnversion.bat b/opendj-sdk/opends/ext/svnkit/jsvnversion.bat
index 23dc233..1d753d2 100644
--- a/opendj-sdk/opends/ext/svnkit/jsvnversion.bat
+++ b/opendj-sdk/opends/ext/svnkit/jsvnversion.bat
@@ -1,11 +1,98 @@
@echo off
-set DEFAULT_SVNKIT_HOME=%~dp0
+set ERROR_CODE=0
-if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
+:init
+@REM Decide how to startup depending on the version of windows
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%trilead.jar";"%SVNKIT_HOME%jna.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnversion.SVNVersion
-set SVNKIT_OPTIONS=-Djava.util.logging.config.file="%SVNKIT_HOME%/logging.properties"
+@REM -- Win98ME
+if NOT "%OS%"=="Windows_NT" goto Win9xArg
-"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" @setlocal
+
+@REM -- 4NT shell
+if "%eval[2+2]" == "4" goto 4NTArgs
+
+@REM -- Regular WinNT shell
+set CMD_LINE_ARGS=%*
+goto WinNTGetScriptDir
+
+@REM The 4NT Shell from jp software
+:4NTArgs
+set CMD_LINE_ARGS=%$
+goto WinNTGetScriptDir
+
+:Win9xArg
+@REM Slurp the command line arguments. This loop allows for an unlimited number
+@REM of arguments (up to the command line limit, anyway).
+set CMD_LINE_ARGS=
+:Win9xApp
+if %1a==a goto Win9xGetScriptDir
+set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
+shift
+goto Win9xApp
+
+:Win9xGetScriptDir
+set SAVEDIR=%CD%
+%0\
+cd %0\..\..
+set BASEDIR=%CD%
+cd %SAVEDIR%
+set SAVE_DIR=
+goto repoSetup
+
+:WinNTGetScriptDir
+set BASEDIR=%~dp0
+IF %BASEDIR:~-1%==\ SET BASEDIR=%BASEDIR:~0,-1%
+set BASEDIR=%BASEDIR%\..
+
+:repoSetup
+
+
+if "%JAVACMD%"=="" set JAVACMD=java
+if not "%JAVA_HOME%"=="" set JAVACMD="%JAVA_HOME%\bin\%JAVACMD%"
+
+if "%SVNKIT_LIB%"=="" set SVNKIT_LIB=%BASEDIR%\lib
+
+set CLASSPATH=
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-1.7.5-v1.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sequence-library-1.0.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\antlr-runtime-3.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.4.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.4.0.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build215.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.7.5-v1.jar"
+set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
+goto endInit
+
+@REM Reaching here means variables are defined and arguments have been captured
+:endInit
+
+%JAVACMD% %JAVA_OPTS% %EXTRA_JVM_ARGUMENTS% -classpath %CLASSPATH% org.tmatesoft.svn.cli.SVNVersion %CMD_LINE_ARGS%
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
+
+:end
+@REM set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" goto endNT
+
+@REM For old DOS remove the set variables from ENV - we assume they were not set
+@REM before we started - at least we don't leave any baggage around
+set CMD_LINE_ARGS=
+goto postExec
+
+:endNT
+@endlocal
+
+:postExec
+
+if "%FORCE_EXIT_ON_ERROR%" == "on" (
+ if %ERROR_CODE% NEQ 0 exit %ERROR_CODE%
+)
+
+exit /B %ERROR_CODE%
diff --git a/opendj-sdk/opends/ext/svnkit/sequence-library.jar b/opendj-sdk/opends/ext/svnkit/sequence-library.jar
new file mode 100644
index 0000000..46c5bf7
--- /dev/null
+++ b/opendj-sdk/opends/ext/svnkit/sequence-library.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/sqljet.jar b/opendj-sdk/opends/ext/svnkit/sqljet.jar
new file mode 100644
index 0000000..8d32b72
--- /dev/null
+++ b/opendj-sdk/opends/ext/svnkit/sqljet.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/svnkit-cli.jar b/opendj-sdk/opends/ext/svnkit/svnkit-cli.jar
index 2f2c0ab..6b95c8c 100644
--- a/opendj-sdk/opends/ext/svnkit/svnkit-cli.jar
+++ b/opendj-sdk/opends/ext/svnkit/svnkit-cli.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/svnkit-javahl.jar b/opendj-sdk/opends/ext/svnkit/svnkit-javahl.jar
index 6b9f0fa..815c990 100644
--- a/opendj-sdk/opends/ext/svnkit/svnkit-javahl.jar
+++ b/opendj-sdk/opends/ext/svnkit/svnkit-javahl.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/svnkit.build.properties b/opendj-sdk/opends/ext/svnkit/svnkit.build.properties
index 9e4f4b9..e60f48e 100644
--- a/opendj-sdk/opends/ext/svnkit/svnkit.build.properties
+++ b/opendj-sdk/opends/ext/svnkit/svnkit.build.properties
@@ -1,14 +1,11 @@
-svnkit.version=1.3.0
-# could be overriden by build server, e.g. TeamCity.
-build.number=${svnkit.version}
+svnkit.version=1.7.5-v1
+build.number=r9382_v20120718_1415
#properties for SVN runtime
-svnkit.version.string=SVN/1.6.2 SVNKit/1.3.0 (http://svnkit.com/) r5847
+svnkit.version.string=SVN/1.7.5 SVNKit/1.7.5-v1 (http://svnkit.com/) r9382_v20120718_1415
svnkit.version.major=1
-svnkit.version.minor=3
-svnkit.version.micro=0
-svnkit.version.revision=5847
+svnkit.version.minor=7
+svnkit.version.micro=5
+svnkit.version.revision=r9382_v20120718_1415
-#build.xml properties
-jna.version=3.0.9
-trilead.ssh2.version=build213-svnkit-1.3-patch
+svnkit.svn.version=1.7.5
diff --git a/opendj-sdk/opends/ext/svnkit/svnkit.jar b/opendj-sdk/opends/ext/svnkit/svnkit.jar
index 8fe3f41..2b533a9 100644
--- a/opendj-sdk/opends/ext/svnkit/svnkit.jar
+++ b/opendj-sdk/opends/ext/svnkit/svnkit.jar
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/svnkitclisrc.zip b/opendj-sdk/opends/ext/svnkit/svnkitclisrc.zip
deleted file mode 100644
index b51d5ff..0000000
--- a/opendj-sdk/opends/ext/svnkit/svnkitclisrc.zip
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/svnkitsrc.zip b/opendj-sdk/opends/ext/svnkit/svnkitsrc.zip
index be59de7..89a3c85 100644
--- a/opendj-sdk/opends/ext/svnkit/svnkitsrc.zip
+++ b/opendj-sdk/opends/ext/svnkit/svnkitsrc.zip
Binary files differ
diff --git a/opendj-sdk/opends/ext/svnkit/trilead.jar b/opendj-sdk/opends/ext/svnkit/trilead.jar
index 6de76b9..f6dc8be 100644
--- a/opendj-sdk/opends/ext/svnkit/trilead.jar
+++ b/opendj-sdk/opends/ext/svnkit/trilead.jar
Binary files differ
--
Gitblit v1.10.0