From 8507887f998ae1fe3090ad9dd491bba4ca09bac4 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 8 Jan 2021 10:09:07 +0100 Subject: [PATCH 1/3] jakartified modules.xml from User Guide Signed-off-by: Maxim Nesen --- docs/src/main/docbook/modules.xml | 309 +----------------------------- 1 file changed, 10 insertions(+), 299 deletions(-) diff --git a/docs/src/main/docbook/modules.xml b/docs/src/main/docbook/modules.xml index 833a244b87..b2412bc458 100644 --- a/docs/src/main/docbook/modules.xml +++ b/docs/src/main/docbook/modules.xml @@ -112,7 +112,7 @@ jersey-container-jetty-http -Jetty Http Container +Jetty Http Container (for JDK 11+) @@ -136,7 +136,7 @@ jersey-container-servlet -Jersey core Servlet 3.x implementation +Jersey core Servlet 3.x/5.x implementation @@ -144,7 +144,7 @@ jersey-container-servlet-core -Jersey core Servlet 2.x implementation +Jersey core Servlet 2.x way implementation with jakartified adjustments @@ -153,14 +153,6 @@ Simple Http Container - - - - - jersey-gf-ejb - - -Jersey EJB for GlassFish integration @@ -206,7 +198,7 @@ jersey-jetty-connector -Jersey Client Transport via Jetty +Jersey Client Transport via Jetty (for JDK 11+) @@ -256,14 +248,6 @@ - - jersey-media-json-jackson1 - - -Jersey JSON Jackson (1.x) entity providers support module. - - - jersey-media-json-jettison @@ -276,7 +260,7 @@ jersey-media-json-processing -Jersey JSON-P (JSR 353) entity providers support proxy module. +Jersey JSON-P (Jakartified JSR 353) entity providers support proxy module. @@ -470,14 +454,6 @@ - - jersey-spring4 - - -Jersey extension module providing support for Spring 4 integration. - - - jersey-wadl-doclet @@ -514,7 +490,7 @@ container-runner-maven-plugin -The container runner maven plugin provides means to start and stop a container (currently, Weblogic, Tomcat and Glassfish4 +The container runner maven plugin provides means to start and stop a container (currently Tomcat 10 and Glassfish 6 are supported). To deploy an application to this container or to repetitively redeploy and test an application in the container. @@ -535,70 +511,6 @@ - - jersey-test-framework-provider-bundle - - -Jersey Test Framework Providers Bundle - - - - - jersey-test-framework-provider-external - - -Jersey Test Framework - External container - - - - - jersey-test-framework-provider-grizzly2 - - -Jersey Test Framework - Grizzly2 container - - - - - jersey-test-framework-provider-inmemory - - -Jersey Test Framework - InMemory container - - - - - jersey-test-framework-provider-jdk-http - - -Jersey Test Framework - JDK HTTP container - - - - - jersey-test-framework-provider-jetty - - -Jersey Test Framework - Jetty HTTP container - - - - - jersey-test-framework-provider-netty - - -Jersey Test Framework - Netty container - - - - - jersey-test-framework-provider-simple - - -Jersey Test Framework - Simple HTTP container - - - jersey-test-framework-util @@ -673,7 +585,7 @@ jersey-test-framework-provider-jetty -Jersey Test Framework - Jetty HTTP container +Jersey Test Framework - Jetty HTTP container (for JDK 11+) @@ -775,22 +687,6 @@ - - additional-bundle - - -OSGi Helloworld Webapp - additional bundle - - - - - alternate-version-bundle - - -OSGi Helloworld Webapp - alternate version bundle - - - assemblies @@ -799,30 +695,6 @@ - - bean-validation-webapp - - -Jersey Bean Validation (JSR-349) example. - - - - - bookmark - - -Jersey Bookmark example. - - - - - bookmark-em - - -Jersey Bookmark example using EntityManager. - - - bookstore-webapp @@ -831,14 +703,6 @@ - - bundle - - -OSGi HttpService example bundle - - - cdi-webapp @@ -903,30 +767,6 @@ - - extended-wadl-webapp - - -Extended WADL example. - - - - - feed-combiner-java8-webapp - - -Jersey Web Application (Servlet) examples parent POM. - - - - - flight-management-webapp - - -Jersey Flight Management Demo Web Application Example - - - freemarker-webapp @@ -935,22 +775,6 @@ - - functional-test - - -Jersey examples - - - - - functional-test - - -OSGi HttpService example - - - groovy @@ -1007,22 +831,6 @@ - - helloworld-spring-annotations - - -Spring 4 Integration Jersey Example - - - - - helloworld-spring-webapp - - -Spring 4 Integration Jersey Example - - - helloworld-webapp @@ -1121,14 +929,6 @@ - - json-jackson1 - - -Jersey JSON with Jackson 1.x example. - - - json-jettison @@ -1149,7 +949,7 @@ json-processing-webapp -Jersey JSON-P (JSR 353) example. +Jersey JSON-P (Jakartified JSR 353) example. @@ -1161,14 +961,6 @@ - - lib-bundle - - -OSGi Helloworld Webapp - lib bundle - - - managed-beans-webapp @@ -1201,14 +993,6 @@ - - monitoring-webapp - - -Jersey Web Application (Servlet) examples parent POM. - - - multipart-webapp @@ -1217,23 +1001,6 @@ - - oauth-client-twitter - - -Twitter client using OAuth 1 support for Jersey that retrieves Tweets from the home timeline of a - registered Twitter account. - - - - - oauth2-client-google-webapp - - -Google API data retrieving example using OAuth2 for authentication and authorization - - - open-tracing @@ -1242,30 +1009,6 @@ - - osgi-helloworld-webapp - - -Jersey examples - - - - - osgi-http-service - - -OSGi HttpService example - - - - - reload - - -Jersey resource configuration reload example. - - - rx-client-webapp @@ -1318,7 +1061,7 @@ server-sent-events-jaxrs -Jersey JAX-RS 2.1 Server-Sent Events example. +Jersey JAX-RS 2.1/3.0 Server-Sent Events example. @@ -1338,14 +1081,6 @@ - - shortener-webapp - - -Jersey Shortener Webapp (MVC + Bean Validation). - - - simple-console @@ -1354,19 +1089,11 @@ - - sparklines - - -Jersey examples - - - sse-item-store-jaxrs-webapp -Jersey JAX-RS 2.1 SSE API-based item store example. +Jersey JAX-RS 2.1/3.0 SSE API-based item store example. @@ -1394,22 +1121,6 @@ - - tone-generator - - -Jersey examples - - - - - war-bundle - - -OSGi Helloworld Webapp WAR bundle - - - webapp-example-parent From 901a9f8fcc2b9f2f9b200225b0c32e556ab814ee Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Fri, 8 Jan 2021 11:20:52 +0100 Subject: [PATCH 2/3] revised modules.xml Signed-off-by: Maxim Nesen --- docs/src/main/docbook/modules.xml | 78 +++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 3 deletions(-) diff --git a/docs/src/main/docbook/modules.xml b/docs/src/main/docbook/modules.xml index b2412bc458..9f5b4e2354 100644 --- a/docs/src/main/docbook/modules.xml +++ b/docs/src/main/docbook/modules.xml @@ -144,7 +144,7 @@ jersey-container-servlet-core -Jersey core Servlet 2.x way implementation with jakartified adjustments +Jersey core Servlet 2.x way implementation with Jakarta EE 9 adjustments @@ -153,6 +153,14 @@ Simple Http Container + + + + + jersey-gf-ejb + + +Jersey EJB for GlassFish integration @@ -260,7 +268,7 @@ jersey-media-json-processing -Jersey JSON-P (Jakartified JSR 353) entity providers support proxy module. +Jersey Jakarta JSON Processing entity providers support proxy module. @@ -511,6 +519,70 @@ + + jersey-test-framework-provider-bundle + + +Jersey Test Framework Providers Bundle + + + + + jersey-test-framework-provider-external + + +Jersey Test Framework - External container + + + + + jersey-test-framework-provider-grizzly2 + + +Jersey Test Framework - Grizzly2 container + + + + + jersey-test-framework-provider-inmemory + + +Jersey Test Framework - InMemory container + + + + + jersey-test-framework-provider-jdk-http + + +Jersey Test Framework - JDK HTTP container + + + + + jersey-test-framework-provider-jetty + + +Jersey Test Framework - Jetty HTTP container + + + + + jersey-test-framework-provider-netty + + +Jersey Test Framework - Netty container + + + + + jersey-test-framework-provider-simple + + +Jersey Test Framework - Simple HTTP container + + + jersey-test-framework-util @@ -949,7 +1021,7 @@ json-processing-webapp -Jersey JSON-P (Jakartified JSR 353) example. +Jersey Jakarta JSON Processing example. From d0ee0ff327b92a528a278701716b5ea87b7bbe31 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Thu, 14 Jan 2021 10:01:34 +0100 Subject: [PATCH 3/3] commenting out missing modules instead of removing Signed-off-by: Maxim Nesen --- docs/src/main/docbook/modules.xml | 182 ++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/docs/src/main/docbook/modules.xml b/docs/src/main/docbook/modules.xml index 9f5b4e2354..c7deae96af 100644 --- a/docs/src/main/docbook/modules.xml +++ b/docs/src/main/docbook/modules.xml @@ -759,12 +759,56 @@ + assemblies Jersey examples shared assembly types. + @@ -773,6 +817,16 @@ Jersey MVC Bookstore example. + @@ -837,6 +891,32 @@ Jersey example showing exception mappers in action. + @@ -845,6 +925,24 @@ Jersey Freemarker example. + @@ -1031,6 +1129,16 @@ Jersey JSON with Padding example. + @@ -1063,6 +1171,16 @@ Jersey managed client web application example. + @@ -1079,6 +1197,32 @@ Jersey OpenTracing example + @@ -1151,6 +1295,16 @@ Jersey Servlet 3 example with missing servlet-class in the web.xml file + @@ -1159,6 +1313,16 @@ Jersey Simple Console example + @@ -1191,6 +1355,24 @@ Jersey system properties example. +