,R extends Abs listener.getLogger().println(node instanceof Hudson ? Messages.AbstractBuild_BuildingOnMaster() : Messages.AbstractBuild_BuildingRemotely(builtOn)); node.getFileSystemProvisioner().prepareWorkspace(AbstractBuild.this,project.getWorkspace(),listener); - int retryCount = getProject().getRetryCount(); + int retryCount = getProject().getScmCheckoutRetryCount(); listener.error("Retry Count.........."+retryCount); boolean checkoutStatus = true; while (retryCount > 0) { diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 50ad1e5217d7782464960e13c755d5aa3f335009..4a96fd5234a9cee7b2dad8c499c3eda5d4127aa1 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -34,9 +34,7 @@ import hudson.model.Cause.RemoteCause; import hudson.model.Descriptor.FormException; import hudson.model.Fingerprint.RangeSet; import hudson.model.RunMap.Constructor; -import hudson.model.listeners.RunListener; import hudson.model.Queue.WaitingItem; -import hudson.remoting.AsyncFutureImpl; import hudson.scm.ChangeLogSet; import hudson.scm.ChangeLogSet.Entry; import hudson.scm.NullSCM; @@ -114,9 +112,9 @@ public abstract class AbstractProject
,R extends A private volatile Integer quietPeriod = null; /** - * The Retry Count. Null to delegate to the system default. + * The retry count. Null to delegate to the system default. */ - private volatile Integer retryCount = null; + private volatile Integer scmCheckoutRetryCount = null; /** * If this project is configured to be only built on a certain label, @@ -309,8 +307,8 @@ public abstract class AbstractProject
,R extends A return quietPeriod!=null ? quietPeriod : Hudson.getInstance().getQuietPeriod(); } - public int getRetryCount() { - return retryCount!=null ? retryCount : Hudson.getInstance().getRetryCount(); + public int getScmCheckoutRetryCount() { + return scmCheckoutRetryCount !=null ? scmCheckoutRetryCount : Hudson.getInstance().getScmCheckoutRetryCount(); } // ugly name because of EL @@ -318,8 +316,8 @@ public abstract class AbstractProject
,R extends A return quietPeriod!=null; } - public boolean getHasCustomRetryCount(){ - return retryCount != null; + public boolean hasCustomScmCheckoutRetryCount(){ + return scmCheckoutRetryCount != null; } public final boolean isBuildable() { @@ -1178,10 +1176,10 @@ public abstract class AbstractProject
,R extends A
} else {
quietPeriod = null;
}
- if(req.getParameter("hasCustomRetryCount")!=null) {
- retryCount = Integer.parseInt(req.getParameter("retry_count"));
+ if(req.getParameter("hasCustomScmCheckoutRetryCount")!=null) {
+ scmCheckoutRetryCount = Integer.parseInt(req.getParameter("scmCheckoutRetryCount"));
} else {
- retryCount = null;
+ scmCheckoutRetryCount = null;
}
if(req.getParameter("hasSlaveAffinity")!=null) {
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 5b7d42d291f9844a5b8385ca437312133513a231..9b1a36bee19ef7e2b627701594024213cee0b134 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -78,9 +78,7 @@ import hudson.security.Permission;
import hudson.security.PermissionGroup;
import hudson.security.SecurityMode;
import hudson.security.SecurityRealm;
-import hudson.security.csrf.CrumbFilter;
import hudson.security.csrf.CrumbIssuer;
-import hudson.security.csrf.CrumbIssuerDescriptor;
import hudson.slaves.ComputerListener;
import hudson.slaves.NodeProperty;
import hudson.slaves.NodePropertyDescriptor;
@@ -159,11 +157,8 @@ import java.io.InputStream;
import java.io.Serializable;
import java.io.PrintStream;
import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.security.SecureRandom;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
import java.text.NumberFormat;
import java.text.ParseException;
import java.text.Collator;
@@ -203,7 +198,6 @@ import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.nio.charset.Charset;
import javax.servlet.RequestDispatcher;
-import javax.crypto.spec.SecretKeySpec;
import javax.crypto.SecretKey;
import groovy.lang.GroovyShell;
@@ -368,11 +362,9 @@ public final class Hudson extends Node implements ItemGroup