diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index afbdd02846..fc12d0c25d 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -439,6 +439,14 @@ public abstract class AbstractBuild

,R extends Abs return Executor.currentExecutor().getOwner().getNode(); } + public Launcher getLauncher() { + return launcher; + } + + public BuildListener getListener() { + return listener; + } + /** * Allocates the workspace from {@link WorkspaceList}. * @@ -482,8 +490,8 @@ public abstract class AbstractBuild

,R extends Abs wl.beforeUse(AbstractBuild.this, lease.path, listener); } - getProject().getSCMCheckoutStrategy().preCheckout(AbstractBuild.this, launcher, this.listener); - getProject().getSCMCheckoutStrategy().checkout(this); + getProject().getScmCheckoutStrategy().preCheckout(AbstractBuild.this, launcher, this.listener); + getProject().getScmCheckoutStrategy().checkout(this); if (!preBuild(listener,project.getProperties())) return Result.FAILURE; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 64247047ab..d244743442 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -531,11 +531,11 @@ public abstract class AbstractProject

,R extends A return quietPeriod!=null ? quietPeriod : Jenkins.getInstance().getQuietPeriod(); } - public SCMCheckoutStrategy getSCMCheckoutStrategy() { + public SCMCheckoutStrategy getScmCheckoutStrategy() { return scmCheckoutStrategy == null ? new DefaultSCMCheckoutStrategyImpl() : scmCheckoutStrategy; } - public void setSCMCheckoutStrategy(SCMCheckoutStrategy scmCheckoutStrategy) throws IOException { + public void setScmCheckoutStrategy(SCMCheckoutStrategy scmCheckoutStrategy) throws IOException { this.scmCheckoutStrategy = scmCheckoutStrategy; save(); } @@ -1988,9 +1988,8 @@ public abstract class AbstractProject

,R extends A return c; } - public List getApplicableSCMCheckoutStrategyDescriptors(@AncestorInPath AbstractProject p) { + public List getApplicableSCMCheckoutStrategyDescriptors(AbstractProject p) { return SCMCheckoutStrategyDescriptor._for(p); - } /** diff --git a/core/src/main/resources/lib/hudson/project/config-scm.jelly b/core/src/main/resources/lib/hudson/project/config-scm.jelly index d47a4f0ccd..6874bb2dfb 100644 --- a/core/src/main/resources/lib/hudson/project/config-scm.jelly +++ b/core/src/main/resources/lib/hudson/project/config-scm.jelly @@ -38,7 +38,7 @@ THE SOFTWARE. - +