Skip to content

Commit 95e6804

Browse files
ludochludoch
committed
With Jetty 12.1, try to use only the EE11 artifacts to serve the current GAE EE10 runtime.
For now we keep the ee10 names, but use ee11 jars, and in master pom the servlet 6.1.0 as well as the lib/annotations and lib/ee11-annotations as these 2 directories were a single ee10-annotations directory.
1 parent f373f8c commit 95e6804

31 files changed

Lines changed: 124 additions & 111 deletions

File tree

‎api_dev/src/main/java/com/google/appengine/tools/development/testing/ee10/FakeHttpServletResponse.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,11 @@ private void checkCommit() {
364364
}
365365
}
366366

367+
@Override
368+
public void sendRedirect(String string, int i, boolean bln) throws IOException {
369+
throw new UnsupportedOperationException("Not supported yet.");
370+
}
371+
367372
private static class FakeServletOutputStream extends ServletOutputStream {
368373

369374
private final ByteArrayOutputStream byteStream;

‎api_dev/src/main/java/com/google/appengine/tools/info/Jetty12Sdk.java‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,14 @@ public String getQuickStartClasspath() {
117117
Boolean.getBoolean("appengine.use.EE10")
118118
? new File(getSdkRoot(), "lib/tools/quickstart/quickstartgenerator-jetty12-ee10.jar")
119119
: new File(getSdkRoot(), "lib/tools/quickstart/quickstartgenerator-jetty12.jar");
120-
String avoidJars = Boolean.getBoolean("appengine.use.EE10") ? "ee8" : "ee10";
120+
String avoidJars = Boolean.getBoolean("appengine.use.EE10") ? "ee8" : "ee11";
121121

122122
File jettyDir = new File(getSdkRoot(), JETTY12_HOME_LIB_PATH);
123123
for (File f : jettyDir.listFiles()) {
124124
if (!f.isDirectory()
125125
&& !(f.getName().contains("cdi-")
126126
|| f.getName().contains("ee9")
127+
|| f.getName().contains("ee10")
127128
|| f.getName().contains(avoidJars))) {
128129
list.add(f.getAbsolutePath());
129130
}
@@ -134,12 +135,17 @@ public String getQuickStartClasspath() {
134135
// Note: Do not put the Apache JSP files in the classpath. If needed, they should be part of
135136
// the application itself under WEB-INF/lib.
136137
if (Boolean.getBoolean("appengine.use.EE10")) {
137-
for (String subdir : new String[] {"ee10-annotations"}) {
138+
for (String subdir : new String[] {"ee11-annotations"}) {
138139
for (File f : new File(jettyDir, subdir).listFiles()) {
139140
list.add(f.getAbsolutePath());
140141
}
141142
}
142-
for (String subdir : new String[] {"ee10-jaspi"}) {
143+
for (String subdir : new String[] {"annotations"}) {
144+
for (File f : new File(jettyDir, subdir).listFiles()) {
145+
list.add(f.getAbsolutePath());
146+
}
147+
}
148+
for (String subdir : new String[] {"ee11-jaspi"}) {
143149
for (File f : new File(jettyDir, subdir).listFiles()) {
144150
list.add(f.getAbsolutePath());
145151
}
@@ -171,9 +177,10 @@ private List<File> getImplLibFiles() {
171177
lf.addAll(getJetty12Jars("logging"));
172178
// We also want the devserver to be able to handle annotated servlet, via ASM:
173179
if (Boolean.getBoolean("appengine.use.EE10")) {
174-
lf.addAll(getJetty12Jars("ee10-annotations"));
175-
lf.addAll(getJetty12Jars("ee10-apache-jsp"));
176-
lf.addAll(getJetty12Jars("ee10-glassfish-jstl"));
180+
lf.addAll(getJetty12Jars("annotations"));
181+
lf.addAll(getJetty12Jars("ee11-annotations"));
182+
lf.addAll(getJetty12Jars("ee11-apache-jsp"));
183+
lf.addAll(getJetty12Jars("ee11-glassfish-jstl"));
177184
} else {
178185
lf.addAll(getJetty12Jars("ee8-annotations"));
179186
lf.addAll(getJetty12Jars("ee8-apache-jsp"));
@@ -223,7 +230,8 @@ private List<File> getJetty12Jars(String subDir) {
223230
// in our runtime (private Jetty dependency we do not want to expose to the customer).
224231
if (!(f.getName().contains("-cdi-")
225232
|| f.getName().contains("jetty-servlet-api-") // no javax. if needed should be in shared
226-
|| f.getName().contains("ee9") // we want ee10 only. jakarta apis should be in shared
233+
|| f.getName().contains("ee9") // we want ee11 only. jakarta apis should be in shared
234+
|| f.getName().contains("ee10") // we want ee11 only. jakarta apis should be in shared
227235
|| f.getName().contains("jetty-jakarta-servlet-api") // old
228236
)) {
229237
jars.add(f);
@@ -236,9 +244,9 @@ private List<File> getJetty12Jars(String subDir) {
236244
List<File> getJetty12JspJars() {
237245

238246
if (Boolean.getBoolean("appengine.use.EE10")) {
239-
List<File> lf = getJetty12Jars("ee10-apache-jsp");
240-
lf.addAll(getJetty12Jars("ee10-glassfish-jstl"));
241-
lf.add(getJetty12Jar("ee10-servlet-"));
247+
List<File> lf = getJetty12Jars("ee11-apache-jsp");
248+
lf.addAll(getJetty12Jars("ee11-glassfish-jstl"));
249+
lf.add(getJetty12Jar("ee11-servlet-"));
242250
return lf;
243251
}
244252
List<File> lf = getJetty12Jars("ee8-apache-jsp");

‎appengine_setup/testapps/jetty12_testapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
<version>${jetty.version}</version>
4747
</dependency>
4848
<dependency>
49-
<groupId>org.eclipse.jetty.ee10</groupId>
50-
<artifactId>jetty-ee10-servlet</artifactId>
49+
<groupId>org.eclipse.jetty.ee11</groupId>
50+
<artifactId>jetty-ee11-servlet</artifactId>
5151
<version>${jetty.version}</version>
5252
</dependency>
5353
<dependency>

‎appengine_setup/testapps/jetty12_testapp/src/main/java/com/google/appengine/setup/testapps/jetty12/JettyServer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.google.appengine.setup.testapps.jetty12.servlets.TaskQueueTestServlet;
2525
import jakarta.servlet.DispatcherType;
2626
import java.util.EnumSet;
27-
import org.eclipse.jetty.ee10.servlet.ServletHandler;
27+
import org.eclipse.jetty.ee11.servlet.ServletHandler;
2828
import org.eclipse.jetty.server.Connector;
2929
import org.eclipse.jetty.server.Server;
3030
import org.eclipse.jetty.server.ServerConnector;

‎e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,7 @@ public void testStageGaeStandardJava8WithOnlyJasperContextInitializer()
16741674
} else if (Boolean.getBoolean("appengine.use.EE10")) {
16751675
expectedJasperInitializer
16761676
= "\"ContainerInitializer"
1677-
+ "{org.eclipse.jetty.ee10.apache.jsp.JettyJasperInitializer"
1677+
+ "{org.eclipse.jetty.ee11.apache.jsp.JettyJasperInitializer"
16781678
+ ",interested=[],applicable=[],annotated=[]}\"";
16791679
} else {
16801680
expectedJasperInitializer

‎jetty12_assembly/pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@
7878
<destFileName>org.eclipse.jetty.ee8.apache-jsp-${jetty12.version}-nolog.jar</destFileName>
7979
</artifactItem>
8080
<artifactItem>
81-
<groupId>org.eclipse.jetty.ee10</groupId>
82-
<artifactId>jetty-ee10-apache-jsp</artifactId>
81+
<groupId>org.eclipse.jetty.ee11</groupId>
82+
<artifactId>jetty-ee11-apache-jsp</artifactId>
8383
<overWrite>true</overWrite>
8484
<classifier>nolog</classifier>
85-
<outputDirectory>${assembly-directory}/jetty12/jetty-home/lib/ee10-apache-jsp</outputDirectory>
86-
<destFileName>org.eclipse.jetty.ee10.apache-jsp-${jetty12.version}-nolog.jar</destFileName>
85+
<outputDirectory>${assembly-directory}/jetty12/jetty-home/lib/ee11-apache-jsp</outputDirectory>
86+
<destFileName>org.eclipse.jetty.ee11.apache-jsp-${jetty12.version}-nolog.jar</destFileName>
8787
</artifactItem>
8888
</artifactItems>
8989
</configuration>
@@ -130,8 +130,8 @@
130130
<version>${jetty12.version}</version>
131131
</dependency>
132132
<dependency>
133-
<groupId>org.eclipse.jetty.ee10</groupId>
134-
<artifactId>jetty-ee10-apache-jsp</artifactId>
133+
<groupId>org.eclipse.jetty.ee11</groupId>
134+
<artifactId>jetty-ee11-apache-jsp</artifactId>
135135
<version>${jetty12.version}</version>
136136
</dependency>
137137
</dependencies>

‎lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ private void fallThroughToRuntimeOnContextInitializers() {
10291029
String containerInitializer = matcher.group(1);
10301030
if ("org.eclipse.jetty.apache.jsp.JettyJasperInitializer".equals(containerInitializer)
10311031
|| "org.eclipse.jetty.ee8.apache.jsp.JettyJasperInitializer".equals(containerInitializer)
1032-
|| "org.eclipse.jetty.ee10.apache.jsp.JettyJasperInitializer"
1032+
|| "org.eclipse.jetty.ee11.apache.jsp.JettyJasperInitializer"
10331033
.equals(containerInitializer)) {
10341034
foundJasperInitializer = true;
10351035
}

‎local_runtime_shared_jetty12/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<build>
5757
<plugins>
5858
<plugin>
59-
<groupId>org.eclipse.jetty.ee10</groupId>
60-
<artifactId>jetty-ee10-jspc-maven-plugin</artifactId>
59+
<groupId>org.eclipse.jetty.ee11</groupId>
60+
<artifactId>jetty-ee11-jspc-maven-plugin</artifactId>
6161
<version>${jetty12.version}</version>
6262
<executions>
6363
<execution>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@
499499
<dependency>
500500
<groupId>jakarta.servlet</groupId>
501501
<artifactId>jakarta.servlet-api</artifactId>
502-
<version>6.0.0</version> <!-- keep -->
502+
<version>6.1.0</version> <!-- keep -->
503503
</dependency>
504504
<dependency>
505505
<groupId>javax.servlet.jsp.jstl</groupId>

‎quickstartgenerator_jetty12_ee10/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<name>AppEngine :: quickstartgenerator Jetty12 EE10</name>
3131
<dependencies>
3232
<dependency>
33-
<groupId>org.eclipse.jetty.ee10</groupId>
34-
<artifactId>jetty-ee10-quickstart</artifactId>
33+
<groupId>org.eclipse.jetty.ee11</groupId>
34+
<artifactId>jetty-ee11-quickstart</artifactId>
3535
<version>${jetty12.version}</version>
3636
</dependency>
3737
<dependency>

0 commit comments

Comments
 (0)