Merge branch 'master' into renovate/org.glassfish.tyrus.bundles-tyrus-standalone-client-jdk-2.x

Author: krisstern

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

@@ -1250,6 +1250,12 @@ public static View createViewFromXML(String name, InputStream xml) throws IOExce
         }
     }
 
+    // for Jelly
+    @Restricted(DoNotUse.class)
+    public boolean isMyViewsProperty() {
+        return getOwner() instanceof MyViewsProperty;
+    }
+
     public static class PropertyList extends DescribableList<ViewProperty, ViewPropertyDescriptor> {
         private PropertyList(View owner) {
             super(owner);

core/src/main/java/jenkins/model/Jenkins.java

@@ -34,13 +34,15 @@
 import static hudson.init.InitMilestone.JOB_CONFIG_ADAPTED;
 import static hudson.init.InitMilestone.JOB_LOADED;
 import static hudson.init.InitMilestone.PLUGINS_PREPARED;
+import static hudson.init.InitMilestone.SYSTEM_CONFIG_ADAPTED;
 import static hudson.init.InitMilestone.SYSTEM_CONFIG_LOADED;
 import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
 import static java.util.logging.Level.FINE;
 import static java.util.logging.Level.INFO;
 import static java.util.logging.Level.SEVERE;
 import static java.util.logging.Level.WARNING;
+import static jenkins.model.Messages.Hudson_Computer_IncorrectNumberOfExecutors;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.inject.Inject;
@@ -3497,7 +3499,7 @@ public void run(Reactor session) throws Exception {
 
         List<Handle> loadJobs = new ArrayList<>();
         for (final File subdir : subdirs) {
-            loadJobs.add(g.requires(loadJenkins).attains(JOB_LOADED).notFatal().add("Loading item " + subdir.getName(), new Executable() {
+            loadJobs.add(g.requires(loadJenkins).requires(SYSTEM_CONFIG_ADAPTED).attains(JOB_LOADED).notFatal().add("Loading item " + subdir.getName(), new Executable() {
                 @Override
                 public void run(Reactor session) throws Exception {
                     if (!Items.getConfigFile(subdir).exists()) {
@@ -4100,28 +4102,6 @@ private boolean configureDescriptor(StaplerRequest2 req, JSONObject json, Descri
         return d.configure(req, js);
     }
 
-    /**
-     * Accepts submission from the node configuration page.
-     */
-    @POST
-    public synchronized void doConfigExecutorsSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
-        checkPermission(ADMINISTER);
-
-        try (BulkChange bc = new BulkChange(this)) {
-            JSONObject json = req.getSubmittedForm();
-
-            ExtensionList.lookupSingleton(MasterBuildConfiguration.class).configure(req, json);
-
-            getNodeProperties().rebuild(req, json.optJSONObject("nodeProperties"), NodeProperty.all());
-
-            bc.commit();
-        }
-
-        updateComputers(this);
-
-        FormApply.success(req.getContextPath() + '/' + toComputer().getUrl()).generateResponse(req, rsp, null);
-    }
-
     /**
      * Accepts the new description.
      */
@@ -5508,7 +5488,44 @@ public HttpResponse doDoDelete() throws IOException {
         @Override
         @POST
         public void doConfigSubmit(StaplerRequest2 req, StaplerResponse2 rsp) throws IOException, ServletException, FormException {
-            Jenkins.get().doConfigExecutorsSubmit(req, rsp);
+            checkPermission(ADMINISTER);
+
+            Jenkins jenkins = Jenkins.get();
+
+            try (BulkChange bc = new BulkChange(jenkins)) {
+                JSONObject json = req.getSubmittedForm();
+
+                try {
+                    // For compatibility reasons, this value is stored in Jenkins
+                    String num = json.getString("numExecutors");
+                    if (!num.matches("\\d+")) {
+                        throw new Descriptor.FormException(Hudson_Computer_IncorrectNumberOfExecutors(), "numExecutors");
+                    }
+
+                    jenkins.setNumExecutors(json.getInt("numExecutors"));
+                    if (req.hasParameter("builtin.mode")) {
+                        jenkins.setMode(Mode.valueOf(req.getParameter("builtin.mode")));
+                    } else {
+                        jenkins.setMode(Mode.NORMAL);
+                    }
+
+                    jenkins.setLabelString(json.optString("labelString", ""));
+                } catch (IOException e) {
+                    throw new Descriptor.FormException(e, "numExecutors");
+                }
+
+                jenkins.getNodeProperties().rebuild(req, json.optJSONObject("nodeProperties"), NodeProperty.all());
+
+                bc.commit();
+            }
+
+            jenkins.updateComputers(jenkins);
+
+            Computer computer = jenkins.toComputer();
+            if (computer == null) {
+                throw new IllegalStateException("Cannot find the computer object for the controller node");
+            }
+            FormApply.success(req.getContextPath() + '/' + computer.getUrl()).generateResponse(req, rsp, null);
         }
 
         @WebMethod(name = "config.xml")

core/src/main/java/jenkins/model/MasterBuildConfiguration.java

@@ -16,7 +16,7 @@
 
             <j:if test="${!newDashboardPage}">
               <j:choose>
-                <j:when test="${it.owner.class == hudson.model.MyViewsProperty.class}">
+                <j:when test="${it.isMyViewsProperty()}">
                   <st:include it="${it.owner.viewsTabBar}" page="viewTabs" />
                 </j:when>
                 <j:otherwise>
@@ -41,7 +41,7 @@
 
             <j:if test="${!newDashboardPage}">
               <j:choose>
-                <j:when test="${it.owner.class == hudson.model.MyViewsProperty.class}">
+                <j:when test="${it.isMyViewsProperty()}">
                   <st:include it="${it.owner.viewsTabBar}" page="viewTabs" />
                 </j:when>
                 <j:otherwise>

core/src/main/resources/hudson/model/View/main.jelly

@@ -51,6 +51,12 @@ THE SOFTWARE.
                     codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
       </f:entry>
 
+      <!-- TODO remove after January 2026 LTS line -->
+      <div class="jenkins-alert jenkins-alert-info">
+        <l:icon src="symbol-computer" class="icon-sm jenkins-!-margin-right-1" />
+        ${%nodeHasBeenMoved(rootURL + '/manage/computer/(built-in)/configure')}
+      </div>
+
       <!-- global configuration from everyone -->
       <j:set var="editable" value="${h.getSortedDescriptorsForGlobalConfigUnclassified()}"/>
       <j:forEach var="descriptor" items="${h.getSortedDescriptorsForGlobalConfigUnclassifiedReadable()}">

core/src/main/resources/jenkins/model/Jenkins/configure.jelly

@@ -1 +1 @@
-LOADING=Loading
+nodeHasBeenMoved=Built-In Node is now configured in <a href="{0}">Nodes</a>.