This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 6a59d8f995 FELIX-6702 : Make Jetty bundles EE version neutral
6a59d8f995 is described below
commit 6a59d8f995bb15678d1b537045bdda74d28c6a9f
Author: Paul <[email protected]>
AuthorDate: Wed May 8 06:55:48 2024 +0200
FELIX-6702 : Make Jetty bundles EE version neutral
Jetty bundle
* org.apache.felix.jakarta.ee9.websocket.enable ->
org.apache.felix.jakarta.websocket.enable
* org.apache.felix.jetty.ee9.websocket.enable ->
org.apache.felix.jetty.websocket.enable
Jetty12 bundle
* org.apache.felix.jakarta.ee10.websocket.enable ->
org.apache.felix.jakarta.websocket.enable
* org.apache.felix.jetty.ee10.websocket.enable ->
org.apache.felix.jetty.websocket.enable
Classifiers:
* with-jetty-ee10-websockets -> with-jetty-websockets
* with-jakarta-ee10-websockets -> with-jakarta-websockets
Updated unit tests and README.md to reflect these changes.
---
http/README.md | 116 ++++++++++-----------
.../jetty/internal/ConfigMetaTypeProvider.java | 14 +--
.../felix/http/jetty/internal/JettyConfig.java | 16 +--
.../felix/http/jetty/internal/JettyService.java | 22 ++--
...cketIT.java => JakartaSpecificWebsocketIT.java} | 4 +-
...socketIT.java => JettySpecificWebsocketIT.java} | 4 +-
.../jetty/it/MissingWebsocketDependenciesIT.java | 6 +-
http/jetty12/pom.xml | 8 +-
.../jetty/internal/ConfigMetaTypeProvider.java | 16 +--
.../felix/http/jetty/internal/JettyConfig.java | 22 ++--
.../felix/http/jetty/internal/JettyService.java | 18 ++--
...cketIT.java => JakartaSpecificWebsocketIT.java} | 4 +-
...socketIT.java => JettySpecificWebsocketIT.java} | 4 +-
.../jetty/it/MissingWebsocketDependenciesIT.java | 4 +-
http/samples/whiteboard/pom.xml | 2 +-
.../samples/whiteboard/TestWebSocketServlet.java | 2 +-
.../TestWebSocketServletAlternative.java | 2 +-
17 files changed, 131 insertions(+), 133 deletions(-)
diff --git a/http/README.md b/http/README.md
index 621a358cc3..ef2689cf69 100644
--- a/http/README.md
+++ b/http/README.md
@@ -8,7 +8,7 @@ This is an implementation of the [R8.1 Whiteboard Specification
for Jakarta Serv
* [Felix HTTP Jetty
12](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty12)
is the preferred bundle of choice as it supports JavaEE 8 and JakartaEE 8 with
the `javax` namespace, JakartaEE 9/10/11/future versions with the `jakarta`
namespace.
* [Jetty WebSocket
support](https://github.com/apache/felix-dev/pull/310), see example code
[here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java).
* [Felix HTTP Jetty
11](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty)
is the predecessor of the Jetty 12 bundle, which shipped with [Jetty
9.4.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/4.2.26)
in the 4.x range, [Jetty
11.x](https://mvnrepository.com/artifact/org.apache.felix/org.apache.felix.http.jetty/5.1.10)
in the 5.x range.
- * [Jetty WebSocket
support](https://github.com/apache/felix-dev/pull/39), see example code
[here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java).
+ * [Jetty WebSocket
support](https://github.com/apache/felix-dev/pull/309), see example code
[here](https://github.com/apache/felix-dev/blob/master/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java).
* Correctly versioned Servlet API.
## Installing
@@ -28,11 +28,11 @@ Note that as of version **3.x**, the Servlet APIs are **no
longer** packaged wit
`org.apache.felix.http.servlet-api` (or any other compatible Serlvet API
bundle) to your
classpath and deployment!
-### Using classifiers: `light`, `with-jetty-ee10-websockets` and
`with-jakarta-ee10-websockets` bundle
+### Using classifiers: `light`, `with-jetty-websockets` and
`with-jakarta-websockets` bundle
If you would like to use your own Jetty jars instead of the one packaged with
the Felix Jetty bundles, you can use the variants with the following
classifiers:
* `light` - A light version of the bundle that does not include the Jetty
classes. This is useful when you want to use your own Jetty jars. Available for
both Jetty bundles.
-* `with-jetty-ee10-websockets` - A bundle that includes the classes required
for Jetty WebSocket support for Jakarta EE10. Jetty12 bundle only.
-* `with-jakarta-ee10-websockets` - A bundle that includes the classes required
for Jakarta WebSocket support for Jakarta EE10. Jetty12 bundle only.
+* `with-jetty-websockets` - A bundle that includes the classes required for
Jetty WebSocket support for Jakarta EE10. Jetty12 bundle only.
+* `with-jakarta-websockets` - A bundle that includes the classes required for
Jakarta WebSocket support for Jakarta EE10. Jetty12 bundle only.
When building the Felix Jetty bundle with Maven (`mvn clean install`), the
additional bundles will be created in the `target` directory, postfixed with
classifier.
This jar can be deployed to your Felix OSGi environment, along with a
compatible Jetty jars.
@@ -387,61 +387,59 @@ The service can both be configured using OSGi environment
properties and using C
this service is `"org.apache.felix.http"`. If you use both methods,
Configuration Admin takes precedence. The following
properties can be used (some legacy property names still exist but are not
documented here on purpose). As properties might change over time, the actual
list of properties can be found [here for the Jetty 12
bundle](https://github.com/apache/felix-dev/blob/master/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java)
and [here for the Jetty 11
bundle](https://github.com/apache/felix-dev/blob/master/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/J
[...]
-| Property | Description
[...]
-|----------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
-| `org.apache.felix.http.host` | Host name or IP
Address of the interface to listen on. The default is `null` causing Jetty to
listen on all interfaces.
[...]
-| `org.osgi.service.http.port` | The port used for
servlets and resources available via HTTP. The default is `8080`. See [port
settings below](#http-port-settings) for additional information. A negative
port number has the same effect as setting `org.apache.felix.http.enable` to
`false`.
[...]
-| `org.osgi.service.http.port.secure` | The port used for
servlets and resources available via HTTPS. The default is `8443`. See [port
settings below](#http-port-settings) for additional information. A negative
port number has the same effect as setting `org.apache.felix.https.enable` to
`false`.
[...]
-| `org.apache.felix.http.context_path` | The servlet
Context Path to use for the Http Service. If this property is not configured it
defaults to "/". This must be a valid path starting with a slash and not
ending with a slash (unless it is the root context).
[...]
-| `org.apache.felix.http.timeout` | Connection
timeout in milliseconds. The default is `60000` (60 seconds).
[...]
-| `org.apache.felix.http.session.timeout` | Allows for the
specification of the Session life time as a number of minutes. This property
serves the same purpose as the `session-timeout` element in a Web Application
descriptor. The default is "0" (zero) for no timeout at all.
[...]
-| `org.apache.felix.http.enable` | Flag to enable
the use of HTTP. The default is `true`.
[...]
-| `org.apache.felix.https.enable` | Flag to enable
the user of HTTPS. The default is `false`.
[...]
-| `org.apache.felix.https.keystore` | The name of the
file containing the keystore.
[...]
-| `org.apache.felix.https.keystore.password` | The password for
the keystore.
[...]
-| `org.apache.felix.https.keystore.key.password` | The password for
the key in the keystore.
[...]
-| `org.apache.felix.https.truststore` | The name of the
file containing the truststore.
[...]
-| `org.apache.felix.https.truststore.type` | The type of
truststore to use. The default is `JKS`.
[...]
-| `org.apache.felix.https.truststore.password` | The password for
the truststore.
[...]
-| `org.apache.felix.https.jetty.ciphersuites.excluded` | Configures
comma-separated list of SSL cipher suites to *exclude*. Default is `null`,
meaning that no cipher suite is excluded.
[...]
-| `org.apache.felix.https.jetty.ciphersuites.included` | Configures
comma-separated list of SSL cipher suites to *include*. Default is `null`,
meaning that the default cipher suites are used.
[...]
-| `org.apache.felix.https.jetty.protocols.excluded` | Configures
comma-separated list of SSL protocols (e.g. SSLv3, TLSv1.0, TLSv1.1, TLSv1.2)
to *exclude*. Default is `null`, meaning that no protocol is excluded.
[...]
-| `org.apache.felix.https.jetty.protocols.included` | Configures
comma-separated list of SSL protocols to *include*. Default is `null`, meaning
that the default protocols are used.
[...]
-| `org.apache.felix.https.clientcertificate` | Flag to determine
if the HTTPS protocol requires, wants or does not use client certificates.
Legal values are `needs`, `wants` and `none`. The default is `none`.
[...]
-| `org.apache.felix.http.jetty.headerBufferSize` | Size of the
buffer for request and response headers, in bytes. Default is 16 KB.
[...]
-| `org.apache.felix.http.jetty.requestBufferSize` | Size of the
buffer for requests not fitting the header buffer, in bytes. Default is 8 KB.
[...]
-| `org.apache.felix.http.jetty.responseBufferSize` | Size of the
buffer for responses, in bytes. Default is 24 KB.
[...]
-| `org.apache.felix.http.jetty.maxFormSize` | The maximum size
accepted for a form post, in bytes. Defaults to 200 KB.
[...]
-| `org.apache.felix.http.mbeans` | If `true`,
enables the MBean server functionality. The default is `false`.
[...]
-| `org.apache.felix.http.jetty.sendServerHeader` | If `false`, the
`Server` HTTP header is no longer included in responses. The default is
`false`.
[...]
-| `org.eclipse.jetty.servlet.SessionCookie` | Name of the
cookie used to transport the Session ID. The default is `JSESSIONID`.
[...]
-| `org.eclipse.jetty.servlet.SessionURL` | Name of the
request parameter to transport the Session ID. The default is `jsessionid`.
[...]
-| `org.eclipse.jetty.servlet.SessionDomain` | Domain to set on
the session cookie. The default is `null`.
[...]
-| `org.eclipse.jetty.servlet.SessionPath` | The path to set
on the session cookie. The default is the configured session context path
("/").
[...]
-| `org.eclipse.jetty.servlet.MaxAge` | The maximum age
value to set on the cookie. The default is "-1".
[...]
-| `org.eclipse.jetty.UriComplianceMode` | The URI
compliance mode to set. The default is
[DEFAULT](https://eclipse.dev/jetty/javadoc/jetty-12/org/eclipse/jetty/http/UriCompliance.html#DEFAULT).
See
[documentation](https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-server-compliance-uri.)
and [possible
modes](https://github.com/jetty/jetty.project/blob/jetty-12.0.x/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.jav
[...]
-| `org.apache.felix.proxy.load.balancer.connection.enable` | Set this to
`true` when running Felix HTTP behind a (offloading) proxy or load balancer
which rewrites the requests. The default is `false`.
[...]
-| `org.apache.felix.http.runtime.init.` | Properties
starting with this prefix are added as service registration properties to the
HttpServiceRuntime service. The prefix is removed for the property name.
[...]
-| `org.apache.felix.jetty.gziphandler.enable` | Whether the
server should use a server-wide gzip handler. Default is false.
[...]
-| `org.apache.felix.jetty.gzip.minGzipSize` | The minimum
response size to trigger dynamic compression. Default is
GzipHandler.DEFAULT_MIN_GZIP_SIZE.
[...]
-| `org.apache.felix.jetty.gzip.inflateBufferSize` | The size in bytes
of the buffer to inflate compressed request, or <= 0 for no inflation. Default
is -1.
[...]
-| `org.apache.felix.jetty.gzip.syncFlush` | True if
Deflater#SYNC_FLUSH should be used, else Deflater#NO_FLUSH will be used.
Default is false.
[...]
-| `org.apache.felix.jetty.gzip.includedMethods` | The additional
http methods to include in compression. Default is none.
[...]
-| `org.apache.felix.jetty.gzip.excludedMethods` | The additional
http methods to exclude in compression. Default is none.
[...]
-| `org.apache.felix.jetty.gzip.includedPaths` | The additional
path specs to include. Inclusion takes precedence over exclusion. Default is
none.
[...]
-| `org.apache.felix.jetty.gzip.excludedPaths` | The additional
path specs to exclude. Inclusion takes precedence over exclusion. Default is
none.
[...]
-| `org.apache.felix.jetty.gzip.includedMimeTypes` | The included mime
types. Inclusion takes precedence over exclusion. Default is none.
[...]
-| `org.apache.felix.jetty.gzip.excludedMimeTypes` | The excluded mime
types. Inclusion takes precedence over exclusion. Default is none.
[...]
-| `org.apache.felix.http2.enable` | Whether to enable
HTTP/2. Default is false.
[...]
-| `org.apache.felix.jetty.http2.maxConcurrentStreams` | The max number of
concurrent streams per connection. Default is 128.
[...]
-| `org.apache.felix.jetty.http2.initialStreamRecvWindow` | The initial
stream receive window (client to server). Default is 524288.
[...]
-| `org.apache.felix.jetty.http2.initialSessionRecvWindow` | The initial
session receive window (client to server). Default is 1048576.
[...]
-| `org.apache.felix.jetty.alpn.protocols` | The ALPN
protocols to consider. Default is h2, http/1.1.
[...]
-| `org.apache.felix.jetty.alpn.defaultProtocol` | The default
protocol when negotiation fails. Default is http/1.1.
[...]
-| `org.apache.felix.jakarta.ee9.websocket.enable` | Enables Jakarta
EE9 websocket support. Default is false. Jetty11 only.
[...]
-| `org.apache.felix.jakarta.ee10.websocket.enable` | Enables Jakarta
EE10 websocket support. Default is false. Jetty12 only.
[...]
-| `org.apache.felix.jetty.ee9.websocket.enable` | Enables Jetty EE9
websocket support. Default is false. Jetty11 only.
[...]
-| `org.apache.felix.jetty.ee10.websocket.enable` | Enables Jetty
EE10 websocket support. Default is false. Jetty12 only.
[...]
+| Property | Description
[...]
+|----------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+| `org.apache.felix.http.host` | Host name or IP
Address of the interface to listen on. The default is `null` causing Jetty to
listen on all interfaces.
[...]
+| `org.osgi.service.http.port` | The port used for
servlets and resources available via HTTP. The default is `8080`. See [port
settings below](#http-port-settings) for additional information. A negative
port number has the same effect as setting `org.apache.felix.http.enable` to
`false`.
[...]
+| `org.osgi.service.http.port.secure` | The port used for
servlets and resources available via HTTPS. The default is `8443`. See [port
settings below](#http-port-settings) for additional information. A negative
port number has the same effect as setting `org.apache.felix.https.enable` to
`false`.
[...]
+| `org.apache.felix.http.context_path` | The servlet
Context Path to use for the Http Service. If this property is not configured it
defaults to "/". This must be a valid path starting with a slash and not
ending with a slash (unless it is the root context).
[...]
+| `org.apache.felix.http.timeout` | Connection
timeout in milliseconds. The default is `60000` (60 seconds).
[...]
+| `org.apache.felix.http.session.timeout` | Allows for the
specification of the Session life time as a number of minutes. This property
serves the same purpose as the `session-timeout` element in a Web Application
descriptor. The default is "0" (zero) for no timeout at all.
[...]
+| `org.apache.felix.http.enable` | Flag to enable
the use of HTTP. The default is `true`.
[...]
+| `org.apache.felix.https.enable` | Flag to enable
the user of HTTPS. The default is `false`.
[...]
+| `org.apache.felix.https.keystore` | The name of the
file containing the keystore.
[...]
+| `org.apache.felix.https.keystore.password` | The password for
the keystore.
[...]
+| `org.apache.felix.https.keystore.key.password` | The password for
the key in the keystore.
[...]
+| `org.apache.felix.https.truststore` | The name of the
file containing the truststore.
[...]
+| `org.apache.felix.https.truststore.type` | The type of
truststore to use. The default is `JKS`.
[...]
+| `org.apache.felix.https.truststore.password` | The password for
the truststore.
[...]
+| `org.apache.felix.https.jetty.ciphersuites.excluded` | Configures
comma-separated list of SSL cipher suites to *exclude*. Default is `null`,
meaning that no cipher suite is excluded.
[...]
+| `org.apache.felix.https.jetty.ciphersuites.included` | Configures
comma-separated list of SSL cipher suites to *include*. Default is `null`,
meaning that the default cipher suites are used.
[...]
+| `org.apache.felix.https.jetty.protocols.excluded` | Configures
comma-separated list of SSL protocols (e.g. SSLv3, TLSv1.0, TLSv1.1, TLSv1.2)
to *exclude*. Default is `null`, meaning that no protocol is excluded.
[...]
+| `org.apache.felix.https.jetty.protocols.included` | Configures
comma-separated list of SSL protocols to *include*. Default is `null`, meaning
that the default protocols are used.
[...]
+| `org.apache.felix.https.clientcertificate` | Flag to determine
if the HTTPS protocol requires, wants or does not use client certificates.
Legal values are `needs`, `wants` and `none`. The default is `none`.
[...]
+| `org.apache.felix.http.jetty.headerBufferSize` | Size of the
buffer for request and response headers, in bytes. Default is 16 KB.
[...]
+| `org.apache.felix.http.jetty.requestBufferSize` | Size of the
buffer for requests not fitting the header buffer, in bytes. Default is 8 KB.
[...]
+| `org.apache.felix.http.jetty.responseBufferSize` | Size of the
buffer for responses, in bytes. Default is 24 KB.
[...]
+| `org.apache.felix.http.jetty.maxFormSize` | The maximum size
accepted for a form post, in bytes. Defaults to 200 KB.
[...]
+| `org.apache.felix.http.mbeans` | If `true`,
enables the MBean server functionality. The default is `false`.
[...]
+| `org.apache.felix.http.jetty.sendServerHeader` | If `false`, the
`Server` HTTP header is no longer included in responses. The default is
`false`.
[...]
+| `org.eclipse.jetty.servlet.SessionCookie` | Name of the
cookie used to transport the Session ID. The default is `JSESSIONID`.
[...]
+| `org.eclipse.jetty.servlet.SessionURL` | Name of the
request parameter to transport the Session ID. The default is `jsessionid`.
[...]
+| `org.eclipse.jetty.servlet.SessionDomain` | Domain to set on
the session cookie. The default is `null`.
[...]
+| `org.eclipse.jetty.servlet.SessionPath` | The path to set
on the session cookie. The default is the configured session context path
("/").
[...]
+| `org.eclipse.jetty.servlet.MaxAge` | The maximum age
value to set on the cookie. The default is "-1".
[...]
+| `org.eclipse.jetty.UriComplianceMode` | The URI
compliance mode to set. The default is
[DEFAULT](https://eclipse.dev/jetty/javadoc/jetty-12/org/eclipse/jetty/http/UriCompliance.html#DEFAULT).
See
[documentation](https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-server-compliance-uri.)
and [possible
modes](https://github.com/jetty/jetty.project/blob/jetty-12.0.x/jetty-core/jetty-http/src/main/java/org/eclipse/jetty/http/UriCompliance.jav
[...]
+| `org.apache.felix.proxy.load.balancer.connection.enable` | Set this to
`true` when running Felix HTTP behind a (offloading) proxy or load balancer
which rewrites the requests. The default is `false`.
[...]
+| `org.apache.felix.http.runtime.init.` | Properties
starting with this prefix are added as service registration properties to the
HttpServiceRuntime service. The prefix is removed for the property name.
[...]
+| `org.apache.felix.jetty.gziphandler.enable` | Whether the
server should use a server-wide gzip handler. Default is false.
[...]
+| `org.apache.felix.jetty.gzip.minGzipSize` | The minimum
response size to trigger dynamic compression. Default is
GzipHandler.DEFAULT_MIN_GZIP_SIZE.
[...]
+| `org.apache.felix.jetty.gzip.inflateBufferSize` | The size in bytes
of the buffer to inflate compressed request, or <= 0 for no inflation. Default
is -1.
[...]
+| `org.apache.felix.jetty.gzip.syncFlush` | True if
Deflater#SYNC_FLUSH should be used, else Deflater#NO_FLUSH will be used.
Default is false.
[...]
+| `org.apache.felix.jetty.gzip.includedMethods` | The additional
http methods to include in compression. Default is none.
[...]
+| `org.apache.felix.jetty.gzip.excludedMethods` | The additional
http methods to exclude in compression. Default is none.
[...]
+| `org.apache.felix.jetty.gzip.includedPaths` | The additional
path specs to include. Inclusion takes precedence over exclusion. Default is
none.
[...]
+| `org.apache.felix.jetty.gzip.excludedPaths` | The additional
path specs to exclude. Inclusion takes precedence over exclusion. Default is
none.
[...]
+| `org.apache.felix.jetty.gzip.includedMimeTypes` | The included mime
types. Inclusion takes precedence over exclusion. Default is none.
[...]
+| `org.apache.felix.jetty.gzip.excludedMimeTypes` | The excluded mime
types. Inclusion takes precedence over exclusion. Default is none.
[...]
+| `org.apache.felix.http2.enable` | Whether to enable
HTTP/2. Default is false.
[...]
+| `org.apache.felix.jetty.http2.maxConcurrentStreams` | The max number of
concurrent streams per connection. Default is 128.
[...]
+| `org.apache.felix.jetty.http2.initialStreamRecvWindow` | The initial
stream receive window (client to server). Default is 524288.
[...]
+| `org.apache.felix.jetty.http2.initialSessionRecvWindow` | The initial
session receive window (client to server). Default is 1048576.
[...]
+| `org.apache.felix.jetty.alpn.protocols` | The ALPN
protocols to consider. Default is h2, http/1.1.
[...]
+| `org.apache.felix.jetty.alpn.defaultProtocol` | The default
protocol when negotiation fails. Default is http/1.1.
[...]
+| `org.apache.felix.jakarta.websocket.enable` | Enables Jakarta
websocket support. Default is false.
[...]
+| `org.apache.felix.jetty.websocket.enable` | Enables Jetty
websocket support. Default is false.
[...]
### Multiple Servers
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
index 89870aaa17..23881465a8 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
@@ -484,16 +484,16 @@ class ConfigMetaTypeProvider implements MetaTypeProvider
CustomRequestLog.NCSA_FORMAT,
bundle.getBundleContext().getProperty(JettyConfig.FELIX_HTTP_REQUEST_LOG_FORMAT)));
- adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JAKARTA_EE9_WEBSOCKET_ENABLE,
- "Enable Jakarta EE9 standard WebSocket support",
- "Whether to enable jakarta EE9 standard WebSocket support.
Default is false.",
+ adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JAKARTA_WEBSOCKET_ENABLE,
+ "Enable Jakarta standard WebSocket support",
+ "Whether to enable jakarta standard WebSocket support. Default
is false.",
false,
-
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JAKARTA_EE9_WEBSOCKET_ENABLE)));
- adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_EE9_WEBSOCKET_ENABLE,
- "Enable Jetty specific EE9 WebSocket support",
+
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JAKARTA_WEBSOCKET_ENABLE)));
+ adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_WEBSOCKET_ENABLE,
+ "Enable Jetty specific WebSocket support",
"Whether to enable jetty specific WebSocket support. Default
is false.",
false,
-
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_EE9_WEBSOCKET_ENABLE)));
+
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_WEBSOCKET_ENABLE)));
return new ObjectClassDefinition()
{
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index e8b07f72bd..bba6ef7794 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -268,11 +268,11 @@ public final class JettyConfig
/** Felix specific property to specify the default protocol when
negotiation fails */
public static final String FELIX_JETTY_ALPN_DEFAULT_PROTOCOL =
"org.apache.felix.jetty.alpn.defaultProtocol";
- /** Felix specific property to control whether to enable the standard
jakarta.websocket EE9 APIs provided by Jakarta WebSocket 2.0 */
- public static final String FELIX_JAKARTA_EE9_WEBSOCKET_ENABLE =
"org.apache.felix.jakarta.ee9.websocket.enable";
+ /** Felix specific property to control whether to enable the standard
jakarta.websocket APIs provided by Jakarta WebSocket 2.0 */
+ public static final String FELIX_JAKARTA_WEBSOCKET_ENABLE =
"org.apache.felix.jakarta.websocket.enable";
/** Felix specific property to control whether to enable they
Jetty-specific WebSocket APIs */
- public static final String FELIX_JETTY_EE9_WEBSOCKET_ENABLE =
"org.apache.felix.jetty.ee9.websocket.enable";
+ public static final String FELIX_JETTY_WEBSOCKET_ENABLE =
"org.apache.felix.jetty.websocket.enable";
private static String validateContextPath(String ctxPath)
@@ -683,18 +683,18 @@ public final class JettyConfig
/**
* Returns <code>true</code> if jakarta EE9 websocket is configured to be
used (
- * {@link #FELIX_JAKARTA_EE9_WEBSOCKET_ENABLE})
+ * {@link #FELIX_JAKARTA_WEBSOCKET_ENABLE})
*/
- public boolean isUseJakartaEE9Websocket() {
- return getBooleanProperty(FELIX_JAKARTA_EE9_WEBSOCKET_ENABLE, false);
+ public boolean isUseJakartaWebsocket() {
+ return getBooleanProperty(FELIX_JAKARTA_WEBSOCKET_ENABLE, false);
}
/**
* Returns <code>true</code> if jetty websocket is configured to be used (
* {@link #FELIX_JETTY_WEBSOCKET_ENABLE})
*/
- public boolean isUseJettyEE9Websocket() {
- return getBooleanProperty(FELIX_JETTY_EE9_WEBSOCKET_ENABLE, false);
+ public boolean isUseJettyWebsocket() {
+ return getBooleanProperty(FELIX_JETTY_WEBSOCKET_ENABLE, false);
}
public void reset()
diff --git
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index 6d56a55a9e..4b2e62c6b5 100644
---
a/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -308,12 +308,12 @@ public final class JettyService
this.server.setStopTimeout(this.config.getStopTimeout());
}
- if (this.config.isUseJettyEE9Websocket()) {
- maybeInitializeJettyEE9Websocket(context);
+ if (this.config.isUseJettyWebsocket()) {
+ maybeInitializeJettyWebsocket(context);
}
- if (this.config.isUseJakartaEE9Websocket()) {
- maybeInitializeJakartaEE9Websocket(context);
+ if (this.config.isUseJakartaWebsocket()) {
+ maybeInitializeJakartaWebsocket(context);
}
this.server.start();
@@ -488,29 +488,29 @@ public final class JettyService
}
/**
- * Initialize the jakarta EE9 websocket support for the servlet context
handler.
+ * Initialize the jakarta 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 maybeInitializeJakartaEE9Websocket(ServletContextHandler
handler) {
+ private void maybeInitializeJakartaWebsocket(ServletContextHandler
handler) {
if
(isClassNameVisible("org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer"))
{
// Ensure that JavaxWebSocketServletContainerInitializer is
initialized,
// to setup the ServerContainer for this web application context.
org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.configure(handler,
null);
} else {
- SystemLogger.LOGGER.warn("Failed to initialize jakarta EE9
standard websocket support since the initializer class was not found. "
+ SystemLogger.LOGGER.warn("Failed to initialize jakarta standard
websocket support since the initializer class was not found. "
+ "Check if the websocket-jakarta-server bundle is
deployed.");
}
}
/**
- * Initialize the jetty EE9 websocket support for the servlet context
handler.
+ * Initialize the jetty 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 maybeInitializeJettyEE9Websocket(ServletContextHandler
handler) {
+ private void maybeInitializeJettyWebsocket(ServletContextHandler handler) {
if
(isClassNameVisible("org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer"))
{
// Ensure that JettyWebSocketServletContainerInitializer is
initialized,
// to setup the JettyWebSocketServerContainer for this web
application context.
@@ -529,12 +529,12 @@ public final class JettyService
private void maybeStoreWebSocketContainerAttributes(ServletContextHandler
context) {
// when the server is started, retrieve the container attribute and
// set it on the shared servlet context once available
- if (this.config.isUseJettyEE9Websocket() &&
+ if (this.config.isUseJettyWebsocket() &&
isClassNameVisible("org.eclipse.jetty.websocket.server.config.JettyWebSocketServletContainerInitializer"))
{
String attribute =
org.eclipse.jetty.websocket.server.JettyWebSocketServerContainer.JETTY_WEBSOCKET_CONTAINER_ATTRIBUTE;
this.controller.setAttributeSharedServletContext(attribute,
context.getServletContext().getAttribute(attribute));
}
- if (this.config.isUseJakartaEE9Websocket() &&
+ if (this.config.isUseJakartaWebsocket() &&
isClassNameVisible("org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer"))
{
String attribute =
org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer.ATTR_JAKARTA_SERVER_CONTAINER;
this.controller.setAttributeSharedServletContext(attribute,
context.getServletContext().getAttribute(attribute));
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaEE9SpecificWebsocketIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
similarity index 98%
rename from
http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaEE9SpecificWebsocketIT.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
index 70910ee970..984ce7cfb4 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaEE9SpecificWebsocketIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
@@ -60,7 +60,7 @@ import jakarta.websocket.server.ServerEndpoint;
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class JakartaEE9SpecificWebsocketIT extends AbstractJettyTestSupport {
+public class JakartaSpecificWebsocketIT extends AbstractJettyTestSupport {
@Inject
protected BundleContext bundleContext;
@@ -91,7 +91,7 @@ public class JakartaEE9SpecificWebsocketIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jakarta.ee9.websocket.enable", true)
+ .put("org.apache.felix.jakarta.websocket.enable", true)
.asOption();
}
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettyEE9SpecificWebsocketIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
similarity index 98%
rename from
http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettyEE9SpecificWebsocketIT.java
rename to
http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
index 162c4b7ecd..1a3e42eca2 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettyEE9SpecificWebsocketIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
@@ -62,7 +62,7 @@ import jakarta.servlet.http.HttpServlet;
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class JettyEE9SpecificWebsocketIT extends AbstractJettyTestSupport {
+public class JettySpecificWebsocketIT extends AbstractJettyTestSupport {
@Inject
protected BundleContext bundleContext;
@@ -95,7 +95,7 @@ public class JettyEE9SpecificWebsocketIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jetty.ee9.websocket.enable", true)
+ .put("org.apache.felix.jetty.websocket.enable", true)
.asOption();
}
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
index 4527f85583..b11d3ae094 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
@@ -50,8 +50,8 @@ public class MissingWebsocketDependenciesIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jetty.ee9.websocket.enable", true)
- .put("org.apache.felix.jakarta.ee9.websocket.enable", true)
+ .put("org.apache.felix.jetty.websocket.enable", true)
+ .put("org.apache.felix.jakarta.websocket.enable", true)
.asOption();
}
@@ -69,7 +69,7 @@ public class MissingWebsocketDependenciesIT extends
AbstractJettyTestSupport {
assertTrue(containsString(logFile,
"org.apache.felix.http.jetty[org.apache.felix.http] : Failed to initialize
jetty specific websocket "
+ "support since the initializer class was not found. Check if
the websocket-jetty-server bundle is deployed."));
- assertTrue(containsString(logFile,
"org.apache.felix.http.jetty[org.apache.felix.http] : Failed to initialize
jakarta EE9 standard websocket"
+ assertTrue(containsString(logFile,
"org.apache.felix.http.jetty[org.apache.felix.http] : Failed to initialize
jakarta standard websocket"
+ " support since the initializer class was not found. Check
if the websocket-jakarta-server bundle is deployed."));
}
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 3b78099c81..71fec9c8e2 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -336,12 +336,12 @@
</configuration>
</execution>
<execution>
- <id>with-jetty-ee10-websockets</id>
+ <id>with-jetty-websockets</id>
<goals>
<goal>bundle</goal>
</goals>
<configuration>
- <classifier>with-jetty-ee10-websockets</classifier>
+ <classifier>with-jetty-websockets</classifier>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
@@ -442,12 +442,12 @@
</configuration>
</execution>
<execution>
- <id>with-jakarta-ee10-websockets</id>
+ <id>with-jakarta-websockets</id>
<goals>
<goal>bundle</goal>
</goals>
<configuration>
-
<classifier>with-jakarta-ee10-websockets</classifier>
+ <classifier>with-jakarta-websockets</classifier>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version>
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
index f12c62641c..f4374e1eeb 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/ConfigMetaTypeProvider.java
@@ -490,16 +490,16 @@ class ConfigMetaTypeProvider implements MetaTypeProvider
CustomRequestLog.NCSA_FORMAT,
bundle.getBundleContext().getProperty(JettyConfig.FELIX_HTTP_REQUEST_LOG_FORMAT)));
- adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JAKARTA_EE10_WEBSOCKET_ENABLE,
- "Enable Jakarta EE10 standard WebSocket support",
- "Whether to enable jakarta EE10 standard WebSocket support.
Default is false.",
+ adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JAKARTA_WEBSOCKET_ENABLE,
+ "Enable Jakarta standard WebSocket support",
+ "Whether to enable jakarta standard WebSocket support. Default
is false.",
false,
-
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JAKARTA_EE10_WEBSOCKET_ENABLE)));
- adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_EE10_WEBSOCKET_ENABLE,
- "Enable Jetty EE10 specific WebSocket support",
- "Whether to enable jetty EE10 specific WebSocket support.
Default is false.",
+
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JAKARTA_WEBSOCKET_ENABLE)));
+ adList.add(new
AttributeDefinitionImpl(JettyConfig.FELIX_JETTY_WEBSOCKET_ENABLE,
+ "Enable Jetty specific WebSocket support",
+ "Whether to enable jetty specific WebSocket support. Default
is false.",
false,
-
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_EE10_WEBSOCKET_ENABLE)));
+
bundle.getBundleContext().getProperty(JettyConfig.FELIX_JETTY_WEBSOCKET_ENABLE)));
return new ObjectClassDefinition()
{
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
index cb61ae0b8b..568c0efa84 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyConfig.java
@@ -271,11 +271,11 @@ public final class JettyConfig
/** Felix specific property to specify the default protocol when
negotiation fails */
public static final String FELIX_JETTY_ALPN_DEFAULT_PROTOCOL =
"org.apache.felix.jetty.alpn.defaultProtocol";
- /** Felix specific property to control whether to enable the standard
jakarta.websocket EE10 APIs provided by Jakarta WebSocket 2.1 */
- public static final String FELIX_JAKARTA_EE10_WEBSOCKET_ENABLE =
"org.apache.felix.jakarta.ee10.websocket.enable";
+ /** Felix specific property to control whether to enable the standard
jakarta.websocket APIs provided by Jakarta WebSocket 2.1 */
+ public static final String FELIX_JAKARTA_WEBSOCKET_ENABLE =
"org.apache.felix.jakarta.websocket.enable";
- /** Felix specific property to control whether to enable they
Jetty-specific EE10 WebSocket APIs */
- public static final String FELIX_JETTY_EE10_WEBSOCKET_ENABLE =
"org.apache.felix.jetty.ee10.websocket.enable";
+ /** Felix specific property to control whether to enable they
Jetty-specific WebSocket APIs */
+ public static final String FELIX_JETTY_WEBSOCKET_ENABLE =
"org.apache.felix.jetty.websocket.enable";
private static String validateContextPath(String ctxPath)
{
@@ -684,19 +684,19 @@ public final class JettyConfig
}
/**
- * Returns <code>true</code> if jakarta EE10 websocket is configured to be
used (
- * {@link #FELIX_JAKARTA_EE10_WEBSOCKET_ENABLE})
+ * Returns <code>true</code> if jakarta websocket is configured to be used
(
+ * {@link #FELIX_JAKARTA_WEBSOCKET_ENABLE})
*/
- public boolean isUseJakartaEE10Websocket() {
- return getBooleanProperty(FELIX_JAKARTA_EE10_WEBSOCKET_ENABLE, false);
+ public boolean isUseJakartaWebsocket() {
+ return getBooleanProperty(FELIX_JAKARTA_WEBSOCKET_ENABLE, false);
}
/**
* Returns <code>true</code> if jetty websocket is configured to be used (
- * {@link #FELIX_JETTY_EE10_WEBSOCKET_ENABLE})
+ * {@link #FELIX_JETTY_WEBSOCKET_ENABLE})
*/
- public boolean isUseJettyEE10Websocket() {
- return getBooleanProperty(FELIX_JETTY_EE10_WEBSOCKET_ENABLE, false);
+ public boolean isUseJettyWebsocket() {
+ return getBooleanProperty(FELIX_JETTY_WEBSOCKET_ENABLE, false);
}
public void reset()
diff --git
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
index ea2eca3d32..19d686b414 100644
---
a/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
+++
b/http/jetty12/src/main/java/org/apache/felix/http/jetty/internal/JettyService.java
@@ -309,12 +309,12 @@ public final class JettyService
this.server.setStopTimeout(this.config.getStopTimeout());
}
- if (this.config.isUseJettyEE10Websocket()) {
- maybeInitializeJettyEE10Websocket(context);
+ if (this.config.isUseJettyWebsocket()) {
+ maybeInitializeJettyWebsocket(context);
}
- if (this.config.isUseJakartaEE10Websocket()) {
- maybeInitializeJakartaEE10Websocket(context);
+ if (this.config.isUseJakartaWebsocket()) {
+ maybeInitializeJakartaWebsocket(context);
}
this.server.start();
@@ -489,12 +489,12 @@ public final class JettyService
}
/**
- * Initialize the jakarta EE10 websocket support for the servlet context
handler.
+ * Initialize the jakarta 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 maybeInitializeJakartaEE10Websocket(ServletContextHandler
handler) {
+ private void maybeInitializeJakartaWebsocket(ServletContextHandler
handler) {
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.
@@ -512,7 +512,7 @@ public final class JettyService
*
* @param handler the sevlet context handler to initialize
*/
- private void maybeInitializeJettyEE10Websocket(ServletContextHandler
handler) {
+ private void maybeInitializeJettyWebsocket(ServletContextHandler handler) {
if
(isClassNameVisible("org.eclipse.jetty.ee10.websocket.server.config.JettyWebSocketServletContainerInitializer"))
{
// Ensure that JettyWebSocketServletContainerInitializer is
initialized,
// to setup the JettyWebSocketServerContainer for this web
application context.
@@ -532,12 +532,12 @@ public final class JettyService
private void maybeStoreWebSocketContainerAttributes(ServletContextHandler
context) {
// when the server is started, retrieve the container attribute and
// set it on the shared servlet context once available
- if (this.config.isUseJettyEE10Websocket() &&
+ if (this.config.isUseJettyWebsocket() &&
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.isUseJakartaEE10Websocket() &&
+ if (this.config.isUseJakartaWebsocket() &&
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));
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaEE10SpecificWebsocketIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
similarity index 98%
rename from
http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaEE10SpecificWebsocketIT.java
rename to
http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
index 1f19a4ad39..20950f4e3b 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaEE10SpecificWebsocketIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JakartaSpecificWebsocketIT.java
@@ -59,7 +59,7 @@ import
org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class JakartaEE10SpecificWebsocketIT extends AbstractJettyTestSupport {
+public class JakartaSpecificWebsocketIT extends AbstractJettyTestSupport {
@Inject
protected BundleContext bundleContext;
@@ -91,7 +91,7 @@ public class JakartaEE10SpecificWebsocketIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jakarta.ee10.websocket.enable", true)
+ .put("org.apache.felix.jakarta.websocket.enable", true)
.asOption();
}
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyEE10SpecificWebsocketIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
similarity index 98%
rename from
http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyEE10SpecificWebsocketIT.java
rename to
http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
index 72fe774fcf..46ae710087 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyEE10SpecificWebsocketIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySpecificWebsocketIT.java
@@ -61,7 +61,7 @@ import
org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
-public class JettyEE10SpecificWebsocketIT extends AbstractJettyTestSupport {
+public class JettySpecificWebsocketIT extends AbstractJettyTestSupport {
@Inject
protected BundleContext bundleContext;
@@ -95,7 +95,7 @@ public class JettyEE10SpecificWebsocketIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jetty.ee10.websocket.enable", true)
+ .put("org.apache.felix.jetty.websocket.enable", true)
.asOption();
}
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
index 7bb6bf43fc..141b522214 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/MissingWebsocketDependenciesIT.java
@@ -50,8 +50,8 @@ public class MissingWebsocketDependenciesIT extends
AbstractJettyTestSupport {
protected Option felixHttpConfig(int httpPort) {
return newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
- .put("org.apache.felix.jetty.ee10.websocket.enable", true)
- .put("org.apache.felix.jakarta.ee10.websocket.enable", true)
+ .put("org.apache.felix.jetty.websocket.enable", true)
+ .put("org.apache.felix.jakarta.websocket.enable", true)
.asOption();
}
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index 4f7b63d825..d17d2c432d 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty12</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.5-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java
index 7408c319db..77c1bd1c5c 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServlet.java
@@ -33,7 +33,7 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
/**
* Example of a WebSocket servlet that uses the Jetty WebSocket API.
* It does not respect the path this servlet is registered to, but requires no
further workarounds.
- * Setting `org.apache.felix.jetty.ee10.websocket.enable=true` is enough.
+ * Setting `org.apache.felix.jetty.websocket.enable=true` is enough.
*/
public class TestWebSocketServlet extends HttpServlet {
private final String name;
diff --git
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java
index df980c4ea2..e916a9a3ff 100644
---
a/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java
+++
b/http/samples/whiteboard/src/main/java/org/apache/felix/http/samples/whiteboard/TestWebSocketServletAlternative.java
@@ -31,7 +31,7 @@ import org.eclipse.jetty.websocket.api.annotations.WebSocket;
/**
* Example of a WebSocket servlet that uses the Jetty WebSocket API, and is
registered by extending JettyWebSocketServlet.
* It does respect the path this servlet is registered to, but requires a
further workaround. See FelixJettyWebSocketServlet.
- * Requires setting `org.apache.felix.jetty.ee10.websocket.enable=true`.
+ * Requires setting `org.apache.felix.jetty.websocket.enable=true`.
*/
public class TestWebSocketServletAlternative extends
FelixJettyWebSocketServlet {
private final String name;
