Merge pull request #356 from basil/jakarta2

Migrate from EE 8 to EE 9 in Jelly views
jenkinsci · Feb 5, 2025 · a65bccb · a65bccb
2 parents 1685493 + ab3de35
commit a65bccb
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 21 deletions.
diff --git a/.../resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/configOutput.jelly b/.../resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/configOutput.jelly
@@ -4,7 +4,7 @@
 <?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <j:choose>
-    <j:when test="${request.getParameter('type').equals('xml')}">
+    <j:when test="${request2.getParameter('type').equals('xml')}">
       <st:contentType value="text/xml;charset=UTF-8" /><j:out value="${it.getFile()}"/>
     </j:when>
     <j:otherwise>

diff --git a/...sources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/restoreQuestion.jelly b/...sources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/restoreQuestion.jelly
@@ -6,7 +6,7 @@
 
     <st:include it="${it.agent.toComputer()}" page="sidepanel.jelly" />
     <l:main-panel>
-      <j:set var="timestamp" value="${request.getParameter('timestamp')}" />
+      <j:set var="timestamp" value="${request2.getParameter('timestamp')}" />
 
 
       <div style="text-align:center">

diff --git a/...resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles.jelly b/...resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles.jelly
@@ -82,7 +82,7 @@
                               ${%Older Change}
                             </td>
                             <td style="width:40%; border:none; text-align:right; padding:0px">
-                              <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request.getParameter('timestamp1')}" style="text-decoration:none">
+                              <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request2.getParameter('timestamp1')}" style="text-decoration:none">
                                 ${%Restore this configuration}
                               </a>
                             </td>
@@ -112,7 +112,7 @@
                               ${%Newer Change}
                             </td>
                             <td style="width:40%; border:none; text-align:right; padding:0px">
-                              <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request.getParameter('timestamp2')}" style="text-decoration:none">
+                              <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request2.getParameter('timestamp2')}" style="text-decoration:none">
                                 ${%Restore this configuration}
                               </a>
                             </td>

diff --git a/...esources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/configOutput.jelly b/...esources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/configOutput.jelly
@@ -4,7 +4,7 @@
 <?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <j:choose>
-    <j:when test="${request.getParameter('type').equals('xml')}">
+    <j:when test="${request2.getParameter('type').equals('xml')}">
       <st:contentType value="text/xml;charset=UTF-8" /><j:out value="${it.getFile()}"/>
     </j:when>
     <j:otherwise>

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/index.jelly
@@ -10,8 +10,8 @@
       <div>
         <st:adjunct includes="hudson.plugins.jobConfigHistory.deleteRevisionAndTableEntry" />
         <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />
-        <j:set var="pageNum" value="${request.getParameter('pageNum')}" />
-        <j:set var="entriesPerPage" value="${request.getParameter('entriesPerPage')}" />
+        <j:set var="pageNum" value="${request2.getParameter('pageNum')}" />
+        <j:set var="entriesPerPage" value="${request2.getParameter('entriesPerPage')}" />
         <j:set var="totalEntriesNumber" value="${it.getRevisionAmount()}" />
         <j:if test="${pageNum == null or pageNum.equals(&quot;&quot;)}">
           <j:set var="pageNum" value="0" />

diff --git a/...urces/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/restoreQuestion.jelly b/...urces/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/restoreQuestion.jelly
@@ -6,7 +6,7 @@
 
     <st:include it="${it.project}" page="sidepanel.jelly" />
     <l:main-panel>
-      <j:set var="timestamp" value="${request.getParameter('timestamp')}" />
+      <j:set var="timestamp" value="${request2.getParameter('timestamp')}" />
 
       <div style="text-align:center">
         <div class="jch-warning">

diff --git a/...sources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles.jelly b/...sources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles.jelly
@@ -85,7 +85,7 @@
                             <td style="width:40%; border:none; text-align:right; padding:0px">
                               <j:if test="${it.hasConfigurePermission()}">
 
-                                <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request.getParameter('timestamp1')}" style="text-decoration:none">
+                                <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request2.getParameter('timestamp1')}" style="text-decoration:none">
                                   ${%Restore this configuration}
                                 </a>
                               </j:if>
@@ -123,7 +123,7 @@
                             <td style="width:40%; border:none; text-align:right; padding:0px">
                               <j:if test="${it.hasConfigurePermission()}">
 
-                                <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request.getParameter('timestamp2')}" style="text-decoration:none">
+                                <a class="url-button" href="forwardToRestoreQuestion?timestamp=${request2.getParameter('timestamp2')}" style="text-decoration:none">
                                   ${%Restore this configuration}
                                 </a>
                               </j:if>

diff --git a/...n/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/configOutput.jelly b/...n/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/configOutput.jelly
@@ -4,7 +4,7 @@
 <?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler">
   <j:choose>
-    <j:when test="${request.getParameter('type').equals('xml')}">
+    <j:when test="${request2.getParameter('type').equals('xml')}">
       <st:contentType value="text/xml;charset=UTF-8" /><j:out value="${it.getFile()}"/>
     </j:when>
     <j:otherwise>

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/css/style.css" />
 
     <j:set var="useNameInComponentUrl" value="1" />
-    <j:set var="name" value="${request.getParameter('name')}" />
+    <j:set var="name" value="${request2.getParameter('name')}" />
     <j:set var="isDeleted" value="${name.contains('_deleted_')}" />
     <j:set var="offsetIfDeleted" value="${isDeleted ? 1 : 0}" />
     <l:side-panel>
@@ -36,8 +36,8 @@
       </j:choose>
 
       <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />
-      <j:set var="pageNum" value="${request.getParameter('pageNum')}" />
-      <j:set var="entriesPerPage" value="${request.getParameter('entriesPerPage')}" />
+      <j:set var="pageNum" value="${request2.getParameter('pageNum')}" />
+      <j:set var="entriesPerPage" value="${request2.getParameter('entriesPerPage')}" />
       <j:set var="totalEntriesNumber" value="${it.getRevisionAmount()}" />
       <j:set var="defaultEntriesPerPage" value="${(defaultEntriesPerPage > totalEntriesNumber) ? &quot;all&quot; : defaultEntriesPerPage}" />
       <j:if test="${pageNum == null or pageNum.equals(&quot;&quot;)}">

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/index.jelly
@@ -16,7 +16,7 @@
       </l:tasks>
     </l:side-panel>
 
-    <j:set var="filter" value="${request.getParameter('filter')}" />
+    <j:set var="filter" value="${request2.getParameter('filter')}" />
     <j:set var="filter" value="${filter == null ? 'system' : filter}" />
 
     <l:main-panel>
@@ -39,8 +39,8 @@
       </j:choose>
 
       <j:set var="defaultEntriesPerPage" value="${it.getMaxEntriesPerPage()}" />
-      <j:set var="pageNum" value="${request.getParameter('pageNum')}" />
-      <j:set var="entriesPerPage" value="${request.getParameter('entriesPerPage')}" />
+      <j:set var="pageNum" value="${request2.getParameter('pageNum')}" />
+      <j:set var="entriesPerPage" value="${request2.getParameter('entriesPerPage')}" />
       <j:set var="totalEntriesNumber" value="${it.getRevisionAmount()}" />
       <j:set var="defaultEntriesPerPage" value="${(defaultEntriesPerPage > totalEntriesNumber) ? &quot;all&quot; : defaultEntriesPerPage}" />
       <j:if test="${pageNum == null or pageNum.equals(&quot;&quot;)}">

diff --git a/...esources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/restoreQuestion.jelly b/...esources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/restoreQuestion.jelly
@@ -5,7 +5,7 @@
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/css/style.css"/>
 
     <l:main-panel>
-      <j:set var="name" value="${request.getParameter('name')}" />
+      <j:set var="name" value="${request2.getParameter('name')}" />
 
       <div style="text-align:center">
         <div class="jch-warning">

diff --git a/.../resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles.jelly b/.../resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles.jelly
@@ -9,8 +9,8 @@
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/highlight.js/styles/purebasic.css"/>
     <script src="${rootURL}/plugin/jobConfigHistory/highlight.js/highlight.pack.js"/>
     <st:adjunct includes="hudson.plugins.jobConfigHistory.show-diff-files-behaviour"/>
-    <j:set var="syntaxCheck1" value="${it.checkXmlSyntax(request.getParameter('name'), it.getTimestamp(1))}"/>
-    <j:set var="syntaxCheck2" value="${it.checkXmlSyntax(request.getParameter('name'), it.getTimestamp(2))}"/>
+    <j:set var="syntaxCheck1" value="${it.checkXmlSyntax(request2.getParameter('name'), it.getTimestamp(1))}"/>
+    <j:set var="syntaxCheck2" value="${it.checkXmlSyntax(request2.getParameter('name'), it.getTimestamp(2))}"/>
 
     <l:side-panel>
       <l:tasks>
@@ -50,7 +50,7 @@
       </j:if>
 
       <div>
-      <j:set var="name" value="${request.getParameter('name')}"/>
+      <j:set var="name" value="${request2.getParameter('name')}"/>
         <j:choose>
           <j:when test="${!it.hasConfigurePermission() and !name.contains('_deleted_')}">
             ${%No permission to view system changes}