From 61fedeb93c23df5b6092bff80a13d0759f040eed Mon Sep 17 00:00:00 2001
From: srinjoyray <srinjoyray@google.com>
Date: Wed, 18 Dec 2024 11:14:04 +0530
Subject: [PATCH] addressed review comments

---
 .../google/apphosting/runtime/jetty9/SendErrorTest.java   | 8 ++++----
 .../apphosting/runtime/jetty9/senderrorapp/ee10/404.html  | 2 +-
 .../apphosting/runtime/jetty9/senderrorapp/ee10/500.html  | 2 +-
 .../runtime/jetty9/senderrorapp/ee10/hello.html           | 2 +-
 .../runtime/jetty9/senderrorapp/ee10/unhandled-error.html | 2 +-
 .../apphosting/runtime/jetty9/senderrorapp/ee8/404.html   | 2 +-
 .../apphosting/runtime/jetty9/senderrorapp/ee8/500.html   | 2 +-
 .../apphosting/runtime/jetty9/senderrorapp/ee8/hello.html | 2 +-
 .../runtime/jetty9/senderrorapp/ee8/unhandled-error.html  | 2 +-
 .../runtime/jetty9/senderrorapp/jetty94/404.html          | 2 +-
 .../runtime/jetty9/senderrorapp/jetty94/500.html          | 2 +-
 .../jetty9/senderrorapp/jetty94/WEB-INF/appengine-web.xml | 3 ++-
 .../runtime/jetty9/senderrorapp/jetty94/hello.html        | 2 +-
 .../jetty9/senderrorapp/jetty94/unhandled-error.html      | 2 +-
 14 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java
index 13864660..681bfee1 100644
--- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java
+++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SendErrorTest.java
@@ -83,22 +83,22 @@ public void testSendError() throws Exception {
     String url = runtime.jettyUrl("/send-error");
     ContentResponse response = httpClient.GET(url);
     assertEquals(HttpStatus.OK_200, response.getStatus());
-    assertThat(response.getContentAsString(), containsString("<h1>Hello, world!</h1>"));
+    assertThat(response.getContentAsString(), containsString("<h1>Hello, welcome to App Engine Java Standard!</h1>"));
 
     url = runtime.jettyUrl("/send-error?errorCode=404");
     response = httpClient.GET(url);
     assertEquals(HttpStatus.NOT_FOUND_404, response.getStatus());
-    assertThat(response.getContentAsString(), containsString("<h1>Error 404 Not Found</h1>"));
+    assertThat(response.getContentAsString(), containsString("<h1>404 - Page Not Found (App Engine Java Standard)</h1>"));
 
     url = runtime.jettyUrl("/send-error?errorCode=500");
     response = httpClient.GET(url);
     assertEquals(HttpStatus.INTERNAL_SERVER_ERROR_500, response.getStatus());
-    assertThat(response.getContentAsString(), containsString("<h1>Error 500 Internal Server Error</h1>"));
+    assertThat(response.getContentAsString(), containsString("<h1>500 - Internal Server Error (App Engine Java Standard)</h1>"));
 
     url = runtime.jettyUrl("/send-error?errorCode=503");
     response = httpClient.GET(url);
     assertEquals(HttpStatus.SERVICE_UNAVAILABLE_503, response.getStatus());
-    assertThat(response.getContentAsString(), containsString("<h1>Unhandled Error</h1>"));
+    assertThat(response.getContentAsString(), containsString("<h1>Unhandled Error - Service Temporarily Unavailable (App Engine Java Standard)</h1>"));
 
   }
 
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html
index 0c0221d8..3bd2b828 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/404.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 404 Not Found</h1>
\ No newline at end of file
+<h1>404 - Page Not Found (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html
index a6e7f2ea..ea194c69 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/500.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 500 Internal Server Error</h1>
\ No newline at end of file
+<h1>500 - Internal Server Error (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html
index d0671c64..df296c58 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/hello.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Hello, world!</h1>
\ No newline at end of file
+<h1>Hello, welcome to App Engine Java Standard!</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html
index f6a46e53..da26b1bb 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee10/unhandled-error.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Unhandled Error</h1>
\ No newline at end of file
+<h1>Unhandled Error - Service Temporarily Unavailable (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html
index 0c0221d8..3bd2b828 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/404.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 404 Not Found</h1>
\ No newline at end of file
+<h1>404 - Page Not Found (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html
index a6e7f2ea..ea194c69 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/500.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 500 Internal Server Error</h1>
\ No newline at end of file
+<h1>500 - Internal Server Error (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html
index d0671c64..df296c58 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/hello.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Hello, world!</h1>
\ No newline at end of file
+<h1>Hello, welcome to App Engine Java Standard!</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html
index f6a46e53..da26b1bb 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/ee8/unhandled-error.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Unhandled Error</h1>
\ No newline at end of file
+<h1>Unhandled Error - Service Temporarily Unavailable (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html
index 0c0221d8..3bd2b828 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/404.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 404 Not Found</h1>
\ No newline at end of file
+<h1>404 - Page Not Found (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/500.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/500.html
index a6e7f2ea..ea194c69 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/500.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/500.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Error 500 Internal Server Error</h1>
\ No newline at end of file
+<h1>500 - Internal Server Error (App Engine Java Standard)</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/WEB-INF/appengine-web.xml b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/WEB-INF/appengine-web.xml
index f31398b4..a5443993 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/WEB-INF/appengine-web.xml
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/WEB-INF/appengine-web.xml
@@ -20,6 +20,7 @@
   <application>senderror</application>
   <version>1</version>
   <system-properties>
-    <property name="appengine.use.EE8" value="true"/>
+    <property name="appengine.use.EE8" value="false"/>
+    <property name="appengine.use.EE10" value="false"/>
   </system-properties>
 </appengine-web-app>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/hello.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/hello.html
index d0671c64..df296c58 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/hello.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/hello.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Hello, world!</h1>
\ No newline at end of file
+<h1>Hello, welcome to App Engine Java Standard!</h1>
\ No newline at end of file
diff --git a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/unhandled-error.html b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/unhandled-error.html
index f6a46e53..da26b1bb 100644
--- a/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/unhandled-error.html
+++ b/runtime/testapps/src/main/resources/com/google/apphosting/runtime/jetty9/senderrorapp/jetty94/unhandled-error.html
@@ -13,4 +13,4 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<h1>Unhandled Error</h1>
\ No newline at end of file
+<h1>Unhandled Error - Service Temporarily Unavailable (App Engine Java Standard)</h1>
\ No newline at end of file