From 2faadd7160adeccb51dd387be7126429aab579be Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Fri, 28 Nov 2014 14:28:07 +0000
Subject: [PATCH] OPENDJ-1644 (CR-5507) Update svnkit version to be compatible with svn 1.8 Now use svnkit 1.8.5

---
 opends/ext/svnkit/src/svnkit-cli-1.8.5-sources.jar                  |    0 
 opends/ext/svnkit/src/svnkit-1.8.5-sources.jar                      |    0 
 opends/ext/svnkit/src/svnkit-javahl16-1.8.5-sources.jar             |    0 
 opends/ext/svnkit/bin/jsvnadmin                                     |   18 +
 opends/ext/svnkit/bin/jsvnsync                                      |   18 +
 opends/ext/svnkit/lib/antlr-runtime-3.4.jar                         |    0 
 opends/ext/svnkit/bin/jsvn                                          |   18 +
 opends/ext/svnkit/bin/jsvndumpfilter.bat                            |   18 +
 opends/ext/svnkit/lib/sqljet-1.1.10.jar                             |    0 
 opends/ext/svnkit/bin/jsvndumpfilter                                |   18 +
 opends/ext/svnkit/lib/svnkit-1.8.5.jar                              |    0 
 opends/ext/svnkit/licenses/LICENSE-JAVAHL.txt                       |    0 
 opends/ext/svnkit/bin/jsvnlook                                      |   18 +
 opends/ext/svnkit/bin/jsvnsync.bat                                  |   18 +
 opends/ext/svnkit/bin/jsvnadmin.bat                                 |   18 +
 opends/ext/svnkit/lib/jsch.agentproxy.core-0.0.7.jar                |    0 
 opends/ext/svnkit/bin/jsvnversion.bat                               |   18 +
 opends/ext/svnkit/lib/jsch.agentproxy.connector-factory-0.0.7.jar   |    0 
 opends/ext/svnkit/bin/jsvnversion                                   |   18 +
 opends/ext/svnkit/conf/logging.properties.disabled                  |    9 
 opends/ext/svnkit/lib/platform-3.5.2.jar                            |    0 
 opends/ext/svnkit/licenses/LICENSE-TRILEAD.txt                      |    0 
 opends/ext/svnkit/lib/jsch.agentproxy.usocket-nc-0.0.7.jar          |    0 
 opends/ext/svnkit/CHANGES.txt                                       |   79 +++++++++++
 opends/ext/svnkit/bin/jsvnsetup.openvms                             |   18 +
 opends/ext/svnkit/README.txt                                        |    5 
 opends/ext/svnkit/lib/jsch.agentproxy.usocket-jna-0.0.7.jar         |    0 
 opends/ext/svnkit/licenses/LICENSE-SQLJET.txt                       |    0 
 opends/ext/svnkit/licenses/LICENSE-JSCH.txt                         |   30 ++++
 opends/ext/svnkit/licenses/LICENSE-SEQUENCE.txt                     |    0 
 opends/ext/svnkit/lib/jna-3.5.2.jar                                 |    0 
 opends/ext/svnkit/lib/jsch.agentproxy.pageant-0.0.7.jar             |    0 
 opends/ext/svnkit/lib/svnkit-javahl16-1.8.5.jar                     |    0 
 opends/ext/svnkit/lib/jsch.agentproxy.sshagent-0.0.7.jar            |    0 
 opends/ext/svnkit/lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar |    0 
 opends/ext/svnkit/licenses/LICENSE-ANTLR.txt                        |    0 
 opends/ext/svnkit/licenses/LICENSE-JNA.txt                          |    0 
 opends/ext/svnkit/bin/jsvnlook.bat                                  |   18 +
 /dev/null                                                           |    0 
 opends/ext/svnkit/lib/svnkit-cli-1.8.5.jar                          |    0 
 opends/build.xml                                                    |   11 
 opends/ext/svnkit/bin/jsvn.bat                                      |   18 +
 opends/ext/svnkit/LICENSE.txt                                       |    2 
 opends/ext/svnkit/lib/trilead-ssh2-1.0.0-build217.jar               |    0 
 opends/ext/svnkit/lib/sequence-library-1.0.2.jar                    |    0 
 45 files changed, 292 insertions(+), 78 deletions(-)

diff --git a/opends/build.xml b/opends/build.xml
index 8c668da..5c87a10 100644
--- a/opends/build.xml
+++ b/opends/build.xml
@@ -139,6 +139,7 @@
 
   <!-- Properties for the SVNKit tool.                         -->
   <property name="svnkit.dir"  location="${ext.dir}/svnkit" />
+  <property name="svnkit.lib.dir"  location="${ext.dir}/svnkit/lib" />
 
   <!-- Properties for Directory Server version information.              -->
   <property name="dynconstants.file"
@@ -575,7 +576,7 @@
         <fileset dir="${build.dir}/build-tools">
           <include name="*.jar" />
         </fileset>
-        <fileset dir="${svnkit.dir}">
+        <fileset dir="${svnkit.lib.dir}">
           <include name="*.jar" />
         </fileset>
       </classpath>
@@ -590,7 +591,7 @@
         <fileset dir="${build.dir}/build-tools">
           <include name="*.jar" />
         </fileset>
-        <fileset dir="${svnkit.dir}">
+        <fileset dir="${svnkit.lib.dir}">
           <include name="*.jar" />
         </fileset>
       </classpath>
@@ -649,7 +650,7 @@
         <fileset dir="${build.dir}/build-tools">
           <include name="*.jar" />
         </fileset>
-        <fileset dir="${svnkit.dir}">
+        <fileset dir="${svnkit.lib.dir}">
           <include name="*.jar" />
         </fileset>
       </classpath>
@@ -2017,7 +2018,7 @@
         <fileset dir="${emma.dir}">
           <include name="*.jar" />
         </fileset>
-        <fileset dir="${svnkit.dir}">
+        <fileset dir="${svnkit.lib.dir}">
           <include name="*.jar" />
         </fileset>
       </classpath>
@@ -2472,7 +2473,7 @@
           <include name="*.jar" />
         </fileset>
 
-        <fileset dir="${svnkit.dir}">
+        <fileset dir="${svnkit.lib.dir}">
           <include name="*.jar" />
         </fileset>
 
diff --git a/opends/ext/svnkit/changelog.txt b/opends/ext/svnkit/CHANGES.txt
similarity index 89%
rename from opends/ext/svnkit/changelog.txt
rename to opends/ext/svnkit/CHANGES.txt
index 1490f72..b27bf50 100644
--- a/opends/ext/svnkit/changelog.txt
+++ b/opends/ext/svnkit/CHANGES.txt
@@ -1,3 +1,80 @@
+== version 1.8.5 ==
+
++ Properties merge didn't work correctly in 1.8.4, fixed.
++ Stability improvements.
+
+== version 1.8.4 ==
+
++ Full transparent support of 1.7 working copy format.
++ Crash on concurrent access to GNOME Keyring fixed.
++ Non-atomic rename issues when JNA is not present fixed.
++ Missing JavaHL 1.8 methods implemented.
++ Stability and performance improvements.
+
+== version 1.8.3-1 ==
+
++ Pre 1.8.4 version.
+
+== version 1.8.3 ==
+
++ JNA dependency is optional again.
++ Users may replace JNA version 3.5.2 with version 4.0.0 
+  (unless JDK 1.5 compatibility is needed).
++ SqlJet 1.1.10 is used now for better performance on checking out large projects.
++ Stability improvements.
+
+== version 1.8.2 ==
+
++ Optional readonly support of 1.7 working copy format
++ Number of exceptions and status issues fixed.
+
+== version 1.8.1 ==
+
++ Eclipse update site issues fixed.
++ In case of multithreaded high load access, commit to FSRepository might fail
+  on Windows due to file rename operation non-atomic behavior, fixed.
++ JNA dependency set to 3.5.2
++ Remote diff functionality might not work properly, fixed.
+
+== version 1.8.0 ==
+
++ Subversion 1.8.0 working copy and repositories format support. 
+
+== version 1.7.11 ==
+
++ Eclipse update site issues fixed.
++ Minor performance improvements.
++ Minor stability improvements and bugfixes. 
+
+== version 1.7.10 ==
+
++ SSH agent support added via JSCH library.
++ Minor stability improvements and bugfixes. 
+
+== version 1.7.9 ==
+
++ SSL support improvements.
++ SqlJet library 1.1.7 is used.
++ Other minor stability improvements and bugfixes. 
+
+== version 1.7.8 ==
+
++ HTTP proxy authentication improvements.
++ Batch commit support for 1.7 working copies.
++ When used within Eclipse 4.2, credentials were not saved, fixed. 
++ SqlJet library 1.1.6 is used.
++ Other minor stability improvements and bugfixes. 
+
+== version 1.7.6 ==
+
++ Deadlock in connections pool code fixed.
++ Connections might be left open on connections pool disposal.
++ Error reporting improved for DAV operations.
++ Remote diff might leave SSH connection open for a while when svn+ssh was used.
++ SSL Proxy supports authentication other than Basic.
++ SqlJet library 1.1.4 is used.
++ Other minor stability improvements and bugfixes. 
+
 == version 1.7.5-v1 ==
 
 + SVNLookClient.doGetChangedDirectories failed on revision 0, fixed.
@@ -668,4 +745,4 @@
 = build 20041105
 
 + switch and relocate operations
-+ bugfixes
\ No newline at end of file
++ bugfixes
diff --git a/opends/ext/svnkit/COPYING b/opends/ext/svnkit/LICENSE.txt
similarity index 97%
rename from opends/ext/svnkit/COPYING
rename to opends/ext/svnkit/LICENSE.txt
index 3634918..44a944a 100644
--- a/opends/ext/svnkit/COPYING
+++ b/opends/ext/svnkit/LICENSE.txt
@@ -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-2012 TMate Software. All rights reserved.
+Copyright (c) 2004-2013 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/README.txt b/opends/ext/svnkit/README.txt
index dbbe18b..e51f4e3 100644
--- a/opends/ext/svnkit/README.txt
+++ b/opends/ext/svnkit/README.txt
@@ -26,10 +26,9 @@
 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 major Subversion 1.7.6 features.
+This version of SVNKit supports all major Subversion 1.8 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.
+This version of SVNKit supports 1.8 and 1.6 working copy formats; 1.7 working copies need to be upgraded to 1.8 format.
 
 4. RESOURCES
 
diff --git a/opends/ext/svnkit/jsvn b/opends/ext/svnkit/bin/jsvn
similarity index 73%
rename from opends/ext/svnkit/jsvn
rename to opends/ext/svnkit/bin/jsvn
index ceb3977..408e68b 100755
--- a/opends/ext/svnkit/jsvn
+++ b/opends/ext/svnkit/bin/jsvn
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvn.bat b/opends/ext/svnkit/bin/jsvn.bat
similarity index 71%
rename from opends/ext/svnkit/jsvn.bat
rename to opends/ext/svnkit/bin/jsvn.bat
index 7d3c6ea..cf3dac5 100644
--- a/opends/ext/svnkit/jsvn.bat
+++ b/opends/ext/svnkit/bin/jsvn.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/jsvnadmin b/opends/ext/svnkit/bin/jsvnadmin
similarity index 73%
rename from opends/ext/svnkit/jsvnadmin
rename to opends/ext/svnkit/bin/jsvnadmin
index ecd1d5e..b2d93aa 100755
--- a/opends/ext/svnkit/jsvnadmin
+++ b/opends/ext/svnkit/bin/jsvnadmin
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvnadmin.bat b/opends/ext/svnkit/bin/jsvnadmin.bat
similarity index 71%
rename from opends/ext/svnkit/jsvnadmin.bat
rename to opends/ext/svnkit/bin/jsvnadmin.bat
index 4b49b46..0c27492 100644
--- a/opends/ext/svnkit/jsvnadmin.bat
+++ b/opends/ext/svnkit/bin/jsvnadmin.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/jsvndumpfilter b/opends/ext/svnkit/bin/jsvndumpfilter
similarity index 74%
rename from opends/ext/svnkit/jsvndumpfilter
rename to opends/ext/svnkit/bin/jsvndumpfilter
index 9ade85b..a1c5666 100755
--- a/opends/ext/svnkit/jsvndumpfilter
+++ b/opends/ext/svnkit/bin/jsvndumpfilter
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvndumpfilter.bat b/opends/ext/svnkit/bin/jsvndumpfilter.bat
similarity index 71%
rename from opends/ext/svnkit/jsvndumpfilter.bat
rename to opends/ext/svnkit/bin/jsvndumpfilter.bat
index 8b4cecf..4184428 100644
--- a/opends/ext/svnkit/jsvndumpfilter.bat
+++ b/opends/ext/svnkit/bin/jsvndumpfilter.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/jsvnlook b/opends/ext/svnkit/bin/jsvnlook
similarity index 73%
rename from opends/ext/svnkit/jsvnlook
rename to opends/ext/svnkit/bin/jsvnlook
index 8434685..bc196d9 100755
--- a/opends/ext/svnkit/jsvnlook
+++ b/opends/ext/svnkit/bin/jsvnlook
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvnlook.bat b/opends/ext/svnkit/bin/jsvnlook.bat
similarity index 71%
rename from opends/ext/svnkit/jsvnlook.bat
rename to opends/ext/svnkit/bin/jsvnlook.bat
index 052f9c6..2f0d188 100644
--- a/opends/ext/svnkit/jsvnlook.bat
+++ b/opends/ext/svnkit/bin/jsvnlook.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/jsvnsetup.openvms b/opends/ext/svnkit/bin/jsvnsetup.openvms
old mode 100644
new mode 100755
similarity index 64%
rename from opends/ext/svnkit/jsvnsetup.openvms
rename to opends/ext/svnkit/bin/jsvnsetup.openvms
index 9f2c2cf..b62ac6b
--- a/opends/ext/svnkit/jsvnsetup.openvms
+++ b/opends/ext/svnkit/bin/jsvnsetup.openvms
@@ -20,13 +20,21 @@
 $!
 $!
 $ CP = "/svnkit_home/../lib"
-$ CP = CP + ":/svnkit_home/../lib/svnkit-1.7.5-v1.jar
+$ CP = CP + ":/svnkit_home/../lib/svnkit-1.8.5.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
+$ CP = CP + ":/svnkit_home/../lib/sqljet-1.1.10.jar
+$ CP = CP + ":/svnkit_home/../lib/jna-3.5.2.jar
+$ CP = CP + ":/svnkit_home/../lib/platform-3.5.2.jar
+$ CP = CP + ":/svnkit_home/../lib/trilead-ssh2-1.0.0-build217.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.core-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.usocket-jna-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.usocket-nc-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.sshagent-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.pageant-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.connector-factory-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar
+$ CP = CP + ":/svnkit_home/../lib/svnkit-cli-1.8.5.jar
 $ OPT = ""
 $! OPT = "-Djava.util.logging.config.file=/svnkit_home/../conf/logging.properties"
 $!
diff --git a/opends/ext/svnkit/jsvnsync b/opends/ext/svnkit/bin/jsvnsync
similarity index 73%
rename from opends/ext/svnkit/jsvnsync
rename to opends/ext/svnkit/bin/jsvnsync
index 11aa5be..85a695d 100755
--- a/opends/ext/svnkit/jsvnsync
+++ b/opends/ext/svnkit/bin/jsvnsync
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvnsync.bat b/opends/ext/svnkit/bin/jsvnsync.bat
similarity index 71%
rename from opends/ext/svnkit/jsvnsync.bat
rename to opends/ext/svnkit/bin/jsvnsync.bat
index 2437208..c962f81 100644
--- a/opends/ext/svnkit/jsvnsync.bat
+++ b/opends/ext/svnkit/bin/jsvnsync.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/jsvnversion b/opends/ext/svnkit/bin/jsvnversion
similarity index 73%
rename from opends/ext/svnkit/jsvnversion
rename to opends/ext/svnkit/bin/jsvnversion
index 273eb7d..71adc6d 100755
--- a/opends/ext/svnkit/jsvnversion
+++ b/opends/ext/svnkit/bin/jsvnversion
@@ -55,13 +55,21 @@
 fi
 
 CLASSPATH="$BASEDIR/conf"
-CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.7.5-v1.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-1.8.5.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"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/sqljet-1.1.10.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jna-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/platform-3.5.2.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/trilead-ssh2-1.0.0-build217.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.core-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-jna-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.usocket-nc-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.sshagent-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.pageant-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.connector-factory-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+CLASSPATH=$CLASSPATH:"$SVNKIT_LIB/svnkit-cli-1.8.5.jar"
 LOGGING_PROPERTIES_PATH="$BASEDIR/conf/logging.properties"
 
 # For Cygwin, switch paths to Windows format before running java
diff --git a/opends/ext/svnkit/jsvnversion.bat b/opends/ext/svnkit/bin/jsvnversion.bat
similarity index 71%
rename from opends/ext/svnkit/jsvnversion.bat
rename to opends/ext/svnkit/bin/jsvnversion.bat
index 1d753d2..6743044 100644
--- a/opends/ext/svnkit/jsvnversion.bat
+++ b/opends/ext/svnkit/bin/jsvnversion.bat
@@ -56,13 +56,21 @@
 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%\svnkit-1.8.5.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 CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\sqljet-1.1.10.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jna-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\platform-3.5.2.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\trilead-ssh2-1.0.0-build217.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.core-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-jna-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.usocket-nc-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.sshagent-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.pageant-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.connector-factory-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar"
+set CLASSPATH=%CLASSPATH%;"%SVNKIT_LIB%\svnkit-cli-1.8.5.jar"
 set EXTRA_JVM_ARGUMENTS=-Djava.util.logging.config.file="%BASEDIR%\conf\logging.properties" -Dsun.io.useCanonCaches=false
 goto endInit
 
diff --git a/opends/ext/svnkit/logging.properties.disabled b/opends/ext/svnkit/conf/logging.properties.disabled
similarity index 65%
rename from opends/ext/svnkit/logging.properties.disabled
rename to opends/ext/svnkit/conf/logging.properties.disabled
index 6fc3eac..1485c6e 100644
--- a/opends/ext/svnkit/logging.properties.disabled
+++ b/opends/ext/svnkit/conf/logging.properties.disabled
@@ -1,12 +1,15 @@
+#
+# Rename this file to logging.properties to enable SVNKit debug logging.
+# Log file will reside in your working directory.
+#
 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.%u.log
+java.util.logging.FileHandler.pattern = 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 = java.util.logging.SimpleFormatter
-
+java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
\ No newline at end of file
diff --git a/opends/ext/svnkit/jna.jar b/opends/ext/svnkit/jna.jar
deleted file mode 100644
index cd906f9..0000000
--- a/opends/ext/svnkit/jna.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/antlr-runtime.jar b/opends/ext/svnkit/lib/antlr-runtime-3.4.jar
similarity index 100%
rename from opends/ext/svnkit/antlr-runtime.jar
rename to opends/ext/svnkit/lib/antlr-runtime-3.4.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jna-3.5.2.jar b/opends/ext/svnkit/lib/jna-3.5.2.jar
new file mode 100644
index 0000000..ed8a456
--- /dev/null
+++ b/opends/ext/svnkit/lib/jna-3.5.2.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.connector-factory-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.connector-factory-0.0.7.jar
new file mode 100644
index 0000000..b2fc29d
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.connector-factory-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.core-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.core-0.0.7.jar
new file mode 100644
index 0000000..aa70a81
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.core-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.pageant-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.pageant-0.0.7.jar
new file mode 100644
index 0000000..0552cbb
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.pageant-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.sshagent-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.sshagent-0.0.7.jar
new file mode 100644
index 0000000..142ff0b
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.sshagent-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar
new file mode 100644
index 0000000..53bd028
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.svnkit-trilead-ssh2-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.usocket-jna-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.usocket-jna-0.0.7.jar
new file mode 100644
index 0000000..e61809a
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.usocket-jna-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/jsch.agentproxy.usocket-nc-0.0.7.jar b/opends/ext/svnkit/lib/jsch.agentproxy.usocket-nc-0.0.7.jar
new file mode 100644
index 0000000..2c8e2d0
--- /dev/null
+++ b/opends/ext/svnkit/lib/jsch.agentproxy.usocket-nc-0.0.7.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/platform-3.5.2.jar b/opends/ext/svnkit/lib/platform-3.5.2.jar
new file mode 100644
index 0000000..35432b0
--- /dev/null
+++ b/opends/ext/svnkit/lib/platform-3.5.2.jar
Binary files differ
diff --git a/opends/ext/svnkit/sequence-library.jar b/opends/ext/svnkit/lib/sequence-library-1.0.2.jar
similarity index 100%
rename from opends/ext/svnkit/sequence-library.jar
rename to opends/ext/svnkit/lib/sequence-library-1.0.2.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/sqljet-1.1.10.jar b/opends/ext/svnkit/lib/sqljet-1.1.10.jar
new file mode 100644
index 0000000..f59eb38
--- /dev/null
+++ b/opends/ext/svnkit/lib/sqljet-1.1.10.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/svnkit-1.8.5.jar b/opends/ext/svnkit/lib/svnkit-1.8.5.jar
new file mode 100644
index 0000000..8ad54de
--- /dev/null
+++ b/opends/ext/svnkit/lib/svnkit-1.8.5.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/svnkit-cli-1.8.5.jar b/opends/ext/svnkit/lib/svnkit-cli-1.8.5.jar
new file mode 100644
index 0000000..68daf48
--- /dev/null
+++ b/opends/ext/svnkit/lib/svnkit-cli-1.8.5.jar
Binary files differ
diff --git a/opends/ext/svnkit/lib/svnkit-javahl16-1.8.5.jar b/opends/ext/svnkit/lib/svnkit-javahl16-1.8.5.jar
new file mode 100644
index 0000000..767dd65
--- /dev/null
+++ b/opends/ext/svnkit/lib/svnkit-javahl16-1.8.5.jar
Binary files differ
diff --git a/opends/ext/svnkit/trilead.jar b/opends/ext/svnkit/lib/trilead-ssh2-1.0.0-build217.jar
similarity index 70%
rename from opends/ext/svnkit/trilead.jar
rename to opends/ext/svnkit/lib/trilead-ssh2-1.0.0-build217.jar
index f6dc8be..43d882b 100644
--- a/opends/ext/svnkit/trilead.jar
+++ b/opends/ext/svnkit/lib/trilead-ssh2-1.0.0-build217.jar
Binary files differ
diff --git a/opends/ext/svnkit/ANTLR-LICENSE b/opends/ext/svnkit/licenses/LICENSE-ANTLR.txt
similarity index 100%
rename from opends/ext/svnkit/ANTLR-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-ANTLR.txt
diff --git a/opends/ext/svnkit/JAVAHL-LICENSE b/opends/ext/svnkit/licenses/LICENSE-JAVAHL.txt
similarity index 100%
rename from opends/ext/svnkit/JAVAHL-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-JAVAHL.txt
diff --git a/opends/ext/svnkit/JNA-LICENSE b/opends/ext/svnkit/licenses/LICENSE-JNA.txt
similarity index 100%
rename from opends/ext/svnkit/JNA-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-JNA.txt
diff --git a/opends/ext/svnkit/licenses/LICENSE-JSCH.txt b/opends/ext/svnkit/licenses/LICENSE-JSCH.txt
new file mode 100644
index 0000000..ca349f8
--- /dev/null
+++ b/opends/ext/svnkit/licenses/LICENSE-JSCH.txt
@@ -0,0 +1,30 @@
+JSch 0.0.* was released under the GNU LGPL license.  Later, we have switched 
+over to a BSD-style license. 
+
+------------------------------------------------------------------------------
+Copyright (c) 2002-2012 Atsuhiko Yamanaka, JCraft,Inc. 
+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 names of the authors may not be used to endorse or promote products
+     derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JCRAFT,
+INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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.
\ No newline at end of file
diff --git a/opends/ext/svnkit/SEQUENCE-LICENSE b/opends/ext/svnkit/licenses/LICENSE-SEQUENCE.txt
similarity index 100%
rename from opends/ext/svnkit/SEQUENCE-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-SEQUENCE.txt
diff --git a/opends/ext/svnkit/SQLJET-LICENSE b/opends/ext/svnkit/licenses/LICENSE-SQLJET.txt
similarity index 100%
rename from opends/ext/svnkit/SQLJET-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-SQLJET.txt
diff --git a/opends/ext/svnkit/TRILEAD-LICENSE b/opends/ext/svnkit/licenses/LICENSE-TRILEAD.txt
similarity index 100%
rename from opends/ext/svnkit/TRILEAD-LICENSE
rename to opends/ext/svnkit/licenses/LICENSE-TRILEAD.txt
diff --git a/opends/ext/svnkit/sqljet.jar b/opends/ext/svnkit/sqljet.jar
deleted file mode 100644
index 8d32b72..0000000
--- a/opends/ext/svnkit/sqljet.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/src/svnkit-1.8.5-sources.jar b/opends/ext/svnkit/src/svnkit-1.8.5-sources.jar
new file mode 100644
index 0000000..c518bc6
--- /dev/null
+++ b/opends/ext/svnkit/src/svnkit-1.8.5-sources.jar
Binary files differ
diff --git a/opends/ext/svnkit/src/svnkit-cli-1.8.5-sources.jar b/opends/ext/svnkit/src/svnkit-cli-1.8.5-sources.jar
new file mode 100644
index 0000000..18d3d30
--- /dev/null
+++ b/opends/ext/svnkit/src/svnkit-cli-1.8.5-sources.jar
Binary files differ
diff --git a/opends/ext/svnkit/src/svnkit-javahl16-1.8.5-sources.jar b/opends/ext/svnkit/src/svnkit-javahl16-1.8.5-sources.jar
new file mode 100644
index 0000000..5d4e36b
--- /dev/null
+++ b/opends/ext/svnkit/src/svnkit-javahl16-1.8.5-sources.jar
Binary files differ
diff --git a/opends/ext/svnkit/svnkit-cli.jar b/opends/ext/svnkit/svnkit-cli.jar
deleted file mode 100644
index 6b95c8c..0000000
--- a/opends/ext/svnkit/svnkit-cli.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/svnkit-javahl.jar b/opends/ext/svnkit/svnkit-javahl.jar
deleted file mode 100644
index 815c990..0000000
--- a/opends/ext/svnkit/svnkit-javahl.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/svnkit.build.properties b/opends/ext/svnkit/svnkit.build.properties
deleted file mode 100644
index e60f48e..0000000
--- a/opends/ext/svnkit/svnkit.build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-svnkit.version=1.7.5-v1
-build.number=r9382_v20120718_1415
-
-#properties for SVN runtime
-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=7
-svnkit.version.micro=5
-svnkit.version.revision=r9382_v20120718_1415
-
-svnkit.svn.version=1.7.5
diff --git a/opends/ext/svnkit/svnkit.jar b/opends/ext/svnkit/svnkit.jar
deleted file mode 100644
index 2b533a9..0000000
--- a/opends/ext/svnkit/svnkit.jar
+++ /dev/null
Binary files differ
diff --git a/opends/ext/svnkit/svnkitsrc.zip b/opends/ext/svnkit/svnkitsrc.zip
deleted file mode 100644
index 89a3c85..0000000
--- a/opends/ext/svnkit/svnkitsrc.zip
+++ /dev/null
Binary files differ

--
Gitblit v1.10.0