Skip to content

FELIX-6831 Use Jetty EE10 artifacts instead of EE11 on Jetty 12.1.9 #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paulrutter wants to merge 1 commit into from
Closed

FELIX-6831 Use Jetty EE10 artifacts instead of EE11 on Jetty 12.1.9 #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions http/jetty12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<description>This is an implementation of the R8.1 OSGi Servlet Service, the R7 OSGi Http Service and the R7 OSGi Http Whiteboard Specification</description>

<artifactId>org.apache.felix.http.jetty12</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>

<scm>
Expand Down Expand Up @@ -75,9 +75,9 @@

if (artifact.getArtifactHandler().isAddedToClasspath() && !org.apache.maven.artifact.Artifact.SCOPE_TEST.equals( artifact.getScope() )
&& !"org.eclipse.jetty.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts
&& !"org.eclipse.jetty.ee11.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts
&& !"jetty-ee11-annotations".equals(artifact.getArtifactId()) // skip the transitive artifacts from the optional websocket artifacts
&& !"jetty-ee11-plus".equals(artifact.getArtifactId())
&& !"org.eclipse.jetty.ee10.websocket".equals(artifact.getGroupId()) // skip the optional websocket artifacts
&& !"jetty-ee10-annotations".equals(artifact.getArtifactId()) // skip the transitive artifacts from the optional websocket artifacts
&& !"jetty-ee10-plus".equals(artifact.getArtifactId())
&& !"jetty-webapp".equals(artifact.getArtifactId())
&& !"jetty-ee".equals(artifact.getArtifactId())) {
def jar;
Expand Down Expand Up @@ -184,8 +184,8 @@
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
org.eclipse.jetty.ee.*,
!org.eclipse.jetty.ee11.websocket.*,
org.eclipse.jetty.ee11.servlet.*,
!org.eclipse.jetty.ee10.websocket.*,
org.eclipse.jetty.ee10.servlet.*,
org.eclipse.jetty.compression.*,
org.apache.felix.http.jetty,
org.apache.felix.http.jakartawrappers,
Expand Down Expand Up @@ -366,9 +366,9 @@
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
org.eclipse.jetty.ee.*,
org.eclipse.jetty.ee11.servlet.*,
!org.eclipse.jetty.ee11.websocket.jakarta.*,
org.eclipse.jetty.ee11.websocket.*,
org.eclipse.jetty.ee10.servlet.*,
!org.eclipse.jetty.ee10.websocket.jakarta.*,
org.eclipse.jetty.ee10.websocket.*,
org.eclipse.jetty.websocket.*,
org.eclipse.jetty.compression.*,
org.apache.felix.http.jetty,
Expand Down Expand Up @@ -470,10 +470,10 @@
org.eclipse.jetty.server.*,
org.eclipse.jetty.util.*,
org.eclipse.jetty.ee.*,
!org.eclipse.jetty.ee11.websocket.server.*,
!org.eclipse.jetty.ee11.websocket.servlet.*,
org.eclipse.jetty.ee11.websocket.jakarta.*,
org.eclipse.jetty.ee11.servlet.*,
!org.eclipse.jetty.ee10.websocket.server.*,
!org.eclipse.jetty.ee10.websocket.servlet.*,
org.eclipse.jetty.ee10.websocket.jakarta.*,
org.eclipse.jetty.ee10.servlet.*,
org.eclipse.jetty.websocket.*,
org.eclipse.jetty.compression.*,
org.apache.felix.http.jetty,
Expand Down Expand Up @@ -624,8 +624,8 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11</groupId>
<artifactId>jetty-ee11-servlet</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
<version>${jetty.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -674,14 +674,14 @@
<version>${jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jakarta-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jakarta-server</artifactId>
<version>${jetty.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
<artifactId>jetty-ee11-websocket-jetty-server</artifactId>
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
<version>${jetty.version}</version>
<optional>true</optional>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import java.util.Map;

import org.eclipse.jetty.ee11.servlet.ErrorHandler;
import org.eclipse.jetty.ee10.servlet.ErrorHandler;
import org.eclipse.jetty.http.HttpFields.Mutable;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Response;
Expand Down
38 changes: 19 additions & 19 deletions http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
import org.apache.felix.http.base.internal.HttpServiceController;
import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.eclipse.jetty.alpn.server.ALPNServerConnectionFactory;
import org.eclipse.jetty.ee11.servlet.ServletContextHandler;
import org.eclipse.jetty.ee11.servlet.ServletHolder;
import org.eclipse.jetty.ee11.servlet.SessionHandler;
import org.eclipse.jetty.ee11.servlet.ServletHandler;
import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.ee10.servlet.ServletHolder;
import org.eclipse.jetty.ee10.servlet.SessionHandler;
import org.eclipse.jetty.ee10.servlet.ServletHandler;
import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.http.UriCompliance;
import org.eclipse.jetty.http2.server.HTTP2ServerConnectionFactory;
Expand Down Expand Up @@ -595,32 +595,32 @@ private boolean initializeHttps()
* @param handler the sevlet context handler to initialize
*/
private void maybeInitializeJakartaWebsocket(ServletContextHandler handler) {
if (isClassNameVisible("org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) {
if (isClassNameVisible("org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) {
// Ensure that JakartaWebSocketServletContainerInitializer is initialized,
// to setup the ServerContainer for this web application context.
org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.configure(handler, null);
SystemLogger.LOGGER.info("Jakarta WebSocket ee11 servlet container initialized");
org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.configure(handler, null);
SystemLogger.LOGGER.info("Jakarta WebSocket ee10 servlet container initialized");
} else {
SystemLogger.LOGGER.warn("Failed to initialize jakarta ee11 standard websocket support since the initializer class was not found. "
+ "Check if the jetty-ee11-websocket-jakarta-server bundle is deployed.");
SystemLogger.LOGGER.warn("Failed to initialize jakarta ee10 standard websocket support since the initializer class was not found. "
+ "Check if the jetty-ee10-websocket-jakarta-server bundle is deployed.");
}
}

/**
* Initialize the jetty ee11 websocket support for the servlet context handler.
* Initialize the jetty ee10 websocket support for the servlet context handler.
* If the optional initializer class is not present then a warning will be logged.
*
* @param handler the sevlet context handler to initialize
*/
private void maybeInitializeJettyWebsocket(ServletContextHandler handler) {
if (isClassNameVisible("org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer")) {
if (isClassNameVisible("org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer")) {
// Ensure that JettyWebSocketServletContainerInitializer is initialized,
// to setup the JettyWebSocketServerContainer for this web application context.
org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer.configure(handler, null);
SystemLogger.LOGGER.info("Jetty WebSocket ee11 servlet container initialized");
org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer.configure(handler, null);
SystemLogger.LOGGER.info("Jetty WebSocket ee10 servlet container initialized");
} else {
SystemLogger.LOGGER.warn("Failed to initialize jetty ee11 specific websocket support since the initializer class was not found. "
+ "Check if the jetty-ee11-websocket-jetty-server bundle is deployed.");
SystemLogger.LOGGER.warn("Failed to initialize jetty ee10 specific websocket support since the initializer class was not found. "
+ "Check if the jetty-ee10-websocket-jetty-server bundle is deployed.");
}
}

Expand All @@ -633,13 +633,13 @@ private void maybeStoreWebSocketContainerAttributes(ServletContextHandler contex
// when the server is started, retrieve the container attribute and
// set it on the shared servlet context once available
if (this.config.isUseJettyWebsocket() &&
isClassNameVisible("org.eclipse.jetty.ee11.websocket.server.config.JettyWebSocketServletContainerInitializer")) {
String attribute = org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
isClassNameVisible("org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer")) {
String attribute = org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
this.controller.setAttributeSharedServletContext(attribute, context.getServletContext().getAttribute(attribute));
}
if (this.config.isUseJakartaWebsocket() &&
isClassNameVisible("org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) {
String attribute = org.eclipse.jetty.ee11.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.ATTR_JAKARTA_SERVER_CONTAINER;
isClassNameVisible("org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer")) {
String attribute = org.eclipse.jetty.ee10.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.ATTR_JAKARTA_SERVER_CONTAINER;
this.controller.setAttributeSharedServletContext(attribute, context.getServletContext().getAttribute(attribute));
}
}
Expand Down
12 changes: 6 additions & 6 deletions http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
import jakarta.websocket.server.ServerEndpoint;

import org.awaitility.Awaitility;
import org.eclipse.jetty.ee11.websocket.jakarta.client.JakartaWebSocketClientContainerProvider;
import org.eclipse.jetty.ee10.websocket.jakarta.client.JakartaWebSocketClientContainerProvider;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
Expand Down Expand Up @@ -75,16 +75,16 @@ protected Option[] additionalOptions() throws IOException {
mavenBundle().groupId("jakarta.websocket").artifactId("jakarta.websocket-client-api").version("2.2.0"),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-alpn-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-gzip").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jakarta-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-client").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jakarta-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion)
};
}
Expand Down
4 changes: 2 additions & 2 deletions http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ protected Option[] additionalOptions() throws IOException {
spifly(),

// bundles for the server side
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),

// additional bundles for the client side
Expand Down
4 changes: 2 additions & 2 deletions http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ protected Option[] additionalOptions() throws IOException {
spifly(),

// bundles for the server side
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),

// additional bundles for the client side
Expand Down
12 changes: 6 additions & 6 deletions http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
import org.awaitility.Awaitility;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServerContainer;
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServlet;
import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServletFactory;
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServerContainer;
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServlet;
import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServletFactory;
import org.eclipse.jetty.websocket.api.Callback;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
Expand Down Expand Up @@ -80,14 +80,14 @@ protected Option[] additionalOptions() throws IOException {
spifly(),

// bundles for the server side
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-core-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-api").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-common").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.websocket").artifactId("jetty-websocket-jetty-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11.websocket").artifactId("jetty-ee11-websocket-jetty-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10.websocket").artifactId("jetty-ee10-websocket-jetty-server").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion),

Expand Down
4 changes: 2 additions & 2 deletions ...jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ protected Option[] additionalOptions() throws IOException {
spifly(),

// bundles for the server side
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
mavenBundle().groupId("org.eclipse.jetty.compression").artifactId("jetty-compression-common").version(jettyVersion),

Expand Down
Loading
Loading