Merged revisions 34598 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r34598 | kohsuke | 2010-09-09 22:00:37 +0200 (Thu, 09 Sep 2010) | 2 lines
  
  [FIXED HUDSON-7281]
  A matrix build configuration page with multiple nodes/labels was broken since 1.373.
........


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

core/src/main/resources/hudson/matrix/MatrixProject/configure-entries.jelly

@@ -48,39 +48,6 @@ THE SOFTWARE.
                      addCaption="${%Add axis}"/>
     </f:block>
 
-    <!-- master slave -->
-    <j:if test="${!empty(app.slaves)}">
-      <j:set var="labels" value="${it.labels}" />
-      <f:optionalBlock name="multipleNodes" title="${%Build on multiple nodes}" checked="${!empty(labels)}"
-          help="/help/matrix/label.html">
-        <f:entry title="${%Node}">
-          <div id="nodeTree" class="yahooTree" style="border: 1px solid gray; height: 10em; overflow:auto;"></div>
-          <script src="${rootURL}/scripts/yui/treeview/treeview-${yuiSuffix}.js"></script>
-          <link rel="stylesheet" href="${rootURL}/scripts/yui/treeview/assets/skins/sam/treeview.css" type="text/css" />
-          <script>
-            (function(){
-              var tree = new YAHOO.widget.TreeView("nodeTree");
-
-              var machines = new YAHOO.widget.TextNode("${%Individual nodes}", tree.getRoot(), false);
-              var labels = new YAHOO.widget.TextNode("${%Labels}", tree.getRoot(), false);
-
-              <j:forEach var="l" items="${app.labels}">
-                new YAHOO.widget.TextNode('&lt;input type="checkbox" name="label.${l.name}" id="label.${l.name}" <j:if test="${labels.contains(l)}">checked</j:if>&gt;<label for="label.${l.name}">${h.jsStringEscape(l.name)} (${h.jsStringEscape(l.description)})</label>', ${l.isSelfLabel()?'machines':'labels'}, false);
-              </j:forEach>
-
-              tree.draw();
-              <!--
-                force the rendering of HTML, so that input fields are there
-                even when the form is submitted without this tree expanded.
-               -->
-              tree.expandAll();
-              tree.collapseAll();
-            })();
-          </script>
-        </f:entry>
-      </f:optionalBlock>
-    </j:if>
-
     <f:optionalBlock field="runSequentially" title="${%Run each configuration sequentially}"/>
 
     <f:optionalBlock name="hasCombinationFilter" title="${%Combination Filter}" checked="${!empty(it.combinationFilter)}"

test/pom.xml

@@ -94,7 +94,6 @@ THE SOFTWARE.
             <id>test-in-groovy</id>
             <!-- allow tests written in Groovy -->
             <goals>
-              <goal>generateTestStubs</goal>
               <goal>testCompile</goal>
             </goals>
           </execution>