提交 55b4cfcc 编写于 作者: K kohsuke

workspace selector needs to be installed on all slaves.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11210 71c3de6d-444a-0410-be80-ed276b4c234a
上级 1d159fa0
...@@ -30,6 +30,7 @@ import hudson.scm.SCM; ...@@ -30,6 +30,7 @@ import hudson.scm.SCM;
import hudson.scm.SCMDescriptor; import hudson.scm.SCMDescriptor;
import hudson.scm.SCMS; import hudson.scm.SCMS;
import hudson.scm.SubversionWorkspaceSelector; import hudson.scm.SubversionWorkspaceSelector;
import hudson.scm.SubversionSCM;
import hudson.search.CollectionSearchIndex; import hudson.search.CollectionSearchIndex;
import hudson.search.SearchIndexBuilder; import hudson.search.SearchIndexBuilder;
import hudson.security.ACL; import hudson.security.ACL;
...@@ -345,8 +346,8 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node, ...@@ -345,8 +346,8 @@ public final class Hudson extends View implements ItemGroup<TopLevelItem>, Node,
LOGGER.log(Level.SEVERE, "Failed to load proxy configuration", e); LOGGER.log(Level.SEVERE, "Failed to load proxy configuration", e);
} }
// do this before we load plugins so that plugins can change the selector. // run the init code of SubversionSCM before we load plugins so that plugins can change SubversionWorkspaceSelector.
SVNAdminAreaFactory.setSelector(new SubversionWorkspaceSelector()); SubversionSCM.DescriptorImpl.DESCRIPTOR.getDisplayName();
// load plugins. // load plugins.
pluginManager = new PluginManager(context); pluginManager = new PluginManager(context);
......
...@@ -54,6 +54,7 @@ import org.tmatesoft.svn.core.internal.util.SVNPathUtil; ...@@ -54,6 +54,7 @@ import org.tmatesoft.svn.core.internal.util.SVNPathUtil;
import org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager; import org.tmatesoft.svn.core.internal.wc.DefaultSVNAuthenticationManager;
import org.tmatesoft.svn.core.internal.wc.SVNErrorManager; import org.tmatesoft.svn.core.internal.wc.SVNErrorManager;
import org.tmatesoft.svn.core.internal.wc.SVNExternal; import org.tmatesoft.svn.core.internal.wc.SVNExternal;
import org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaFactory;
import org.tmatesoft.svn.core.io.SVNRepository; import org.tmatesoft.svn.core.io.SVNRepository;
import org.tmatesoft.svn.core.io.SVNRepositoryFactory; import org.tmatesoft.svn.core.io.SVNRepositoryFactory;
import org.tmatesoft.svn.core.wc.SVNClientManager; import org.tmatesoft.svn.core.wc.SVNClientManager;
...@@ -1397,6 +1398,9 @@ public class SubversionSCM extends SCM implements Serializable { ...@@ -1397,6 +1398,9 @@ public class SubversionSCM extends SCM implements Serializable {
// http://www.nabble.com/SSH-connection-problems-p12028339.html // http://www.nabble.com/SSH-connection-problems-p12028339.html
if(System.getProperty("svnkit.ssh2.persistent")==null) if(System.getProperty("svnkit.ssh2.persistent")==null)
System.setProperty("svnkit.ssh2.persistent","false"); System.setProperty("svnkit.ssh2.persistent","false");
// use SVN1.4 compatible workspace by default.
SVNAdminAreaFactory.setSelector(new SubversionWorkspaceSelector());
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册