Migrate from EE 8 to EE 9 in Jelly and Groovy views (jenkinsci#10443)

Author: krisstern

core/src/main/resources/hudson/cli/CLIAction/example.jelly

@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <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">
-  <j:set var="content">java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request)} <j:if test="${!it.webSocketSupported}">-http </j:if>${commandArgs}</j:set>
+  <j:set var="content">java -jar jenkins-cli.jar -s ${h.inferHudsonURL(request2)} <j:if test="${!it.webSocketSupported}">-http </j:if>${commandArgs}</j:set>
   <div class="jenkins-quote jenkins-quote--monospace" id="example">
     ${content}
     <l:copyButton text="${content}" iconOnly="true" />

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

@@ -30,7 +30,7 @@ THE SOFTWARE.
   <l:header />
   <l:side-panel>
     <l:tasks>
-      <j:set var="buildUrl" value="${h.decompose(request)}" />
+      <j:set var="buildUrl" value="${h.decompose(request2)}" />
       <st:include page="tasks.jelly"/>
       <st:include page="delete.jelly" />
       <st:include page="actions.jelly" />

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

@@ -36,7 +36,7 @@ THE SOFTWARE.
   </l:header>
   <l:side-panel>
     <l:tasks>
-      <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
+      <j:set var="url" value="${h.getNearestAncestorUrl(request2,it)}"/>
       <l:task contextMenu="false" href="${url}/" icon="symbol-details" title="${%Status}"/>
       <l:task href="${url}/changes" icon="symbol-changes" title="${%Changes}"/>
       <l:task icon="symbol-folder"  href="${url}/ws/" title="${%Workspace}" permission="${it.WORKSPACE}">

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

@@ -30,7 +30,7 @@ THE SOFTWARE.
   <l:header />
   <l:side-panel>
     <l:tasks>
-      <l:task href="${h.getNearestAncestorUrl(request,it)}/" icon="symbol-computer"
+      <l:task href="${h.getNearestAncestorUrl(request2,it)}/" icon="symbol-computer"
               title="${%Nodes}"/>
       <l:task href="../cloud/" icon="symbol-cloud" permission="${app.SYSTEM_READ}"
               title="${app.hasPermission(app.ADMINISTER) ? '%Clouds' : '%View Clouds'}"/>

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

@@ -30,7 +30,7 @@ THE SOFTWARE.
   <l:header title="Label ${it.displayName}" />
   <l:side-panel>
     <l:tasks>
-      <j:set var="url" value="${h.getNearestAncestorUrl(request,it)}"/>
+      <j:set var="url" value="${h.getNearestAncestorUrl(request2,it)}"/>
       <l:task contextMenu="false" href="${url}" icon="symbol-tag" title="${%Overview}"/>
       <j:if test="${it.atom}">
         <l:task href="${url}/configure" icon="symbol-settings" title="${%Configure}" permission="${app.ADMINISTER}" />

core/src/main/resources/hudson/search/Search/search-failed.jelly

@@ -32,7 +32,7 @@ THE SOFTWARE.
   <l:layout title="${%Search for} '${q}'">
     <l:main-panel>
       <h1>${%Search for} '${q}'</h1>
-      <j:set var="items" value="${it.getSuggestions(request,q)}"/>
+      <j:set var="items" value="${it.getSuggestions(request2,q)}"/>
       <j:choose>
         <j:when test="${items.size()==0}">
           <div class='error'>

core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/signup.jelly

@@ -165,7 +165,7 @@ THE SOFTWARE.
               <div class="app-sign-in-register__switcher">
                 <a href="${rootURL}/login">${%or sign in}</a>
               </div>
-              <input type="hidden" name="${h.getCrumbRequestField()}" value="${h.getCrumb(request)}"/>
+              <input type="hidden" name="${h.getCrumbRequestField()}" value="${h.getCrumb(request2)}"/>
               <div class="footer">
                 <j:forEach var="decorator" items="${simpleDecorators}">
                   <st:include it="${decorator}" page="simple-footer.jelly" optional="true"/>

core/src/main/resources/hudson/slaves/JNLPLauncher/main.jelly

@@ -26,7 +26,7 @@ THE SOFTWARE.
 <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">
   <j:choose>
     <j:when test="${it.offline and !it.temporarilyOffline}">
-      <j:set var="jenkinsURL" value="${h.inferHudsonURL(request)}"/>
+      <j:set var="jenkinsURL" value="${h.inferHudsonURL(request2)}"/>
       <j:set var="copy_agent_jar_unix" value="curl -sO ${jenkinsURL}jnlpJars/agent.jar" />
       <j:set var="copy_agent_jar_windows" value="curl.exe -sO ${jenkinsURL}jnlpJars/agent.jar" />
       <j:set var="copy_java_cmd_unix" value="java -jar agent.jar -url ${jenkinsURL} ${it.launcher.getRemotingOptionsUnix(it)}${it.launcher.getWorkDirOptions(it)}" />

core/src/main/resources/jenkins/agents/CloudSet/index.jelly

@@ -66,11 +66,11 @@ THE SOFTWARE.
                     </td>
                     <td>
                       <input type="hidden" name="name" value="${cloud.name}" />
-                      <a href="${it.getCloudUrl(request,app,cloud)}" class="jenkins-table__link model-link inside">${cloud.name}</a>
+                      <a href="${it.getCloudUrl(request2,app,cloud)}" class="jenkins-table__link model-link inside">${cloud.name}</a>
                     </td>
                     <td class="jenkins-table__cell--tight">
                       <div class="jenkins-table__cell__button-wrapper">
-                        <a href="${it.getCloudUrl(request,app,cloud)}configure" class="jenkins-button">
+                        <a href="${it.getCloudUrl(request2,app,cloud)}configure" class="jenkins-button">
                           <l:icon src="symbol-settings"/>
                         </a>
                       </div>

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

@@ -53,7 +53,7 @@ THE SOFTWARE.
                 </h1>
                 <div style="text-align: center">
                     <h2>${%title(jakarta.servlet.error.message?:'Not Found')}</h2>
-                    <a href="${h.inferHudsonURL(request)}">${%Back to Jenkins}</a>
+                    <a href="${h.inferHudsonURL(request2)}">${%Back to Jenkins}</a>
                 </div>
             </body>
         </html>

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

@@ -30,7 +30,7 @@ THE SOFTWARE.
     <st:setHeader name="Cache-Control" value="no-cache,no-store,must-revalidate" />
     <!-- needed for cli -->
     <j:if test="${request2.servletPath=='/' || request2.servletPath==''}">
-      ${h.advertiseHeaders(response)}
+      ${h.advertiseHeaders(response2)}
       <j:forEach var="pd" items="${h.pageDecorators}">
         <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
       </j:forEach>

core/src/main/resources/jenkins/model/Jenkins/opensearch.xml.jelly

@@ -29,7 +29,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
   <l:view contentType="application/xml;charset=UTF-8">
   <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <j:set var="rootURL" value="${h.inferHudsonURL(request)}"/>
+  <j:set var="rootURL" value="${h.inferHudsonURL(request2)}"/>
   <ShortName>Jenkins</ShortName>
   <Description>Jenkins at ${rootURL}</Description>
   <InputEncoding>UTF-8</InputEncoding>

core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config.groovy

@@ -6,7 +6,7 @@ def f=namespace(lib.FormTagLib)
 
 f.section(title:_("Jenkins Location")) {
     f.entry(title:_("Jenkins URL"), field:"url") {
-        f.textbox(default: Functions.inferHudsonURL(request))
+        f.textbox(default: Functions.inferHudsonURL(request2))
     }
     f.entry(title:_("System Admin e-mail address"), field:"adminAddress") {
         f.textbox()

core/src/main/resources/lib/hudson/setIconSize.jelly

@@ -27,7 +27,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:x="jelly:xml" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <j:set scope="parent" var="iconSize" value="${h.validateIconSize(h.getCookie(request,'iconSize','32x32'))}" />
+  <j:set scope="parent" var="iconSize" value="${h.validateIconSize(h.getCookie(request2,'iconSize','32x32'))}" />
   <j:set scope="parent" var="iconSizeClass" value="${icons.toNormalizedIconSizeClass(iconSize)}" />
   <!--
     balls look smaller than their actual size,

core/src/main/resources/lib/layout/layout.jelly

@@ -93,7 +93,7 @@ THE SOFTWARE.
 <j:set var="_" value="${request2.getSession()}"/>
 <j:set var="extensionsAvailable" value="${h.extensionsAvailable}"/>
 <j:if test="${request2.servletPath=='/' || request2.servletPath==''}">
-  ${h.advertiseHeaders(response)}
+  ${h.advertiseHeaders(response2)}
   <j:if test="${extensionsAvailable}">
     <j:forEach var="pd" items="${h.pageDecorators}">
       <st:include it="${pd}" page="httpHeaders.jelly" optional="true"/>
@@ -104,7 +104,7 @@ THE SOFTWARE.
 <html>
   <head data-rooturl="${rootURL}" data-resurl="${resURL}" data-imagesurl="${imagesURL}" resURL="${resURL}"
         data-extensions-available="${extensionsAvailable}"
-        data-crumb-header="${h.getCrumbRequestField()}" data-crumb-value="${h.getCrumb(request)}"
+        data-crumb-header="${h.getCrumbRequestField()}" data-crumb-value="${h.getCrumb(request2)}"
         data-unit-test="${h.isUnitTest}">
     ${h.checkPermission(it,permission)}
     ${h.checkAnyPermission(it, permissions)}