From f264c7e2d390ed1b270c52ee0b20a37c72d3c9d4 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 10 Jan 2024 17:03:10 -0600 Subject: [PATCH 1/4] Updating pom metadata for 10.0.x --- embedded/client-certificates/pom.xml | 2 +- embedded/client/pom.xml | 12 ++++++------ embedded/compressed-encoding/pom.xml | 2 +- embedded/connectors/pom.xml | 2 +- embedded/deploying/pom.xml | 2 +- embedded/error-handling/pom.xml | 2 +- embedded/file-server/pom.xml | 2 +- embedded/file-upload/pom.xml | 2 +- embedded/form-post/pom.xml | 2 +- embedded/http-config/pom.xml | 2 +- embedded/jndi/pom.xml | 2 +- embedded/pom.xml | 2 +- embedded/redirect/pom.xml | 2 +- embedded/rewrite/pom.xml | 2 +- embedded/servlet-config/pom.xml | 2 +- embedded/servlet-security/pom.xml | 2 +- embedded/simple-server/pom.xml | 2 +- embedded/virtual-hosts/pom.xml | 2 +- embedded/webapp-context/pom.xml | 2 +- embedded/websocket-jakarta-api/pom.xml | 2 +- embedded/websocket-jetty-api/pom.xml | 2 +- embedded/xml/pom.xml | 2 +- standalone/pom.xml | 2 +- webapps/hello/pom.xml | 2 +- webapps/pom.xml | 2 +- 25 files changed, 30 insertions(+), 30 deletions(-) diff --git a/embedded/client-certificates/pom.xml b/embedded/client-certificates/pom.xml index d1c18fe..a8486ab 100644 --- a/embedded/client-certificates/pom.xml +++ b/embedded/client-certificates/pom.xml @@ -9,7 +9,7 @@ client-certificates 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Client Certificates + Jetty Examples :: Jetty 10.0.x :: Embedded :: Client Certificates diff --git a/embedded/client/pom.xml b/embedded/client/pom.xml index b501516..1a78c1e 100644 --- a/embedded/client/pom.xml +++ b/embedded/client/pom.xml @@ -9,7 +9,7 @@ client 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Client + Jetty Examples :: Jetty 10.0.x :: Embedded :: Client @@ -18,18 +18,18 @@ ${jetty.version} - org.eclipse.jetty.http2 - http2-client + org.eclipse.jetty + jetty-slf4j-impl ${jetty.version} org.eclipse.jetty.http2 - http2-http-client-transport + http2-client ${jetty.version} - org.eclipse.jetty - jetty-slf4j-impl + org.eclipse.jetty.http2 + http2-http-client-transport ${jetty.version} diff --git a/embedded/compressed-encoding/pom.xml b/embedded/compressed-encoding/pom.xml index 5f65e81..ce8a591 100644 --- a/embedded/compressed-encoding/pom.xml +++ b/embedded/compressed-encoding/pom.xml @@ -9,7 +9,7 @@ compressed-encoding 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: HTML Compressed Encoding + Jetty Examples :: Jetty 10.0.x :: Embedded :: HTML Compressed Encoding diff --git a/embedded/connectors/pom.xml b/embedded/connectors/pom.xml index 57600be..08fbdbc 100644 --- a/embedded/connectors/pom.xml +++ b/embedded/connectors/pom.xml @@ -9,7 +9,7 @@ connectors 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Connectors + Jetty Examples :: Jetty 10.0.x :: Embedded :: Connectors diff --git a/embedded/deploying/pom.xml b/embedded/deploying/pom.xml index 35c0855..48ea668 100644 --- a/embedded/deploying/pom.xml +++ b/embedded/deploying/pom.xml @@ -9,7 +9,7 @@ deploying 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Deploying + Jetty Examples :: Jetty 10.0.x :: Embedded :: Deploying diff --git a/embedded/error-handling/pom.xml b/embedded/error-handling/pom.xml index d8070ca..30e3309 100644 --- a/embedded/error-handling/pom.xml +++ b/embedded/error-handling/pom.xml @@ -9,7 +9,7 @@ error-handling 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Error Handling + Jetty Examples :: Jetty 10.0.x :: Embedded :: Error Handling diff --git a/embedded/file-server/pom.xml b/embedded/file-server/pom.xml index 872d2e2..4ba9c74 100644 --- a/embedded/file-server/pom.xml +++ b/embedded/file-server/pom.xml @@ -9,7 +9,7 @@ file-server 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: File Server + Jetty Examples :: Jetty 10.0.x :: Embedded :: File Server diff --git a/embedded/file-upload/pom.xml b/embedded/file-upload/pom.xml index 4848b69..45fc0ca 100644 --- a/embedded/file-upload/pom.xml +++ b/embedded/file-upload/pom.xml @@ -9,7 +9,7 @@ file-upload 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: File Upload + Jetty Examples :: Jetty 10.0.x :: Embedded :: File Upload diff --git a/embedded/form-post/pom.xml b/embedded/form-post/pom.xml index cf2ab9c..550841b 100644 --- a/embedded/form-post/pom.xml +++ b/embedded/form-post/pom.xml @@ -9,7 +9,7 @@ form-post 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: HTML Form POST + Jetty Examples :: Jetty 10.0.x :: Embedded :: HTML Form POST diff --git a/embedded/http-config/pom.xml b/embedded/http-config/pom.xml index 785d90b..f6006a4 100644 --- a/embedded/http-config/pom.xml +++ b/embedded/http-config/pom.xml @@ -9,7 +9,7 @@ http-config 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: HTTP Configuration + Jetty Examples :: Jetty 10.0.x :: Embedded :: HTTP Configuration diff --git a/embedded/jndi/pom.xml b/embedded/jndi/pom.xml index e186810..4343c92 100644 --- a/embedded/jndi/pom.xml +++ b/embedded/jndi/pom.xml @@ -9,7 +9,7 @@ jndi 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: JNDI + Jetty Examples :: Jetty 10.0.x :: Embedded :: JNDI diff --git a/embedded/pom.xml b/embedded/pom.xml index 8d84827..2418598 100644 --- a/embedded/pom.xml +++ b/embedded/pom.xml @@ -10,7 +10,7 @@ jetty-embedded-examples 10.0.x pom - Jetty Examples :: Jetty 9.4.x :: Embedded + Jetty Examples :: Jetty 10.0.x :: Embedded client diff --git a/embedded/redirect/pom.xml b/embedded/redirect/pom.xml index d15fed3..5bea01c 100644 --- a/embedded/redirect/pom.xml +++ b/embedded/redirect/pom.xml @@ -9,7 +9,7 @@ redirect 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Redirect + Jetty Examples :: Jetty 10.0.x :: Embedded :: Redirect diff --git a/embedded/rewrite/pom.xml b/embedded/rewrite/pom.xml index 6748053..1cd6e56 100644 --- a/embedded/rewrite/pom.xml +++ b/embedded/rewrite/pom.xml @@ -9,7 +9,7 @@ rewrite 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Rewrite + Jetty Examples :: Jetty 10.0.x :: Embedded :: Rewrite diff --git a/embedded/servlet-config/pom.xml b/embedded/servlet-config/pom.xml index ac4ad8f..bcef8a8 100644 --- a/embedded/servlet-config/pom.xml +++ b/embedded/servlet-config/pom.xml @@ -9,7 +9,7 @@ servlet-config 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Servlet Configuration + Jetty Examples :: Jetty 10.0.x :: Embedded :: Servlet Configuration diff --git a/embedded/servlet-security/pom.xml b/embedded/servlet-security/pom.xml index f09dcaa..18ca279 100644 --- a/embedded/servlet-security/pom.xml +++ b/embedded/servlet-security/pom.xml @@ -9,7 +9,7 @@ servlet-security 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Servlet Security Constraints + Jetty Examples :: Jetty 10.0.x :: Embedded :: Servlet Security Constraints diff --git a/embedded/simple-server/pom.xml b/embedded/simple-server/pom.xml index 2819c64..d2b6270 100644 --- a/embedded/simple-server/pom.xml +++ b/embedded/simple-server/pom.xml @@ -9,7 +9,7 @@ simple-server 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Simple Server + Jetty Examples :: Jetty 10.0.x :: Embedded :: Simple Server diff --git a/embedded/virtual-hosts/pom.xml b/embedded/virtual-hosts/pom.xml index 384303a..0a6bc3a 100644 --- a/embedded/virtual-hosts/pom.xml +++ b/embedded/virtual-hosts/pom.xml @@ -9,7 +9,7 @@ virtual-hosts 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: Virtual Hosts + Jetty Examples :: Jetty 10.0.x :: Embedded :: Virtual Hosts diff --git a/embedded/webapp-context/pom.xml b/embedded/webapp-context/pom.xml index 17d3891..eee0a87 100644 --- a/embedded/webapp-context/pom.xml +++ b/embedded/webapp-context/pom.xml @@ -9,7 +9,7 @@ webapp-context 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: WebApp Context + Jetty Examples :: Jetty 10.0.x :: Embedded :: WebApp Context diff --git a/embedded/websocket-jakarta-api/pom.xml b/embedded/websocket-jakarta-api/pom.xml index 6a4a414..394eb72 100644 --- a/embedded/websocket-jakarta-api/pom.xml +++ b/embedded/websocket-jakarta-api/pom.xml @@ -9,7 +9,7 @@ websocket-jakarta-api 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: WebSocket with Jakarta EE API + Jetty Examples :: Jetty 10.0.x :: Embedded :: WebSocket with Jakarta EE API diff --git a/embedded/websocket-jetty-api/pom.xml b/embedded/websocket-jetty-api/pom.xml index 0dc6b5c..c95cf20 100644 --- a/embedded/websocket-jetty-api/pom.xml +++ b/embedded/websocket-jetty-api/pom.xml @@ -9,7 +9,7 @@ websocket-jetty-api 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: WebSocket with Jetty API + Jetty Examples :: Jetty 10.0.x :: Embedded :: WebSocket with Jetty API diff --git a/embedded/xml/pom.xml b/embedded/xml/pom.xml index 6fcc786..c5ca2b5 100644 --- a/embedded/xml/pom.xml +++ b/embedded/xml/pom.xml @@ -9,7 +9,7 @@ xml 10.0.x jar - Jetty Examples :: Jetty 9.4.x :: Embedded :: XML + Jetty Examples :: Jetty 10.0.x :: Embedded :: XML diff --git a/standalone/pom.xml b/standalone/pom.xml index 0ae28a1..c8035f4 100644 --- a/standalone/pom.xml +++ b/standalone/pom.xml @@ -9,6 +9,6 @@ jetty-standalone-examples 10.0.x pom - Jetty Examples :: Jetty 9.4.x :: Standalone + Jetty Examples :: Jetty 10.0.x :: Standalone diff --git a/webapps/hello/pom.xml b/webapps/hello/pom.xml index 44335c0..73f5240 100644 --- a/webapps/hello/pom.xml +++ b/webapps/hello/pom.xml @@ -9,7 +9,7 @@ hello 10.0.x war - Jetty Examples :: Jetty 9.4.x :: Hello WebApp + Jetty Examples :: Jetty 10.0.x :: Hello WebApp hello diff --git a/webapps/pom.xml b/webapps/pom.xml index efc4ff6..75ed7c8 100644 --- a/webapps/pom.xml +++ b/webapps/pom.xml @@ -10,7 +10,7 @@ jetty-webapp-examples 10.0.x pom - Jetty Examples :: Jetty 9.4.x :: WebApps + Jetty Examples :: Jetty 10.0.x :: WebApps hello From 33629f4e1ebf4b28e0bd03b16e7c33f4e81a17a9 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 10 Jan 2024 17:07:25 -0600 Subject: [PATCH 2/4] Updating for Servlet 4 --- .../src/main/webapps/webapp-a/WEB-INF/web.xml | 11 ++++++----- .../src/main/webapps/webapp-b/WEB-INF/web.xml | 11 ++++++----- .../jndi/src/main/webroots/jndi-root/WEB-INF/web.xml | 11 ++++++----- .../src/main/resources/hello-webapp/WEB-INF/web.xml | 11 ++++++----- webapps/hello/src/main/webapp/WEB-INF/web.xml | 12 +++++++----- webapps/pom.xml | 7 ++++--- 6 files changed, 35 insertions(+), 28 deletions(-) diff --git a/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml b/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml index 513e838..f5f5412 100644 --- a/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml +++ b/embedded/connectors/src/main/webapps/webapp-a/WEB-INF/web.xml @@ -1,7 +1,8 @@ - + + WebApp-A \ No newline at end of file diff --git a/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml b/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml index 4e27348..ff88683 100644 --- a/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml +++ b/embedded/connectors/src/main/webapps/webapp-b/WEB-INF/web.xml @@ -1,7 +1,8 @@ - + + WebApp-B \ No newline at end of file diff --git a/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml b/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml index eed88c6..69c827d 100644 --- a/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml +++ b/embedded/jndi/src/main/webroots/jndi-root/WEB-INF/web.xml @@ -1,8 +1,9 @@ - + + My Foo Resource diff --git a/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml b/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml index e91cf0d..a0ad83f 100644 --- a/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml +++ b/embedded/webapp-context/src/main/resources/hello-webapp/WEB-INF/web.xml @@ -1,8 +1,9 @@ - + + hello webapp hello diff --git a/webapps/hello/src/main/webapp/WEB-INF/web.xml b/webapps/hello/src/main/webapp/WEB-INF/web.xml index 56c30a4..19d84be 100644 --- a/webapps/hello/src/main/webapp/WEB-INF/web.xml +++ b/webapps/hello/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,10 @@ - + + + hello webapp hello diff --git a/webapps/pom.xml b/webapps/pom.xml index 75ed7c8..4c39907 100644 --- a/webapps/pom.xml +++ b/webapps/pom.xml @@ -18,9 +18,10 @@ - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 4.0.4 + provided From 76c0f80672cf4f13422f14e8f090028f495d43e7 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 10 Jan 2024 17:08:16 -0600 Subject: [PATCH 3/4] Fixing active branch names in CI --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 165fa62..1edd6ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,9 +3,9 @@ name: CI on: push: branches: - - 'jetty-9.4.x' - - 'jetty-10.0.x' - - 'jetty-11.0.x' + - '9.4.x' + - '10.0.x' + - '11.0.x' pull_request: jobs: From 6c80d29ac5e23eff16117d989a5a2323e4689136 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 11 Jan 2024 07:18:36 -0600 Subject: [PATCH 4/4] Add missing xml/base tree --- embedded/xml/src/main/xml/base/README.md | 121 ++++++++++++++++++ .../xml/src/main/xml/base/context-bar.xml | 36 ++++++ .../xml/src/main/xml/base/context-foo.xml | 36 ++++++ .../xml/src/main/xml/base/custom.properties | 4 + embedded/xml/src/main/xml/base/keystore.p12 | Bin 0 -> 2613 bytes embedded/xml/src/main/xml/home/README.md | 25 ++++ .../main/xml/home/jetty-bytebufferpool.xml | 12 ++ embedded/xml/src/main/xml/home/jetty-http.xml | 53 ++++++++ .../xml/src/main/xml/home/jetty-https.xml | 28 ++++ .../src/main/xml/home/jetty-requestlog.xml | 48 +++++++ .../src/main/xml/home/jetty-ssl-context.xml | 60 +++++++++ embedded/xml/src/main/xml/home/jetty-ssl.xml | 66 ++++++++++ .../src/main/xml/home/jetty-threadpool.xml | 29 +++++ embedded/xml/src/main/xml/home/jetty.xml | 113 ++++++++++++++++ 14 files changed, 631 insertions(+) create mode 100644 embedded/xml/src/main/xml/base/README.md create mode 100644 embedded/xml/src/main/xml/base/context-bar.xml create mode 100644 embedded/xml/src/main/xml/base/context-foo.xml create mode 100644 embedded/xml/src/main/xml/base/custom.properties create mode 100644 embedded/xml/src/main/xml/base/keystore.p12 create mode 100644 embedded/xml/src/main/xml/home/README.md create mode 100644 embedded/xml/src/main/xml/home/jetty-bytebufferpool.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-http.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-https.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-requestlog.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-ssl-context.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-ssl.xml create mode 100644 embedded/xml/src/main/xml/home/jetty-threadpool.xml create mode 100644 embedded/xml/src/main/xml/home/jetty.xml diff --git a/embedded/xml/src/main/xml/base/README.md b/embedded/xml/src/main/xml/base/README.md new file mode 100644 index 0000000..4c7f395 --- /dev/null +++ b/embedded/xml/src/main/xml/base/README.md @@ -0,0 +1,121 @@ +This list of XML to use, and the order to use them in, was obtained from using jetty-home. + +``` shell +[tmp]$ mkdir ssl10 +[ssl10]$ cd ssl10 +[ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --create-start-ini --add-modules=http,https,requestlog +INFO : create ${jetty.base}/start.ini +INFO : server transitively enabled, ini template available with --add-module=server +INFO : logging-jetty transitively enabled +INFO : requestlog initialized in ${jetty.base}/start.ini +INFO : http initialized in ${jetty.base}/start.ini +INFO : resources transitively enabled +INFO : https initialized in ${jetty.base}/start.ini +INFO : threadpool transitively enabled, ini template available with --add-module=threadpool +INFO : ssl transitively enabled, ini template available with --add-module=ssl +INFO : logging/slf4j transitive provider of logging/slf4j for logging-jetty +INFO : logging/slf4j dynamic dependency of logging-jetty +INFO : bytebufferpool transitively enabled, ini template available with --add-module=bytebufferpool +INFO : mkdir ${jetty.base}/resources +INFO : copy ${jetty.home}/modules/logging/jetty/resources/jetty-logging.properties to ${jetty.base}/resources/jetty-logging.properties +INFO : mkdir ${jetty.base}/logs +INFO : Base directory was modified + +[ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --list-config + +Enabled Modules: +---------------- + 0) resources transitive provider of resources for logging-jetty + 1) logging/slf4j transitive provider of logging/slf4j for logging-jetty + dynamic dependency of logging-jetty + 2) logging-jetty transitive provider of logging for threadpool + transitive provider of logging for bytebufferpool + transitive provider of logging for server + 3) bytebufferpool transitive provider of bytebufferpool for server + init template available with --add-module=bytebufferpool + 4) threadpool transitive provider of threadpool for server + init template available with --add-module=threadpool + 5) server transitive provider of server for http + transitive provider of server for ssl + transitive provider of server for requestlog + init template available with --add-module=server + 6) http ${jetty.base}/start.ini + 7) ssl transitive provider of ssl for https + init template available with --add-module=ssl + 8) https ${jetty.base}/start.ini + 9) requestlog ${jetty.base}/start.ini + +Java Environment: +----------------- + java.home = /home/joakim/java/jvm/jdk-11.0.12+7 (null) + java.vm.vendor = Eclipse Foundation (null) + java.vm.version = 11.0.12+7 (null) + java.vm.name = OpenJDK 64-Bit Server VM (null) + java.vm.info = mixed mode (null) + java.runtime.name = OpenJDK Runtime Environment (null) + java.runtime.version = 11.0.12+7 (null) + java.io.tmpdir = /tmp (null) + user.dir = /home/joakim/code/jetty/distros/bases/ssl10 (null) + user.language = en (null) + user.country = US (null) + +Jetty Environment: +------------------ + jetty.version = 10.0.7 + jetty.tag.version = jetty-10.0.7 + jetty.build = da8a4553af9dd84080931fa0f8c678cd2d60f3d9 + jetty.home = /opt/jetty-home-10.0.7 + jetty.base = /home/joakim/code/jetty/distros/bases/ssl10 + +Config Search Order: +-------------------- + + ${jetty.base} -> /home/joakim/code/jetty/distros/bases/ssl10 + ${jetty.home} -> /opt/jetty-home-10.0.7 + +System Properties: +------------------ + (no system properties specified) + +Properties: +----------- + java.version = 11.0.12 + java.version.major = 11 + java.version.micro = 12 + java.version.minor = 0 + java.version.platform = 11 + jetty.base = /home/joakim/code/jetty/distros/bases/ssl10 + jetty.base.uri = file:///home/joakim/code/jetty/distros/bases/ssl10 + jetty.home = /opt/jetty-home-10.0.7 + jetty.home.uri = file:///opt/jetty-home-10.0.7 + jetty.requestlog.dir = logs + jetty.webapp.addServerClasses = org.eclipse.jetty.logging.,${jetty.home.uri}/lib/logging/,org.slf4j. + runtime.feature.alpn = true + slf4j.version = 2.0.0-alpha5 + +Jetty Server Classpath: +----------------------- +Version Information on 9 entries in the classpath. +Note: order presented here is how they would appear on the classpath. + changes to the --module=name command line options will be reflected here. + 0: (dir) | ${jetty.base}/resources + 1: 2.0.0-alpha5 | ${jetty.home}/lib/logging/slf4j-api-2.0.0-alpha5.jar + 2: 10.0.7 | ${jetty.home}/lib/logging/jetty-slf4j-impl-10.0.7.jar + 3: 4.0.6 | ${jetty.home}/lib/jetty-servlet-api-4.0.6.jar + 4: 10.0.7 | ${jetty.home}/lib/jetty-http-10.0.7.jar + 5: 10.0.7 | ${jetty.home}/lib/jetty-server-10.0.7.jar + 6: 10.0.7 | ${jetty.home}/lib/jetty-xml-10.0.7.jar + 7: 10.0.7 | ${jetty.home}/lib/jetty-util-10.0.7.jar + 8: 10.0.7 | ${jetty.home}/lib/jetty-io-10.0.7.jar + +Jetty Active XMLs: +------------------ + ${jetty.home}/etc/jetty-bytebufferpool.xml + ${jetty.home}/etc/jetty-threadpool.xml + ${jetty.home}/etc/jetty.xml + ${jetty.home}/etc/jetty-http.xml + ${jetty.home}/etc/jetty-ssl.xml + ${jetty.home}/etc/jetty-ssl-context.xml + ${jetty.home}/etc/jetty-https.xml + ${jetty.home}/etc/jetty-requestlog.xml +``` \ No newline at end of file diff --git a/embedded/xml/src/main/xml/base/context-bar.xml b/embedded/xml/src/main/xml/base/context-bar.xml new file mode 100644 index 0000000..da45b74 --- /dev/null +++ b/embedded/xml/src/main/xml/base/context-bar.xml @@ -0,0 +1,36 @@ + + + + + + + + + /bar + /bar/ + + + org.eclipse.jetty.cookbook.servlets.HelloServlet + /hello + + + org.eclipse.jetty.cookbook.servlets.DumpServlet + /dump + + + + + \ No newline at end of file diff --git a/embedded/xml/src/main/xml/base/context-foo.xml b/embedded/xml/src/main/xml/base/context-foo.xml new file mode 100644 index 0000000..8efcf6b --- /dev/null +++ b/embedded/xml/src/main/xml/base/context-foo.xml @@ -0,0 +1,36 @@ + + + + + + + + + /foo + /foo/ + + + org.eclipse.jetty.cookbook.servlets.HelloServlet + *.hello + + + org.eclipse.jetty.cookbook.servlets.DumpServlet + *.dump + + + + + \ No newline at end of file diff --git a/embedded/xml/src/main/xml/base/custom.properties b/embedded/xml/src/main/xml/base/custom.properties new file mode 100644 index 0000000..a893ffc --- /dev/null +++ b/embedded/xml/src/main/xml/base/custom.properties @@ -0,0 +1,4 @@ +jetty.http.port=9090 +jetty.ssl.port=9443 +jetty.httpConfig.securePort=9443 +jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 diff --git a/embedded/xml/src/main/xml/base/keystore.p12 b/embedded/xml/src/main/xml/base/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..4f17bd037903ee630f22a69a7ca907d00bb41139 GIT binary patch literal 2613 zcmY+FXE+;-7RMu!XcD_orBaj*I}rpeRi#GJYN)1)+OL+nwPKejucCHs62z=gTa8qg z6^*@V)u>skwPNJD_qq3dpZCLg&hz~K=bVqfgCfGvKo(XM5xN9{N`~o%?QpQLv5<+- zaS#zYe2n{1M6lyOBJe#B5o~gdZy%Qd1pdD*b{GqgOa$$th@c&m1O)bfe0=;22q6XY zYJ*O8q@x9<$w&AdcW=DiG>{eW@ivGEYA2hfYBl+uqD3Z7TI`-vf-6cZCKU`n#BGh1 zM6Y7Yf%OnnT;uIP)vJ_j$cCjX7TM3UV>Gupxil#Lu5u*mQ}$;o%4_k3Vym+e8Co{w z!fUT%E{pnYv|ARHI;B;+!m{U@?Siuv2YzqWJ+8=FHBXfCPz)}WG2Y^<)mYh*e5c2K z`Gbr##_qz1Sye)Kea$NJ@JKl|bZGwJuy`=X^cB5ub(lKyEDG~vH}7k4QJP5aBq@X_2?s+Oy)hL7ajEOO1%@Sx3p^viZhdRWPL&|#aI(bS{y9HtZ1E9lwI zJ!!A#$`jFxJZto8t{2a?o$&mV`-E(tOJ@Maug0~err#re_~FWug=RG>nS1QVtG2-J z(XhF})EfZwD!Aw&*6OJ=&NLXZNHvwuu9O&rl49)BP?U(}1F1}soS?TdmHmKXVcsG+ zqtTkFb3O^eQxUmiMLJLecNf4h%+juugat)@A#!E4A{%&EQ-uw|cGAT)I^I z{mJPkKL-3RL#8viJm=lo&f)HMQtd1 z`PmD<+PoNMcDK4IdiY7jCok9M!WT1rF2Kvmyt?`%dqop6K~q*I!D82obQvd>DuG}I zKzdz#pI?FYj%(PQ+pxpxmC*WYW?1KjiizT#fPA5B#d_qdj55Lfz%Ym{K--9A%7Ps;7gi+o|OCPs!u07*uJ>IKQ1t(*`PJ8t|A2j^|P*+4xG(Un0b5a}!P{kyk|+4)5TWNh~4zlha2BDk$3-I5W7DxFKVePw+J)%@@yEZNRR z?O&CfM_$un8QUUO^-NtJ%e=A&aDWr0oCfd_X8LotuIB1AuY2-n%CC9TrYd$W;q%uU=Di5U?+75*`b)tC9qMvz2@FBqVK$XeE?98modrV=)Q}$Lh5E zYlsbUY*W)?WDH~h95?;H6PADY74jdyUKY|G!5BRX^P~4xF3z4Gu|GYd@?XCO5kcH_ zMaqjRZc+H}W-DDPTNiqkx0En1jqB24XLkaLQIZ`0k-v9j-e*_Bc0RVI+aaddxiHY`h$0e_CW3NZ%XhN)MAK>`HCbly z`ZN4aCau!WbqZ-vN9bZ@Bi`?m?R>dH>x0=#IuW` z?yCn-7 zfHS6#9|imdXlXn)JLYov%YCeEHax z!dZb=MGz&L_zRo{;dF|aWmsxABckoS)Vm-5(u>O?C-Ludn$-Y?=@^t!~mz*a&ES6$;Re& zp>4)16~D(Wm;Ydhi4IY$P5h=ipMUOV-V7d}3ITR5RiPM}iRPK2o?32>&-}9Z1lWk} z;u+7{msKLGWJ9$6e47$yL%u`r%yD6GEX+3T-A6CF&S9q3x8~=7eN?8q2XtK zk*NXrs%4xypTD%z?Xl)awJ9^;C5yJhI2Uui9OjU|+aXFC4Hp|oSeT5-iJC}TqSDg& zk6068(dk)U6(hJu4-ABR>L~$ju`FNLy_&Y6m@Q2YwFW|dH|<@T^ayG4$`IXTcl3Jc0sDllWpBFIz{mt@XZK`L4YSm+L~AqbzfQl#rIPCe{RTPWgz; z<4f1nYsa?WvkUd>dTmD442Wsq>#4QYvrd^GDpzs?ufWvaVAl#{ IWeFqy8$dPWaR2}S literal 0 HcmV?d00001 diff --git a/embedded/xml/src/main/xml/home/README.md b/embedded/xml/src/main/xml/home/README.md new file mode 100644 index 0000000..56c9039 --- /dev/null +++ b/embedded/xml/src/main/xml/home/README.md @@ -0,0 +1,25 @@ +This contents of custom.properties was obtained form using jetty-home / jetty-base + +``` shell +[tmp]$ mkdir ssl10 +[ssl10]$ cd ssl10 +[ssl10]$ java -jar /opt/jetty-home-10.0.7/start.jar --create-start-ini --add-modules=http,https,requestlog +INFO : create ${jetty.base}/start.ini +INFO : server transitively enabled, ini template available with --add-module=server +INFO : logging-jetty transitively enabled +INFO : requestlog initialized in ${jetty.base}/start.ini +INFO : http initialized in ${jetty.base}/start.ini +INFO : resources transitively enabled +INFO : https initialized in ${jetty.base}/start.ini +INFO : threadpool transitively enabled, ini template available with --add-module=threadpool +INFO : ssl transitively enabled, ini template available with --add-module=ssl +INFO : logging/slf4j transitive provider of logging/slf4j for logging-jetty +INFO : logging/slf4j dynamic dependency of logging-jetty +INFO : bytebufferpool transitively enabled, ini template available with --add-module=bytebufferpool +INFO : mkdir ${jetty.base}/resources +INFO : copy ${jetty.home}/modules/logging/jetty/resources/jetty-logging.properties to ${jetty.base}/resources/jetty-logging.properties +INFO : mkdir ${jetty.base}/logs +INFO : Base directory was modified + +[ssl10]$ cat start.ini +``` \ No newline at end of file diff --git a/embedded/xml/src/main/xml/home/jetty-bytebufferpool.xml b/embedded/xml/src/main/xml/home/jetty-bytebufferpool.xml new file mode 100644 index 0000000..4e88881 --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-bytebufferpool.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-http.xml b/embedded/xml/src/main/xml/home/jetty-http.xml new file mode 100644 index 0000000..2fed3de --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-http.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-https.xml b/embedded/xml/src/main/xml/home/jetty-https.xml new file mode 100644 index 0000000..a71de57 --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-https.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + http/1.1 + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-requestlog.xml b/embedded/xml/src/main/xml/home/jetty-requestlog.xml new file mode 100644 index 0000000..1b3a7a0 --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-requestlog.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + /yyyy_mm_dd.request.log + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-ssl-context.xml b/embedded/xml/src/main/xml/home/jetty-ssl-context.xml new file mode 100644 index 0000000..8e4fbbc --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-ssl-context.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-ssl.xml b/embedded/xml/src/main/xml/home/jetty-ssl.xml new file mode 100644 index 0000000..f58ee8c --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-ssl.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty-threadpool.xml b/embedded/xml/src/main/xml/home/jetty-threadpool.xml new file mode 100644 index 0000000..8ae32fd --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty-threadpool.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/embedded/xml/src/main/xml/home/jetty.xml b/embedded/xml/src/main/xml/home/jetty.xml new file mode 100644 index 0000000..b2d16df --- /dev/null +++ b/embedded/xml/src/main/xml/home/jetty.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +