Skip to content
Permalink
Browse files

[JENKINS-27084] Revert system property changes.

  • Loading branch information...
christ66 committed Jun 13, 2015
1 parent a67ae6e commit 2e6f2940b5f561b2377a72ddbe1fd9d7c0f15b52
@@ -4,7 +4,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://lib.svnkit.com/license.html
* are also available at http://svnkit.com/license.html
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
* ====================================================================
@@ -107,7 +107,7 @@ public boolean run(Collection<SubversionSCM.External> externals, Result changeLo
th.setResult(changeLog);
SVNLogFilter logFilter = scm.isFilterChangelog() ? scm.createSVNLogFilter() : new NullSVNLogFilter();
DirAwareSVNXMLLogHandler logHandler = new DirAwareSVNXMLLogHandler(th, logFilter);
// work around for http://lib.svnkit.com/tracker/view.php?id=175
// work around for http://svnkit.com/tracker/view.php?id=175
th.setDocumentLocator(DUMMY_LOCATOR);
logHandler.startDocument();

@@ -4,7 +4,7 @@
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://lib.svnkit.com/license.html
* are also available at http://svnkit.com/license.html
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
* ====================================================================
@@ -866,7 +866,7 @@ public boolean requiresWorkspaceForPolling() {
*
* <p>
* Use canonical path to avoid SVNKit/symlink problem as described in
* https://wiki.lib.svnkit.com/SVNKit_FAQ
* https://wiki.svnkit.com/SVNKit_FAQ
*
* @return null
* if the operation failed. Otherwise the set of local workspace paths
@@ -2232,10 +2232,10 @@ public void postCredential(String url, final UserProvidedCredential upc, PrintWr

try {
// the way it works with SVNKit is that
// 1) lib.svnkit calls AuthenticationManager asking for a credential.
// 1) svnkit calls AuthenticationManager asking for a credential.
// this is when we can see the 'realm', which identifies the user domain.
// 2) DefaultSVNAuthenticationManager returns the username and password we set below
// 3) if the authentication is successful, lib.svnkit calls back acknowledgeAuthentication
// 3) if the authentication is successful, svnkit calls back acknowledgeAuthentication
// (so we store the password info here)
repository = SVNRepositoryFactory.create(SVNURL.parseURIDecoded(url));
repository.setTunnelProvider( createDefaultSVNOptions() );
@@ -2591,13 +2591,13 @@ public static void init() {}

// disable the connection pooling, which causes problems like
// http://www.nabble.com/SSH-connection-problems-p12028339.html
if(System.getProperty("lib.svnkit.ssh2.persistent")==null)
System.setProperty("lib.svnkit.ssh2.persistent","false");
if(System.getProperty("svnkit.ssh2.persistent")==null)
System.setProperty("svnkit.ssh2.persistent","false");

// push Negotiate to the end because it requires a valid Kerberos configuration.
// see HUDSON-8153
if(System.getProperty("lib.svnkit.http.methods")==null)
System.setProperty("lib.svnkit.http.methods","Digest,Basic,NTLM,Negotiate");
if(System.getProperty("svnkit.http.methods")==null)
System.setProperty("svnkit.http.methods","Digest,Basic,NTLM,Negotiate");

// use SVN1.4 compatible workspace by default.
SVNAdminAreaFactory.setSelector(new SubversionWorkspaceSelector());
@@ -178,7 +178,7 @@ public AuthenticationManagerImpl(TaskListener listener) {
public SVNAuthentication getFirstAuthentication(String kind, String realm, SVNURL url) throws SVNException {
authenticationAttempted = true;
if (kind.equals(ISVNAuthenticationManager.USERNAME))
// when using svn+ssh, lib.svnkit first asks for ISVNAuthenticationManager.SSH
// when using svn+ssh, svnkit first asks for ISVNAuthenticationManager.SSH
// authentication to connect via SSH, then calls this method one more time
// to get the user name. Perhaps svn takes user name on its own, separate
// from OS user name? In any case, we need to return the same user name.
@@ -217,7 +217,7 @@ private SVNInfo parseSvnInfo(File workspace) throws SVNException {

/**
* Retrieve nested SVNException.
* lib.svnkit use to hide the root cause within nested {@link SVNException}. Also, SVNException cause in many cases
* svnkit use to hide the root cause within nested {@link SVNException}. Also, SVNException cause in many cases
* is a {@link SVNErrorMessage}, that itself has a lower level SVNException as cause, and so on.
*/
private SVNException getNestedSVNException(Throwable e) {
@@ -783,7 +783,7 @@ private static String readFileAsString(File file)
@Bug(3904)
public void testSymbolicLinkCheckout() throws Exception {
// Only perform if symlink behavior is enabled
if (!"true".equals(System.getProperty("lib.svnkit.symlinks"))) {
if (!"true".equals(System.getProperty("svnkit.symlinks"))) {
return;
}

0 comments on commit 2e6f294

Please sign in to comment.
You can’t perform that action at this time.