Used the JavaScript proxy support to lazy load configuration fragments in <l:hetero-list>

core/src/main/java/hudson/Functions.java

@@ -70,6 +70,7 @@ import hudson.scm.SCMDescriptor;
 import hudson.util.Secret;
 import hudson.views.MyViewsTabBar;
 import hudson.views.ViewsTabBar;
+import hudson.widgets.HeteroListConfigPageRenderer;
 import org.acegisecurity.providers.anonymous.AnonymousAuthenticationToken;
 import org.apache.commons.jelly.JellyContext;
 import org.apache.commons.jelly.JellyTagException;
@@ -1303,4 +1304,7 @@ public class Functions {
         return Boolean.getBoolean("hudson.security.ArtifactsPermission");
     }
 
+    public static String createHeteroListConfigPageRendererProxy(Object it) {
+        return Stapler.getCurrentRequest().createJavaScriptProxy(new HeteroListConfigPageRenderer(it));
+    }
 }

core/src/main/java/hudson/widgets/HeteroListConfigPageRenderer.java

+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, CloudBees, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.widgets;
+
+import hudson.model.AbstractProject;
+import hudson.model.Descriptor;
+import hudson.model.Hudson;
+import org.kohsuke.stapler.ForwardToView;
+import org.kohsuke.stapler.HttpResponse;
+import org.kohsuke.stapler.HttpResponses;
+import org.kohsuke.stapler.bind.JavaScriptMethod;
+
+/**
+ * Assists the lazy rendering of the configuration fragments from descriptor,
+ * by remembering the "it" object that points to the overall configured target
+ * (like {@link AbstractProject}).
+ *
+ * <p>
+ * See <tt>hetero-list.jelly</tt>
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.402
+ */
+public class HeteroListConfigPageRenderer {
+    public final Object it;
+
+    public HeteroListConfigPageRenderer(Object it) {
+        this.it = it;
+    }
+
+    /**
+     * Renders a configuration fragment.
+     */
+    @JavaScriptMethod
+    public HttpResponse renderConfigPage(String id) {
+        Descriptor d = Hudson.getInstance().getDescriptor(id);
+        if (d==null)    return HttpResponses.notFound();
+        return new ForwardToView(this,"render.jelly").with("target",it).with("descriptor",d);
+    }
+}

core/src/main/resources/hudson/widgets/HeteroListConfigPageRenderer/render.jelly

+<!--
+The MIT License
+
+Copyright (c) 2011, CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+-->
+
+<!--
+  Render build histories.
+-->
+<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" xmlns:i="jelly:fmt">
+  <l:ajax>
+    <!-- 'it' gets overridden when we call Jelly, so pass the real 'it' as 'target' -->
+    <j:set var="it" value="${target}" />
+    <st:include page="${descriptor.configPage}" from="${descriptor}" optional="true"/>
+  </l:ajax>
+</j:jelly>

core/src/main/resources/lib/form/hetero-list.jelly

@@ -74,10 +74,9 @@ THE SOFTWARE.
             <f:helpArea />
           </j:if>
         </j:if>
-        <!-- optional added to keep from breaking page rendering when
-        a descriptor doesn't have a config.jelly. -->
-        <st:include from="${descriptor}"
-                    page="${descriptor.configPage}" optional="true" />
+
+        <d:invokeBody/>
+
         <f:block>
           <div align="right">
             <input type="hidden" name="stapler-class" value="${descriptor.clazz.name}" />
@@ -96,17 +95,23 @@ THE SOFTWARE.
       <j:set var="descriptor" value="${i.descriptor}" />
       <j:set var="instance" value="${i}" />
       <div name="${attrs.name}" class="repeated-chunk">
-        <local:body deleteCaption="${attrs.deleteCaption}" />
+        <local:body deleteCaption="${attrs.deleteCaption}">
+          <st:include from="${descriptor}" page="${descriptor.configPage}" optional="true" />
+        </local:body>
       </div>
     </j:forEach>
 
     <div class="repeatable-insertion-point" />
-    <div class="prototypes to-be-removed">
+
+    <div class="prototypes to-be-removed" proxy="${h.createHeteroListConfigPageRendererProxy(it)}">
       <!-- render one prototype for each type -->
       <j:set var="instance" value="${null}" />
       <j:forEach var="descriptor" items="${attrs.descriptors}" varStatus="loop">
-        <div name="${attrs.name}" title="${descriptor.displayName}" tooltip="${descriptor.tooltip}">
-          <local:body deleteCaption="${attrs.deleteCaption}" />
+        <div name="${attrs.name}" title="${descriptor.displayName}" tooltip="${descriptor.tooltip}" descriptorId="${descriptor.id}">
+          <local:body deleteCaption="${attrs.deleteCaption}">
+            <!-- marker for JavaScript to insert the actual fragment -->
+            <tr class="config-page"/>
+          </local:body>
         </div>
       </j:forEach>
     </div>

war/src/main/webapp/scripts/hudson-behavior.js

@@ -443,13 +443,16 @@ var hudsonRules = {
             prototypes = prototypes.previousSibling;
         var insertionPoint = prototypes.previousSibling;    // this is where the new item is inserted.
 
+        var proxy = eval(prototypes.getAttribute("proxy")); // JavaScript proxy to HeteroListConfigPageRenderer
+
         // extract templates
         var templates = []; var i=0;
         for(var n=prototypes.firstChild;n!=null;n=n.nextSibling,i++) {
             var name = n.getAttribute("name");
             var tooltip = n.getAttribute("tooltip");
+            var descriptorId = n.getAttribute("descriptorId");
             menu.options[i] = new Option(n.getAttribute("title"),""+i);
-            templates.push({html:n.innerHTML, name:name, tooltip:tooltip});
+            templates.push({html:n.innerHTML, name:name, tooltip:tooltip,descriptorId:descriptorId});
         }
         Element.remove(prototypes);
 
@@ -463,11 +466,16 @@ var hudsonRules = {
             nc.className = "repeated-chunk";
             nc.setAttribute("name",t.name);
             nc.innerHTML = t.html;
-            insertionPoint.parentNode.insertBefore(nc, insertionPoint);
-            if(withDragDrop)    prepareDD(nc);
 
-            hudsonRules['DIV.repeated-chunk'](nc);  // applySubtree doesn't get nc itself
-            Behaviour.applySubtree(nc);
+            proxy.renderConfigPage(t.descriptorId, function (t) {
+                Element.replace(findElementsBySelector(nc,"TR.config-page")[0],t.responseText);
+                
+                insertionPoint.parentNode.insertBefore(nc, insertionPoint);
+                if(withDragDrop)    prepareDD(nc);
+
+                hudsonRules['DIV.repeated-chunk'](nc);  // applySubtree doesn't get nc itself
+                Behaviour.applySubtree(nc);
+            });
         });
 
         menuButton.getMenu().renderEvent.subscribe(function(type,args,value) {
@@ -2124,3 +2132,4 @@ function createComboBox(idOrField,valueFunction) {
 Ajax.Request.prototype.dispatchException = function(e) {
     throw e;
 }
+