Merge branch 'master' into views_include_jobs_folder

Conflicts:
	changelog.html

changelog.html

@@ -57,7 +57,12 @@ Upcoming changes</a>
 <ul class=image>
   <li class=rfe>
 		Views can now include jobs located within folders
-  <li class=>
+  <li class=rfe>
+    Different text than “Build Now”  for parameterized jobs.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10738">issue 10738</a>)
+  <li class=bug>
+    “Build Now” context menu item broken for parameterized jobs.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17110">issue 17110</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 
@@ -74,9 +79,6 @@ Upcoming changes</a>
   <li class=rfe>
     Better display of parameters in queue items.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17454">issue 17454</a>)
-  <li class='bug'>
-    "projects tied to slave" shows unrelated maven module jobs
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17451">issue 17451</a>)
   <li class='bug'>
     sort order of plugin list is not working by default.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17039">issue 17039</a>)

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

@@ -448,7 +448,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
      * @since 1.401
      */
     public String getBuildNowText() {
-        return AlternativeUiTextProvider.get(BUILD_NOW_TEXT,this,Messages.AbstractProject_BuildNow());
+        return AlternativeUiTextProvider.get(BUILD_NOW_TEXT, this, isParameterized() ? Messages.AbstractProject_build_with_parameters() : Messages.AbstractProject_BuildNow());
     }
 
     /**

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

@@ -335,13 +335,13 @@ public abstract class Label extends Actionable implements Comparable<Label>, Mod
     @Exported
     public List<AbstractProject> getTiedJobs() {
         List<AbstractProject> r = new ArrayList<AbstractProject>();
-        for (AbstractProject<?,?> p : Jenkins.getInstance().getItems(AbstractProject.class)) {
+        for (AbstractProject<?,?> p : Jenkins.getInstance().getAllItems(AbstractProject.class)) {
             if(this.equals(p.getAssignedLabel()))
                 r.add(p);
         }
         return r;
     }
-    
+
     public boolean contains(Node node) {
         return getNodes().contains(node);
     }

core/src/main/java/hudson/util/ProcessTree.java

@@ -67,6 +67,7 @@ import java.util.logging.Logger;
 
 import static com.sun.jna.Pointer.NULL;
 import static hudson.util.jna.GNUCLibrary.LIBC;
+import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.FINER;
 import static java.util.logging.Level.FINEST;
 
@@ -424,7 +425,17 @@ public abstract class ProcessTree implements Iterable<OSProcess>, IProcessTree,
 
                     @Override
                     public synchronized EnvVars getEnvironmentVariables() {
-                        if(env==null)   env = new EnvVars(p.getEnvironmentVariables());
+                        if(env !=null)
+                          return env;
+                        env = new EnvVars();   
+                        
+                        try 
+                        {
+                           env.putAll(p.getEnvironmentVariables());
+                        } catch (WinpException e)
+                        {
+                           LOGGER.log(FINE, "Failed to get environment variable ", e);
+                        }                          
                         return env;
                     }
                 });

core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly

@@ -46,7 +46,7 @@ THE SOFTWARE.
       <j:if test="${it.configurable}">
         <j:if test="${it.buildable}">
           <l:task icon="images/24x24/clock.png" href="${url}/build?delay=0sec" title="${it.buildNowText}"
-                  onclick="${it.parameterized?null:'return build(this)'}" post="true" permission="${it.BUILD}"/>
+                  onclick="${it.parameterized?null:'return build(this)'}" post="${!it.parameterized}" permission="${it.BUILD}"/>
           <script>
             function build(a) {
               new Ajax.Request(a.href);

core/src/main/resources/hudson/model/Messages.properties

@@ -37,6 +37,7 @@ AbstractProject.Pronoun=Project
 AbstractProject.Aborted=Aborted
 AbstractProject.BuildInProgress=Build #{0} is already in progress{1}
 AbstractProject.BuildNow=Build Now
+AbstractProject.build_with_parameters=Build with Parameters
 AbstractProject.UpstreamBuildInProgress=Upstream project {0} is already building.
 AbstractProject.DownstreamBuildInProgress=Downstream project {0} is already building.
 AbstractProject.Disabled=Build disabled
@@ -345,4 +346,4 @@ BuildAuthorizationToken.InvalidTokenProvided=Invalid token provided.
 Jenkins.CheckDisplayName.NameNotUniqueWarning=The display name, "{0}", is used as a name by a job and could cause confusing search results.
 Jenkins.CheckDisplayName.DisplayNameNotUniqueWarning=The display name, "{0}", is already in use by another job and could cause confusion and delay.
 
-Jenkins.NotAllowedName="{0}" is not allowed name
\ No newline at end of file
+Jenkins.NotAllowedName="{0}" is not allowed name

core/src/main/resources/hudson/views/BuildButtonColumn/column.jelly

@@ -27,10 +27,19 @@ THE SOFTWARE.
       <td>
           <j:if test="${job.buildable and job.hasPermission(job.BUILD)}">
               <a href="${jobBaseUrl}${job.shortUrl}build?delay=0sec">
-                  <img src="${imagesURL}/${subIconSize}/clock.png"
-                       title="${%Schedule a build}" alt="${%Schedule a build}"
-                       onclick="${job.parameterized ? null : 'return build(this)'}"
-                       border="0"/>
+                  <j:choose>
+                      <j:when test="${job.parameterized}">
+                          <img src="${imagesURL}/${subIconSize}/clock.png"
+                               title="${%Schedule a build with parameters}" alt="${%Schedule a build with parameters}"
+                               border="0"/>
+                      </j:when>
+                      <j:otherwise>
+                          <img src="${imagesURL}/${subIconSize}/clock.png"
+                               title="${%Schedule a build}" alt="${%Schedule a build}"
+                               onclick="return build(this)"
+                               border="0"/>
+                      </j:otherwise>
+                  </j:choose>
               </a>
               <script>
                 function build(img) {