renamed to "SCM checkout retry count" to clarify what it really means

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@19165 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -348,7 +348,6 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke</groupId>
       <artifactId>graph-layouter</artifactId>
-      <classifier>jdk14</classifier>
       <version>1.0</version>
     </dependency>
     <dependency>

core/src/main/java/hudson/model/AbstractBuild.java

@@ -262,7 +262,7 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,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) {

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<P extends AbstractProject<P,R>,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<P extends AbstractProject<P,R>,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<P extends AbstractProject<P,R>,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<P extends AbstractProject<P,R>,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) {

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<TopLevelItem>, Stapl
     /*package*/ Integer quietPeriod;
     
     /**
-     * Retry Count.
-     *
-     * This is {@link Integer} so that we can initialize it to '5' for upgrading users.
+     * Global default for {@link AbstractProject#getScmCheckoutRetryCount()}  
      */
-    /*package*/ Integer retryCount;
+    /*package*/ int scmCheckoutRetryCount;
 
     /**
      * {@link View}s.
@@ -1459,10 +1451,10 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
     }
     
     /**
-     * Gets the system default Retry Count period.
+     * Gets the global SCM check out retry count.
      */
-    public int getRetryCount() {
-        return retryCount !=null ? retryCount : 5;
+    public int getScmCheckoutRetryCount() {
+        return scmCheckoutRetryCount;
     }
     
     
@@ -2237,7 +2229,7 @@ public final class Hudson extends Node implements ItemGroup<TopLevelItem>, Stapl
 
             quietPeriod = Integer.parseInt(req.getParameter("quiet_period"));
             
-            retryCount = Integer.parseInt(req.getParameter("retry_count"));
+            scmCheckoutRetryCount = Integer.parseInt(req.getParameter("retry_count"));
 
             systemMessage = Util.nullify(req.getParameter("system_message"));
 

core/src/main/resources/lib/hudson/project/config-retryCount.jelly

@@ -24,12 +24,10 @@ THE SOFTWARE.
 
 <!-- custom retry count -->
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <f:optionalBlock name="hasCustomRetryCount" title="${%Retry Count}" checked="${it.hasCustomRetryCount}"
-      help="/help/project-config/retryCount.html">
-    <f:entry title="${%Retry Count}"
-      description="${%Number of Retrys needed if checkout fails}">
-      <input class="setting-input" name="retry_count"
-        type="text" value="${it.retryCount}"/>
+  <f:optionalBlock name="hasCustomScmCheckoutRetryCount" title="${%Retry Count}" checked="${it.hasCustomScmCheckoutRetryCount()}"
+      help="/help/project-config/scmCheckoutRetryCount.html">
+    <f:entry title="${%SCM checkout retry count}">
+      <f:textbox name="scmCheckoutRetryCount" value="${it.scmCheckoutRetryCount}"/>
     </f:entry>
   </f:optionalBlock>
 </j:jelly>
\ No newline at end of file

war/resources/help/project-config/retryCount.html

-<div>
-  If a build fail to checkout from the repository , It will retry the specified number of times.  
-</div>
\ No newline at end of file

war/resources/help/project-config/scmCheckoutRetryCount.html

+<div>
+  If a build fails to checkout from the repository, Hudson will retry the specified number of times before
+  giving up.
+</div>
\ No newline at end of file