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 4bfe9aa4fc Update README.md to include Jetty11 properties (#312) 4bfe9aa4fc is described below commit 4bfe9aa4fcb9ddd47aa5870eb272f0e00a696b48 Author: Paul <p...@blueconic.com> AuthorDate: Wed May 1 09:23:57 2024 +0200 Update README.md to include Jetty11 properties (#312) --- http/README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/http/README.md b/http/README.md index 10f8fd4d87..621a358cc3 100644 --- a/http/README.md +++ b/http/README.md @@ -7,7 +7,8 @@ This is an implementation of the [R8.1 Whiteboard Specification for Jakarta Serv * Run either with Jetty (version 11 or 12) bundle or inside your own application server using the servlet bridge * [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. + * [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). * Correctly versioned Servlet API. ## Installing @@ -387,7 +388,7 @@ this service is `"org.apache.felix.http"`. If you use both methods, Configuratio 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`. [...] @@ -437,8 +438,10 @@ properties can be used (some legacy property names still exist but are not docum | `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.ee10.websocket.enable` | Enables Jetty 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. [...] ### Multiple Servers