Skip to content

Commit 3841125

Browse files
committed
Redo the old java8 samples to AppEngine latsst java21 runtime.
1 parent c6ae893 commit 3841125

File tree

469 files changed

+1625
-14282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

469 files changed

+1625
-14282
lines changed

appengine-java8/README.md renamed to appengine-java21/README.md

Lines changed: 3 additions & 3 deletions

appengine-java8/analytics/README.md renamed to appengine-java21/analytics/README.md

Lines changed: 1 addition & 1 deletion

appengine-java8/analytics/pom.xml renamed to appengine-java21/analytics/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<packaging>war</packaging>
2020
<version>1.0-SNAPSHOT</version>
2121
<groupId>com.example.appengine</groupId>
22-
<artifactId>appengine-analytics-j8</artifactId>
22+
<artifactId>appengine-analytics-j21</artifactId>
2323

2424
<!--
2525
The parent pom defines common style checks and testing strategies for our samples.

appengine-java8/analytics/src/main/webapp/WEB-INF/appengine-web.xml renamed to appengine-java21/analytics/src/main/webapp/WEB-INF/appengine-web.xml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@
1414
-->
1515
<!-- [END_EXCLUDE] -->
1616
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
17-
<threadsafe>true</threadsafe>
18-
<runtime>java8</runtime>
19-
<env-variables>
17+
18+
<runtime>java21</runtime>
19+
<app-engine-apis>true</app-engine-apis>
20+
<system-properties>
21+
<property name="appengine.use.EE8" value="true"/>
22+
</system-properties>
23+
24+
<env-variables>
2025
<env-var name="GA_TRACKING_ID" value="YOUR-GA-TRACKING-ID" />
2126
</env-variables>
2227
</appengine-web-app>

appengine-java8/appidentity/README.md renamed to appengine-java21/appidentity/README.md

Lines changed: 1 addition & 1 deletion

appengine-java8/appidentity/pom.xml renamed to appengine-java21/appidentity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<packaging>war</packaging>
2121
<version>1.0-SNAPSHOT</version>
2222
<groupId>com.example.appengine</groupId>
23-
<artifactId>appengine-appidentity-j8</artifactId>
23+
<artifactId>appengine-appidentity-j21</artifactId>
2424

2525
<!--
2626
The parent pom defines common style checks and testing strategies for our samples.

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java renamed to appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
)
3333
public class IdentityServlet extends HttpServlet {
3434

35+
// [START gae_java21_app_identity_versioned_hostnames]
3536
@Override
3637
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
3738
resp.setContentType("text/plain");
@@ -40,4 +41,5 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOExc
4041
resp.getWriter()
4142
.println(env.getAttributes().get("com.google.appengine.runtime.default_version_hostname"));
4243
}
44+
// [END gae_java21_app_identity_versioned_hostnames]
4345
}

appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java renamed to appengine-java21/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public SignForAppServlet() {
5454
appIdentity = AppIdentityServiceFactory.getAppIdentityService();
5555
}
5656

57-
// [START gae_java8_app_identity_other_services]
57+
// [START gae_java21_app_identity_other_services]
5858
// Note that the algorithm used by AppIdentity.signForApp() and
5959
// getPublicCertificatesForApp() is "SHA256withRSA"
6060

@@ -102,7 +102,7 @@ private String simulateIdentityAssertion()
102102
"isValid=%b for message: %s\n\tsignature: %s\n\tpublic cert: %s",
103103
isValid, message, Arrays.toString(blobSignature), Arrays.toString(publicCert));
104104
}
105-
// [END gae_java8_app_identity_other_services]
105+
// [END gae_java21_app_identity_other_services]
106106

107107
@Override
108108
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {

0 commit comments

Comments
 (0)