From 208ac44ce6e3a930ca4d4cfcd1177e7bd98458dd Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 21 Oct 2008 15:30:14 +0000
Subject: [PATCH] Fix an issue where OpenDS revision number is set to -1 when using svn 1.5. The solution involves upgrading svnkit to version 1.2.0 and updating code calling svnkit.
---
opends/ext/svnkit/jsvnadmin | 19 +
opends/ext/svnkit/jsvnversion | 19 +
opends/ext/svnkit/jsvndumpfilter.bat | 4
opends/ext/svnkit/svnkit-cli.jar | 0
opends/ext/svnkit/jsvnlook | 19 +
opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java | 18 +
opends/src/build-tools/org/opends/build/tools/GetSubversionRevision.java | 10
opends/ext/svnkit/changelog.txt | 115 +++++++++++
opends/src/build-tools/org/opends/build/tools/CoverageDiff.java | 12
opends/ext/svnkit/README.txt | 11
opends/ext/svnkit/jsvnadmin.bat | 4
opends/ext/svnkit/svnkit.build.properties | 14 +
opends/ext/svnkit/svnkitclisrc.zip | 0
opends/ext/svnkit/SEQUENCE-LICENSE | 6
opends/ext/svnkit/jsvnsync | 19 +
opends/ext/svnkit/trilead.jar | 0
opends/ext/svnkit/TRILEAD-LICENSE | 145 ++++++++-----
opends/ext/svnkit/svnkit-javahl.jar | 0
/dev/null | 26 --
opends/ext/svnkit/jsvndumpfilter | 19 +
opends/ext/svnkit/jsvnsetup.openvms | 36 +++
opends/ext/svnkit/COPYING | 6
opends/ext/svnkit/jsvn | 20 ++
opends/ext/svnkit/jsvnlook.bat | 4
opends/ext/svnkit/doc.tar.gz | 0
opends/ext/svnkit/jsvnsync.bat | 4
opends/ext/svnkit/svnkitsrc.zip | 0
opends/ext/svnkit/JNA-LICENSE | 11 +
opends/ext/svnkit/jsvn.bat | 4
opends/ext/svnkit/svnkit.jar | 0
opends/ext/svnkit/jna.jar | 0
opends/ext/svnkit/jsvnversion.bat | 4
opends/ext/svnkit/logging.properties.disabled | 9
33 files changed, 433 insertions(+), 125 deletions(-)
diff --git a/opends/ext/svnkit/COPYING b/opends/ext/svnkit/COPYING
index 2e7d2e3..f30961b 100644
--- a/opends/ext/svnkit/COPYING
+++ b/opends/ext/svnkit/COPYING
@@ -1,12 +1,12 @@
The TMate License
This license applies to all portions of TMate SVNKit library, which
-are not externally-maintained libraries (e.g. Ganymed SSH library).
+are not externally-maintained libraries (e.g. Trilead SSH library).
-All the source code and compiled classes in package org.trigris.subversion.javahl
+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-2006 TMate Software. All rights reserved.
+Copyright (c) 2004-2008 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/opends/ext/svnkit/JNA-LICENSE b/opends/ext/svnkit/JNA-LICENSE
new file mode 100644
index 0000000..b1a63d1
--- /dev/null
+++ b/opends/ext/svnkit/JNA-LICENSE
@@ -0,0 +1,11 @@
+Copyright (c) 2008 Timothy Wall, All Rights Reserved
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library 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
+Lesser General Public License for more details.
\ No newline at end of file
diff --git a/opends/ext/svnkit/README.txt b/opends/ext/svnkit/README.txt
index 99ef74a..a368e2f 100644
--- a/opends/ext/svnkit/README.txt
+++ b/opends/ext/svnkit/README.txt
@@ -12,6 +12,7 @@
The TMate open source license permits you to use SVNKit at no charge under the condition
that if you use the software in an application you redistribute, the complete source code for
your application must be available and freely redistributable under reasonable conditions.
+
If you do not want to release the source code for your application, you may purchase a license
from TMate Software. For pricing information, or if you have further questions on licensing,
please contact us at support@svnkit.com.
@@ -25,16 +26,20 @@
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.2 features and supports older Subversion repositories.
+This version of SVNKit supports all Subversion 1.5.2 features and supports older Subversion repositories.
4. RESOURCES
SVNKit Web Site: http://svnkit.com/
-SVNKit Documentation: http://svnkit.com/kb/index.html
+SVNKit Documentation: http://svnkit.com/documentation.html
+SVNKit Wiki: https://wiki.svnkit.com/
+SVNKit JavaDoc: http://svnkit.com/javadoc/
-SVNKit Mailing List: http://svnkit.com/kb/mailinglist.html
+SVNKit Mailing List: http://svnkit.com/support.html
SVNKit Issues Tracker: http://svnkit.com/tracker/
+SVNKit Continuous Build Server: https://teamcity.svnkit.com/
+
5. CONTACTS
On all questions related to SVNKit please contact us at support@svnkit.com
\ No newline at end of file
diff --git a/opends/ext/svnkit/SEQUENCE-LICENSE b/opends/ext/svnkit/SEQUENCE-LICENSE
index d578624..35b7847 100644
--- a/opends/ext/svnkit/SEQUENCE-LICENSE
+++ b/opends/ext/svnkit/SEQUENCE-LICENSE
@@ -3,7 +3,7 @@
This license applies to all portions of the Sequence library, which
are not externally-maintained libraries (e.g. junit or jsch).
====================================================================
-Copyright (c) 2000-2005 SyntEvo GmbH, Bayerisch Gmain, GERMANY.
+Copyright (c) 2000-2008 SyntEvo GmbH, Ainring, GERMANY.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -19,14 +19,14 @@
3. The end-user documentation included with the redistribution, if
any, must include the following acknowledgment: "This product includes
-software developed by SyntEvo GmbH, Bayerisch Gmain, GERMANY."
+software developed by SyntEvo GmbH, Ainring, GERMANY."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
4. The hosted project names must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact
-sequence-library@syntevo.com.
+info@syntevo.com.
5. Neither the name of SyntEvo GmbH nor the names of its contributors
may be used to endorse or promote products derived from this
diff --git a/opends/ext/svnkit/GANYMED-LICENSE b/opends/ext/svnkit/TRILEAD-LICENSE
similarity index 64%
rename from opends/ext/svnkit/GANYMED-LICENSE
rename to opends/ext/svnkit/TRILEAD-LICENSE
index ba93009..5795385 100644
--- a/opends/ext/svnkit/GANYMED-LICENSE
+++ b/opends/ext/svnkit/TRILEAD-LICENSE
@@ -1,57 +1,88 @@
-Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
- Department of Computer Science (http://www.inf.ethz.ch),
- Christian Plattner. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-a.) Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-b.) 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.
-c.) Neither the name of ETH Zurich nor the names of its contributors may
- be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
-
-
-The Java implementations of the AES, Blowfish and 3DES ciphers have been
-taken (and slightly modified) from the cryptography package released by
-"The Legion Of The Bouncy Castle".
-
-Their license states the following:
-
-Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
-(http://www.bouncycastle.org)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
+Copyright (c) 2007-2008 Trilead AG (http://www.trilead.com)
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+a.) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+b.) 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.
+c.) Neither the name of Trilead nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+Trilead SSH-2 for Java includes code that was written by Dr. Christian Plattner
+during his PhD at ETH Zurich. The license states the following:
+
+Copyright (c) 2005 - 2006 Swiss Federal Institute of Technology (ETH Zurich),
+ Department of Computer Science (http://www.inf.ethz.ch),
+ Christian Plattner. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+a.) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+b.) 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.
+c.) Neither the name of ETH Zurich nor the names of its contributors may
+ be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+The Java implementations of the AES, Blowfish and 3DES ciphers have been
+taken (and slightly modified) from the cryptography package released by
+"The Legion Of The Bouncy Castle".
+
+Their license states the following:
+
+Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+(http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
diff --git a/opends/ext/svnkit/changelog.txt b/opends/ext/svnkit/changelog.txt
index 440eb5b..81291e0 100644
--- a/opends/ext/svnkit/changelog.txt
+++ b/opends/ext/svnkit/changelog.txt
@@ -1,3 +1,118 @@
+== version 1.2.0
+
++ Possible NPE on WC to URL copy operation fixed.
++ Log operation didn't work properly with 'limit' options set to value
+ larger than Integer.MAX_VALUE, fixed.
++ OSGI manifest fixes.
+
+== version 1.2.0-rc4
+
++ JNA library updated to version 3.0.5.
++ jsvnlook 'cat' and 'lock' commands added.
++ Update operation didn't work properly on sparse directories with 1.4.x Subversion servers, fixed.
++ SASL: minor bugfixes.
++ Other bugfixes.
+
+== version 1.2.0-rc3
+
++ SVNKit Eclipse plugin divided into two features: core svnkit library and optional JNA library.
++ SVNKit Eclipse plugin made compatible with base OSGI framework.
++ SVN+SSH protocol performance improvements.
++ File uid and guid wasn't properly fetched on OSX and BSD.
++ Other bugfixes and minor improvements.
+
+== version 1.2.0-rc2
+
++ SASL: incorrect output buffer size might result in failed commits, fixed.
++ Possible NPE on copy operation fixed.
+
+== version 1.2.0-rc1
+
++ Javadoc updated
++ SASL authentication support bugfixes
++ Bug in keyword expansion code fixed
++ Other bugfixes
+
+== version 1.2.0-beta5
+
++ SASL authentication support improved
++ Java SSH Trilead library updated to build 213
++ JNA library updated to version 3.0.4
++ Fixed: SSH connectivity problems with non-OpenSSH servers
++ Javadoc updated
++ Other bugfixes
+
+== version 1.2.0-beta4
+
++ Bugfixes
+
+== version 1.2.0-beta3
+
++ SASL authentication support improved.
++ Other bugfixes.
+
+== version 1.2.0-beta2
+
++ JavaHL compatiblity bugfixes
++ DAV protocol performance improvements
+
+== version 1.2.0-beta
+
++ Subversion 1.5.0 features support
+
+== version 1.1.7
+
++ SVNKit didn't work properly with Subversion 1.5.0 servers over svn protocol
++ JNA library updated to version 3.0.2
++ Trilead-SSH library updated to build 212
++ Other bugfixes
+
+== version 1.1.6
+
++ Bugfixes:
++ Copy WC to URL sometimes didn't work properly with switched directories.
++ Several NPEs in HTTP connection code fixed.
++ Authentication cancellation didn't work with SSH connection in some cases.
+
+== version 1.1.5
+
++ Connections pool has been improved.
++ New version of SSH library (Trilead build 211) is used.
++ When possible, JNA library is used for most of native calls instead of Runtime.exec(...)
++ HTTP Digest authentications works better.
++ Bug in keywords expansion code fixed.
++ Other bugfixes.
+
+= version 1.1.4
+
++ Connections pool closes inactive connections on timeout.
++ Bugfixes.
+
+= version 1.1.3
+
++ Encrypted credentials supported on Windows.
++ OpenVMS support improved.
++ Bugfixes.
++ Daily builds now available at http://teamcity.svnkit.com/
+
+= version 1.1.2
+
++ SVNKit command line client: interactive credentials prompt added.
++ SVNKit command line client: jsvnversion added.
++ JavaHL: SVNAdmin implemented using SVNKit API.
++ System-wide configuration files support (e.g. /etc/subversion on Linux)
++ bugfixes.
+
+= version 1.1.1
+
++ added support for svnlook features.
++ added support for svnadmin dump/verify/load/rmtxns/lstxns features.
++ svn, svnadmin, svnlook and svnsync scripts are
+ renamed to jsvn, jsvnadmin, jsvnlook and jsvnsync to distinguish them
+ from the native programs.
++ command line scripts supports OpenVMS.
++ bugfixes.
+
= version 1.1.0
+ command line application and API to perform svnsync.
diff --git a/opends/ext/svnkit/doc.tar.gz b/opends/ext/svnkit/doc.tar.gz
index 672368e..789b815 100644
--- a/opends/ext/svnkit/doc.tar.gz
+++ b/opends/ext/svnkit/doc.tar.gz
Binary files differ
diff --git a/opends/ext/svnkit/ganymed.jar b/opends/ext/svnkit/ganymed.jar
deleted file mode 100644
index e3bde26..0000000
--- a/opends/ext/svnkit/ganymed.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/jna.jar b/opends/ext/svnkit/jna.jar
new file mode 100644
index 0000000..ec12e11
--- /dev/null
+++ b/opends/ext/svnkit/jna.jar
Binary files differ
diff --git a/opends/ext/svnkit/jsvn b/opends/ext/svnkit/jsvn
new file mode 100755
index 0000000..2e76c65
--- /dev/null
+++ b/opends/ext/svnkit/jsvn
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svn.SVN
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnsync.bat b/opends/ext/svnkit/jsvn.bat
similarity index 74%
rename from opends/ext/svnkit/svnsync.bat
rename to opends/ext/svnkit/jsvn.bat
index b4f21a8..3e1468f 100644
--- a/opends/ext/svnkit/svnsync.bat
+++ b/opends/ext/svnkit/jsvn.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/jsvnadmin b/opends/ext/svnkit/jsvnadmin
new file mode 100755
index 0000000..60f8f9d
--- /dev/null
+++ b/opends/ext/svnkit/jsvnadmin
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnadmin.SVNAdmin
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svn.bat b/opends/ext/svnkit/jsvnadmin.bat
similarity index 73%
rename from opends/ext/svnkit/svn.bat
rename to opends/ext/svnkit/jsvnadmin.bat
index fceca79..c888830 100644
--- a/opends/ext/svnkit/svn.bat
+++ b/opends/ext/svnkit/jsvnadmin.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVN
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/jsvndumpfilter b/opends/ext/svnkit/jsvndumpfilter
new file mode 100755
index 0000000..e20abd2
--- /dev/null
+++ b/opends/ext/svnkit/jsvndumpfilter
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svndumpfilter.SVNDumpFilter
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnsync.bat b/opends/ext/svnkit/jsvndumpfilter.bat
similarity index 71%
copy from opends/ext/svnkit/svnsync.bat
copy to opends/ext/svnkit/jsvndumpfilter.bat
index b4f21a8..f28a166 100644
--- a/opends/ext/svnkit/svnsync.bat
+++ b/opends/ext/svnkit/jsvndumpfilter.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/jsvnlook b/opends/ext/svnkit/jsvnlook
new file mode 100755
index 0000000..bfb9256
--- /dev/null
+++ b/opends/ext/svnkit/jsvnlook
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnlook.SVNLook
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnsync.bat b/opends/ext/svnkit/jsvnlook.bat
similarity index 73%
copy from opends/ext/svnkit/svnsync.bat
copy to opends/ext/svnkit/jsvnlook.bat
index b4f21a8..63ff0dc 100644
--- a/opends/ext/svnkit/svnsync.bat
+++ b/opends/ext/svnkit/jsvnlook.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/jsvnsetup.openvms b/opends/ext/svnkit/jsvnsetup.openvms
new file mode 100644
index 0000000..8730f9b
--- /dev/null
+++ b/opends/ext/svnkit/jsvnsetup.openvms
@@ -0,0 +1,36 @@
+$!
+$ if f$type(java) .nes. "STRING" .or. "''java'" .eqs. ""
+$ then
+$ write SYS$OUTPUT "You must have the JAVA symbol properly set before using this command"
+$ exit
+$ endif
+$ env = f$env("PROCEDURE")
+$ home = f$parse(env,,,"device") + f$parse(env,,,"directory")
+$ define/job/nolog svnkit_home 'home'
+$!
+$ define/job/nolog decc$argv_parse_style enable
+$ define/job/nolog decc$efs_case_preserve enable
+$!
+$ if f$edit(f$trnlnm("DECC$EFS_CASE_SPECIAL"),"UPCASE") .eqs. "ENABLE"
+$ then
+$ write sys$output " "
+$ write sys$output "JSVNSETUP: DECC$EFS_CASE_SPECIAL defined! Please deassign logical otherwise jsvn might not function properly!"
+$ write sys$output " "
+$ 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"
+$ OPT = ""
+$! OPT = "-Djava.util.logging.config.file=/svnkit_home/logging.properties"
+$!
+$ JV = f$edit(java,"collapse")
+$ jsvn == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svn.SVN"""
+$ jsvnadmin == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svnadmin.SVNAdmin"""
+$ jsvnlook == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svnlook.SVNLook"""
+$ jsvnsync == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svnsync.SVNSync"""
+$ jsvndumpfilter == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svndumpfilter.SVNDumpFilter"""
+$ jsvnversion == "''JV' ''OPT' -cp ''CP' ""org.tmatesoft.svn.cli.svnversion.SVNVersion"""
+$!
diff --git a/opends/ext/svnkit/jsvnsync b/opends/ext/svnkit/jsvnsync
new file mode 100755
index 0000000..2a3793f
--- /dev/null
+++ b/opends/ext/svnkit/jsvnsync
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnsync.SVNSync
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnsync.bat b/opends/ext/svnkit/jsvnsync.bat
similarity index 73%
copy from opends/ext/svnkit/svnsync.bat
copy to opends/ext/svnkit/jsvnsync.bat
index b4f21a8..6fe23fe 100644
--- a/opends/ext/svnkit/svnsync.bat
+++ b/opends/ext/svnkit/jsvnsync.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/jsvnversion b/opends/ext/svnkit/jsvnversion
new file mode 100755
index 0000000..ee9a61e
--- /dev/null
+++ b/opends/ext/svnkit/jsvnversion
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+cygwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+esac
+
+SVNKIT_HOME=`dirname $0`
+SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
+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"
+
+SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.svnversion.SVNVersion
+"$JAVA_HOME/bin/java" $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnsync.bat b/opends/ext/svnkit/jsvnversion.bat
similarity index 72%
copy from opends/ext/svnkit/svnsync.bat
copy to opends/ext/svnkit/jsvnversion.bat
index b4f21a8..23dc233 100644
--- a/opends/ext/svnkit/svnsync.bat
+++ b/opends/ext/svnkit/jsvnversion.bat
@@ -4,8 +4,8 @@
if "%SVNKIT_HOME%"=="" set SVNKIT_HOME=%DEFAULT_SVNKIT_HOME%
-set SVNKIT_CLASSPATH= "%SVNKIT_HOME%svnkit.jar";"%SVNKIT_HOME%svnkit-cli.jar";"%SVNKIT_HOME%ganymed.jar"
-set SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
+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"
"%JAVA_HOME%\bin\java" %SVNKIT_OPTIONS% -cp %SVNKIT_CLASSPATH% %SVNKIT_MAINCLASS% %*
\ No newline at end of file
diff --git a/opends/ext/svnkit/logging.properties.disabled b/opends/ext/svnkit/logging.properties.disabled
index 26c67f5..6fc3eac 100644
--- a/opends/ext/svnkit/logging.properties.disabled
+++ b/opends/ext/svnkit/logging.properties.disabled
@@ -1,9 +1,12 @@
-svnkit.level=FINE
+svnkit.level=FINEST
+svnkit-network.level=FINEST
+svnkit-wc.level=FINEST
+svnkit-cli.level=FINEST
handlers = java.util.logging.FileHandler
-java.util.logging.FileHandler.pattern = %h/.svnkit/svnkit.%u.log
+java.util.logging.FileHandler.pattern = %h/svnkit.%u.log
java.util.logging.FileHandler.limit = 0
java.util.logging.FileHandler.count = 1
java.util.logging.FileHandler.append = true
-java.util.logging.FileHandler.formatter = org.tmatesoft.svn.core.internal.util.DefaultSVNDebugFormatter
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
diff --git a/opends/ext/svnkit/svn b/opends/ext/svnkit/svn
deleted file mode 100755
index 1cad163..0000000
--- a/opends/ext/svnkit/svn
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
-esac
-
-SVNKIT_HOME=`dirname $0`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-SVNKIT_CP=$SVNKIT_HOME/svnkit.jar:$SVNKIT_HOME/svnkit-cli.jar:$SVNKIT_HOME/ganymed.jar
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
- [ -n "$SVNKIT_LOGDIR" ] &&
- SVNKIT_LOGDIR=`cygpath --unix "$SVNKIT_LOGDIR"`
-fi
-
-if [ ! -d $SVNKIT_LOGDIR ]; then
- mkdir $SVNKIT_LOGDIR
-fi
-
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
-
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVN
-$JAVA_HOME/bin/java $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/svnkit-cli.jar b/opends/ext/svnkit/svnkit-cli.jar
index 99e6233..8bb051b 100644
--- a/opends/ext/svnkit/svnkit-cli.jar
+++ b/opends/ext/svnkit/svnkit-cli.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkit-javahl.jar b/opends/ext/svnkit/svnkit-javahl.jar
index 2ebb052..4899086 100644
--- a/opends/ext/svnkit/svnkit-javahl.jar
+++ b/opends/ext/svnkit/svnkit-javahl.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkit.build.properties b/opends/ext/svnkit/svnkit.build.properties
new file mode 100644
index 0000000..71356b1
--- /dev/null
+++ b/opends/ext/svnkit/svnkit.build.properties
@@ -0,0 +1,14 @@
+svnkit.version=1.2.0
+# could be overriden by build server, e.g. TeamCity.
+build.number=${svnkit.version}
+
+#properties for SVN runtime
+svnkit.version.string=SVN/1.5.2 SVNKit/1.2.0 (http://svnkit.com/) r4949
+svnkit.version.major=1
+svnkit.version.minor=2
+svnkit.version.micro=0
+svnkit.version.revision=4949
+
+#build.xml properties
+jna.version=3.0.5
+trilead.ssh2.version=build213-svnkit-1.2-patch
diff --git a/opends/ext/svnkit/svnkit.jar b/opends/ext/svnkit/svnkit.jar
index 2e08b93..a70ae44 100644
--- a/opends/ext/svnkit/svnkit.jar
+++ b/opends/ext/svnkit/svnkit.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkitclisrc.zip b/opends/ext/svnkit/svnkitclisrc.zip
new file mode 100644
index 0000000..176b16c
--- /dev/null
+++ b/opends/ext/svnkit/svnkitclisrc.zip
Binary files differ
diff --git a/opends/ext/svnkit/svnkitsrc.zip b/opends/ext/svnkit/svnkitsrc.zip
index 2d42a98..f2d5fe8 100644
--- a/opends/ext/svnkit/svnkitsrc.zip
+++ b/opends/ext/svnkit/svnkitsrc.zip
Binary files differ
diff --git a/opends/ext/svnkit/svnsync b/opends/ext/svnkit/svnsync
deleted file mode 100644
index d872810..0000000
--- a/opends/ext/svnkit/svnsync
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-cygwin=false;
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
-esac
-
-SVNKIT_HOME=`dirname $0`
-SVNKIT_HOME=`cd "$SVNKIT_HOME" ; pwd`
-
-SVNKIT_CP=$SVNKIT_HOME/svnkit.jar:$SVNKIT_HOME/svnkit-cli.jar:$SVNKIT_HOME/ganymed.jar
-
-if $cygwin ; then
- SVNKIT_CP=`cygpath --windows --path "$SVNKIT_CP"`
- [ -n "$SVNKIT_LOGDIR" ] &&
- SVNKIT_LOGDIR=`cygpath --unix "$SVNKIT_LOGDIR"`
-fi
-
-if [ ! -d $SVNKIT_LOGDIR ]; then
- mkdir $SVNKIT_LOGDIR
-fi
-
-SVNKIT_VM_OPTIONS="-Dsun.io.useCanonCaches=false -Djava.util.logging.config.file=$SVNKIT_HOME/logging.properties"
-
-SVNKIT_MAINCLASS=org.tmatesoft.svn.cli.SVNSync
-$JAVA_HOME/bin/java $SVNKIT_VM_OPTIONS -cp $SVNKIT_CP $SVNKIT_MAINCLASS "$@"
diff --git a/opends/ext/svnkit/trilead.jar b/opends/ext/svnkit/trilead.jar
new file mode 100644
index 0000000..6de76b9
--- /dev/null
+++ b/opends/ext/svnkit/trilead.jar
Binary files differ
diff --git a/opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java b/opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java
index 2f7d8b7..257b534 100644
--- a/opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java
+++ b/opends/src/build-tools/org/opends/build/tools/CheckPrecommit.java
@@ -41,14 +41,13 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
-import org.tmatesoft.svn.core.SVNErrorMessage;
+import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.wc.SVNPropertyData;
import org.tmatesoft.svn.core.wc.SVNRevision;
import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNStatus;
-import org.tmatesoft.svn.core.wc.SVNStatusClient;
-import org.tmatesoft.svn.core.wc.SVNStatusType;
import org.tmatesoft.svn.core.wc.SVNWCClient;
@@ -125,6 +124,9 @@
// The string representation of the current year.
private String yearString;
+ // The overall SVN Client Manager. required with svnkit 1.2.x
+ private static SVNClientManager ourClientManager =
+ SVNClientManager.newInstance();
// The property client used to look at file properties.
private SVNWCClient propertyClient;
@@ -170,12 +172,12 @@
// Process the base directory and all of its subdirectories.
- SVNStatusClient svnClient = new SVNStatusClient(null, null);
- propertyClient = new SVNWCClient(null, null);
+ propertyClient = ourClientManager.getWCClient();
try
{
- svnClient.doStatus(workspacePath, true, false, false, false, false, this);
+ long status = ourClientManager.getStatusClient().doStatus(workspacePath, SVNRevision.WORKING,
+ SVNDepth.INFINITY, false, false, false, false, this, null);
}
catch (Exception e)
{
@@ -296,9 +298,9 @@
SVNPropertyData propertyData =
propertyClient.doGetProperty(file, "svn:eol-style",
SVNRevision.BASE,
- SVNRevision.WORKING, false);
+ SVNRevision.WORKING);
if ((propertyData == null) ||
- (! propertyData.getValue().equals("native")))
+ (! propertyData.getValue().getString().equals("native")))
{
eolStyleProblemFiles.add(filePath);
}
diff --git a/opends/src/build-tools/org/opends/build/tools/CoverageDiff.java b/opends/src/build-tools/org/opends/build/tools/CoverageDiff.java
index c9e5191..2e456de 100644
--- a/opends/src/build-tools/org/opends/build/tools/CoverageDiff.java
+++ b/opends/src/build-tools/org/opends/build/tools/CoverageDiff.java
@@ -37,13 +37,17 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
+import org.tmatesoft.svn.core.SVNDepth;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNDiffClient;
import org.tmatesoft.svn.core.wc.SVNRevision;
public class CoverageDiff extends Task {
+ private static SVNClientManager ourClientManager =
+ SVNClientManager.newInstance();
private static final String EOL = System.getProperty("line.separator");
private boolean verbose = false;
@@ -297,17 +301,15 @@
throws IOException, SVNException {
File workspaceRoot = getProject().getBaseDir();
- SVNDiffClient svnClient = new SVNDiffClient(null, null);
-
File diffFile = new File(outputPath, "svn.diff");
// Most often this will be 'BASE' but it could also be 'PREVIOUS'
SVNRevision baseRevision = SVNRevision.parse(fromRevision);
System.out.println("Doing coverage diff from revision: " + baseRevision.toString());
- svnClient.doDiff(workspaceRoot, baseRevision, workspaceRoot,
- SVNRevision.WORKING, true, false,
- new FileOutputStream(diffFile));
+ ourClientManager.getDiffClient().doDiff(workspaceRoot, baseRevision,
+ workspaceRoot, SVNRevision.WORKING, SVNDepth.INFINITY, false,
+ new FileOutputStream(diffFile), null);
return new BufferedReader(new InputStreamReader(new FileInputStream(
diffFile)));
diff --git a/opends/src/build-tools/org/opends/build/tools/GetSubversionRevision.java b/opends/src/build-tools/org/opends/build/tools/GetSubversionRevision.java
index 80d9aca..73f86f3 100644
--- a/opends/src/build-tools/org/opends/build/tools/GetSubversionRevision.java
+++ b/opends/src/build-tools/org/opends/build/tools/GetSubversionRevision.java
@@ -34,9 +34,9 @@
import org.apache.tools.ant.Task;
import org.tmatesoft.svn.core.SVNException;
+import org.tmatesoft.svn.core.wc.SVNClientManager;
import org.tmatesoft.svn.core.wc.SVNInfo;
import org.tmatesoft.svn.core.wc.SVNRevision;
-import org.tmatesoft.svn.core.wc.SVNWCClient;
@@ -55,7 +55,9 @@
// revision number.
private String workspace = null;
-
+ // The svn client manager. Required by svnkit 1.2.x
+ private static SVNClientManager ourClientManager =
+ SVNClientManager.newInstance();
/**
* Specifies the name of the Ant property into which the Subversion revision
@@ -110,11 +112,9 @@
}
- SVNWCClient svnClient = new SVNWCClient(null, null);
-
try
{
- SVNInfo svnInfo = svnClient.doInfo(workspacePath, SVNRevision.WORKING);
+ SVNInfo svnInfo = ourClientManager.getWCClient().doInfo(workspacePath, SVNRevision.WORKING);
SVNRevision revision = svnInfo.getRevision();
if (revision == null)
{
--
Gitblit v1.10.0