fix some more references to jetty9

Signed-off-by: Lachlan Roberts <[email protected]>
GoogleCloudPlatform · Aug 2, 2023 · 7e53088 · 7e53088
1 parent 58e2e52
commit 7e53088
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -201,7 +201,7 @@ Source code for the App Engine local dev application server and local utilities.
 
 ### App Engine Java production runtime execution environment
 
-Source code for the App Engine production application server and utilities. It is based on the Jetty9.4 Web Server.
+Source code for the App Engine production application server and utilities. It is based on the Jetty Web Server.
 
 - [Public Documentation][ae-docs]
 - [Source Code for the runtime implementation](https://github.com/GoogleCloudPlatform/appengine-java-standard/tree/master/runtime/impl)

diff --git a/api_dev/src/test/java/com/google/appengine/tools/development/IsolatedAppClassLoaderTest.java b/api_dev/src/test/java/com/google/appengine/tools/development/IsolatedAppClassLoaderTest.java
@@ -45,7 +45,7 @@ public void calculateCorrectContentForServletsFiltersDevappServer1() throws Exce
             "com.google.apphosting.utils.servlet.TransactionCleanupFilter",
             "com.google.appengine.api.blobstore.dev.ServeBlobFilter",
             "com.google.appengine.tools.development.HeaderVerificationFilter",
-            "com.google.appengine.tools.development.jetty.ResponseRewriterFilterJetty9",
+            "com.google.appengine.tools.development.jetty.JettyResponseRewriterFilter",
             "com.google.appengine.tools.development.jetty.LocalResourceFileServlet",
             "com.google.appengine.api.blobstore.dev.UploadBlobServlet",
             "com.google.appengine.api.images.dev.LocalBlobImageServlet",
@@ -64,37 +64,37 @@ public void calculateCorrectContentForServletsFiltersDevappServer1() throws Exce
             "com.google.apphosting.utils.servlet.InboundMailServlet",
             "com.google.apphosting.utils.servlet.SearchServlet",
             "com.google.apphosting.utils.servlet.AdminConsoleResourceServlet",
-            "org.apache.jsp.ah.jetty9.adminConsole_jsp",
-            "org.apache.jsp.ah.jetty9.datastoreViewerHead_jsp",
-            "org.apache.jsp.ah.jetty9.datastoreViewerBody_jsp",
-            "org.apache.jsp.ah.jetty9.datastoreViewerFinal_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexesListHead_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexesListBody_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexesListFinal_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexHead_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexBody_jsp",
-            "org.apache.jsp.ah.jetty9.searchIndexFinal_jsp",
-            "org.apache.jsp.ah.jetty9.searchDocumentHead_jsp",
-            "org.apache.jsp.ah.jetty9.searchDocumentBody_jsp",
-            "org.apache.jsp.ah.jetty9.searchDocumentFinal_jsp",
-            "org.apache.jsp.ah.jetty9.capabilitiesStatusHead_jsp",
-            "org.apache.jsp.ah.jetty9.capabilitiesStatusBody_jsp",
-            "org.apache.jsp.ah.jetty9.capabilitiesStatusFinal_jsp",
-            "org.apache.jsp.ah.jetty9.entityDetailsHead_jsp",
-            "org.apache.jsp.ah.jetty9.entityDetailsBody_jsp",
-            "org.apache.jsp.ah.jetty9.entityDetailsFinal_jsp",
-            "org.apache.jsp.ah.jetty9.indexDetailsHead_jsp",
-            "org.apache.jsp.ah.jetty9.indexDetailsBody_jsp",
-            "org.apache.jsp.ah.jetty9.indexDetailsFinal_jsp",
-            "org.apache.jsp.ah.jetty9.modulesHead_jsp",
-            "org.apache.jsp.ah.jetty9.modulesBody_jsp",
-            "org.apache.jsp.ah.jetty9.modulesFinal_jsp",
-            "org.apache.jsp.ah.jetty9.taskqueueViewerHead_jsp",
-            "org.apache.jsp.ah.jetty9.taskqueueViewerBody_jsp",
-            "org.apache.jsp.ah.jetty9.taskqueueViewerFinal_jsp",
-            "org.apache.jsp.ah.jetty9.inboundMailHead_jsp",
-            "org.apache.jsp.ah.jetty9.inboundMailBody_jsp",
-            "org.apache.jsp.ah.jetty9.inboundMailFinal_jsp");
+            "org.apache.jsp.ah.jetty.adminConsole_jsp",
+            "org.apache.jsp.ah.jetty.datastoreViewerHead_jsp",
+            "org.apache.jsp.ah.jetty.datastoreViewerBody_jsp",
+            "org.apache.jsp.ah.jetty.datastoreViewerFinal_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexesListHead_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexesListBody_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexesListFinal_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexHead_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexBody_jsp",
+            "org.apache.jsp.ah.jetty.searchIndexFinal_jsp",
+            "org.apache.jsp.ah.jetty.searchDocumentHead_jsp",
+            "org.apache.jsp.ah.jetty.searchDocumentBody_jsp",
+            "org.apache.jsp.ah.jetty.searchDocumentFinal_jsp",
+            "org.apache.jsp.ah.jetty.capabilitiesStatusHead_jsp",
+            "org.apache.jsp.ah.jetty.capabilitiesStatusBody_jsp",
+            "org.apache.jsp.ah.jetty.capabilitiesStatusFinal_jsp",
+            "org.apache.jsp.ah.jetty.entityDetailsHead_jsp",
+            "org.apache.jsp.ah.jetty.entityDetailsBody_jsp",
+            "org.apache.jsp.ah.jetty.entityDetailsFinal_jsp",
+            "org.apache.jsp.ah.jetty.indexDetailsHead_jsp",
+            "org.apache.jsp.ah.jetty.indexDetailsBody_jsp",
+            "org.apache.jsp.ah.jetty.indexDetailsFinal_jsp",
+            "org.apache.jsp.ah.jetty.modulesHead_jsp",
+            "org.apache.jsp.ah.jetty.modulesBody_jsp",
+            "org.apache.jsp.ah.jetty.modulesFinal_jsp",
+            "org.apache.jsp.ah.jetty.taskqueueViewerHead_jsp",
+            "org.apache.jsp.ah.jetty.taskqueueViewerBody_jsp",
+            "org.apache.jsp.ah.jetty.taskqueueViewerFinal_jsp",
+            "org.apache.jsp.ah.jetty.inboundMailHead_jsp",
+            "org.apache.jsp.ah.jetty.inboundMailBody_jsp",
+            "org.apache.jsp.ah.jetty.inboundMailFinal_jsp");
     assertThat(classes).containsExactlyElementsIn(classesFromWebDefault1);
   }
 

diff --git a/local_runtime_shared/pom.xml b/local_runtime_shared/pom.xml
@@ -70,7 +70,7 @@
             </goals>
             <configuration>
               <jspc>
-                <package>org.apache.jsp.ah.jetty9</package>
+                <package>org.apache.jsp.ah.jetty</package>
               </jspc>
               <webAppSourceDirectory>${basedir}/src/main/resources/com/google/apphosting/utils/servlet/ah</webAppSourceDirectory>
               <mergeFragment>false</mergeFragment>

diff --git a/...time_shared/src/main/resources/com/google/apphosting/utils/servlet/jetty9_jsps_jarjarrule b/...time_shared/src/main/resources/com/google/apphosting/utils/servlet/jetty9_jsps_jarjarrule
@@ -1,5 +1,5 @@
 keep com.google.apphosting.utils.servlet.ah.**
 keep org.apache.jsp.ah.**
-rule org.apache.jsp.ah.** org.apache.jsp.ah.jetty9.@1
+rule org.apache.jsp.ah.** org.apache.jsp.ah.jetty.@1
 
 
diff --git a/runtime/local/src/main/resources/com/google/appengine/tools/development/jetty/webdefault.xml b/runtime/local/src/main/resources/com/google/appengine/tools/development/jetty/webdefault.xml
@@ -361,157 +361,157 @@
 
   <servlet>
     <servlet-name>_ah_adminConsole</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.adminConsole_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.adminConsole_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_datastoreViewerHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.datastoreViewerHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.datastoreViewerHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_datastoreViewerBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.datastoreViewerBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.datastoreViewerBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_datastoreViewerFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.datastoreViewerFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.datastoreViewerFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexesListHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexesListHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexesListHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexesListBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexesListBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexesListBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexesListFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexesListFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexesListFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchIndexFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchIndexFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchIndexFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchDocumentHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchDocumentHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchDocumentHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchDocumentBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchDocumentBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchDocumentBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_searchDocumentFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.searchDocumentFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.searchDocumentFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_capabilitiesStatusHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.capabilitiesStatusHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.capabilitiesStatusHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_capabilitiesStatusBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.capabilitiesStatusBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.capabilitiesStatusBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_capabilitiesStatusFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.capabilitiesStatusFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.capabilitiesStatusFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_entityDetailsHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.entityDetailsHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.entityDetailsHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_entityDetailsBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.entityDetailsBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.entityDetailsBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_entityDetailsFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.entityDetailsFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.entityDetailsFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_indexDetailsHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.indexDetailsHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.indexDetailsHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_indexDetailsBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.indexDetailsBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.indexDetailsBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_indexDetailsFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.indexDetailsFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.indexDetailsFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_modulesHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.modulesHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.modulesHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_modulesBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.modulesBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.modulesBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_modulesFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.modulesFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.modulesFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_taskqueueViewerHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.taskqueueViewerHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.taskqueueViewerHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_taskqueueViewerBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.taskqueueViewerBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.taskqueueViewerBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_taskqueueViewerFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.taskqueueViewerFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.taskqueueViewerFinal_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_inboundMailHead</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.inboundMailHead_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.inboundMailHead_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_inboundMailBody</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.inboundMailBody_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.inboundMailBody_jsp</servlet-class>
   </servlet>
 
   <servlet>
     <servlet-name>_ah_inboundMailFinal</servlet-name>
-    <servlet-class>org.apache.jsp.ah.jetty9.inboundMailFinal_jsp</servlet-class>
+    <servlet-class>org.apache.jsp.ah.jetty.inboundMailFinal_jsp</servlet-class>
   </servlet>
 
   <!-- Servlet mappings -->