From aa27cbc67a99d594f8bf48b8d89cb6aa0865c89e Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 30 Nov 2022 10:48:09 -0600 Subject: [PATCH 01/31] Add Jakarta servlet support, only for gwt-servlet This is a draft patch to add support for Jakarta. It is assumed to only be used for modular projects, where client and server do not live in the same classpath. Among other things, this means that validation does not need to be updated, and old javax.servlet references can be left in gwt-dev and gwt-user. This does not correct the sources for deployment to maven, nor does it fix javadoc. This does not update the requestfactory-server jar. Draft for #9727 --- distro-source/build.xml | 1 + maven/lib-gwt.sh | 10 ++-- .../gwt/gwt-servlet-jakarta/pom-template.xml | 29 ++++++++++ maven/poms/gwt/pom-template.xml | 5 ++ servlet/build.xml | 35 +++++++++++- user/build.xml | 53 ++++++++++++++++++- 6 files changed, 127 insertions(+), 6 deletions(-) create mode 100644 maven/poms/gwt/gwt-servlet-jakarta/pom-template.xml diff --git a/distro-source/build.xml b/distro-source/build.xml index 03e1c7b4867..90e0448383c 100755 --- a/distro-source/build.xml +++ b/distro-source/build.xml @@ -32,6 +32,7 @@ + diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh index bd10e2d67b6..bd744b254ea 100644 --- a/maven/lib-gwt.sh +++ b/maven/lib-gwt.sh @@ -64,7 +64,7 @@ function maven-gwt() { GWT_EXTRACT_DIR=`ls $RANDOM_DIR | tail -n1` GWT_EXTRACT_DIR=$RANDOM_DIR/$GWT_EXTRACT_DIR - JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar + JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar #TODO also wrong for jakarta [ -d $GWT_EXTRACT_DIR/doc/javadoc ] && jar cf $JAVADOC_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc . # Generate POMs with correct version @@ -76,7 +76,7 @@ function maven-gwt() { popd > /dev/null done - gwtLibs='dev user servlet codeserver' + gwtLibs='dev user servlet servlet-jakarta codeserver' echo "Removing bundled third-parties from gwt-dev" zip -q $GWT_EXTRACT_DIR/gwt-dev.jar --copy --out $GWT_EXTRACT_DIR/gwt-dev-trimmed.jar \ @@ -118,8 +118,10 @@ function maven-gwt() { # If there are no sources, use gwt-user sources. # This is a bit hacky but Sonatype requires a # source jar for Central, and lack of sources - # should only happen for gwt-servlet which is - # basically a subset of gwt-user. + # should only happen for gwt-servlet and + # gwt-servlet-jakarta which are basically a + # subset of gwt-user. + #TODO this is wrong for jakarta sources if [ ! -f $SOURCES_PATH_FILE ]; then SOURCES_PATH_FILE=$GWT_EXTRACT_DIR/gwt-user-sources.jar fi diff --git a/maven/poms/gwt/gwt-servlet-jakarta/pom-template.xml b/maven/poms/gwt/gwt-servlet-jakarta/pom-template.xml new file mode 100644 index 00000000000..769bb1d2834 --- /dev/null +++ b/maven/poms/gwt/gwt-servlet-jakarta/pom-template.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.gwtproject + gwt + ${gwtVersion} + + org.gwtproject + gwt-servlet-jakarta + jar + ${gwtVersion} + + + javax.validation + validation-api + + true + + + com.google.code.gson + gson + + true + + + diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml index 4e5f1fda8a2..0f288bae1e9 100644 --- a/maven/poms/gwt/pom-template.xml +++ b/maven/poms/gwt/pom-template.xml @@ -66,6 +66,11 @@ gwt-servlet ${project.version} + + org.gwtproject + gwt-servlet-jakarta + ${project.version} + org.gwtproject.web.bindery requestfactory diff --git a/servlet/build.xml b/servlet/build.xml index caf55cdadd3..232a7ea871b 100644 --- a/servlet/build.xml +++ b/servlet/build.xml @@ -8,12 +8,13 @@ + + depends="-servlet, -servlet-jakarta, -deps" /> @@ -52,6 +53,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/user/build.xml b/user/build.xml index 1c5aa2e3c72..e5e4d2408e5 100755 --- a/user/build.xml +++ b/user/build.xml @@ -138,6 +138,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + com.google.code.gson + gson + + true + + + diff --git a/maven/poms/gwt/pom-template.xml b/maven/poms/gwt/pom-template.xml index 4e5f1fda8a2..0f288bae1e9 100644 --- a/maven/poms/gwt/pom-template.xml +++ b/maven/poms/gwt/pom-template.xml @@ -66,6 +66,11 @@ gwt-servlet ${project.version} + + org.gwtproject + gwt-servlet-jakarta + ${project.version} + org.gwtproject.web.bindery requestfactory diff --git a/servlet/build.xml b/servlet/build.xml index caf55cdadd3..232a7ea871b 100644 --- a/servlet/build.xml +++ b/servlet/build.xml @@ -8,12 +8,13 @@ + + depends="-servlet, -servlet-jakarta, -deps" /> @@ -52,6 +53,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/user/build.xml b/user/build.xml index 17013357748..48f2b1de8ca 100755 --- a/user/build.xml +++ b/user/build.xml @@ -146,6 +146,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a589c6a7a8b83e54af95c8fde6776f041fc0a58b Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 3 Apr 2023 14:15:56 +0200 Subject: [PATCH 06/31] gwtproject/gwt#9727 : generate javadoc jar for servlet jakarta --- maven/lib-gwt.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh index f14b05787b1..e400f446717 100644 --- a/maven/lib-gwt.sh +++ b/maven/lib-gwt.sh @@ -64,9 +64,16 @@ function maven-gwt() { GWT_EXTRACT_DIR=`ls $RANDOM_DIR | tail -n1` GWT_EXTRACT_DIR=$RANDOM_DIR/$GWT_EXTRACT_DIR - JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar #TODO also wrong for jakarta + JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar [ -d $GWT_EXTRACT_DIR/doc/javadoc ] && jar cf $JAVADOC_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc . + JAVADOC_JAKARTA_FILE_PATH=$RANDOM_DIR/gwt-jakarta-javadoc.jar + if [[ -d $GWT_EXTRACT_DIR/doc/javadoc ]]; then + cp -r $GWT_EXTRACT_DIR/doc/javadoc $GWT_EXTRACT_DIR/doc/javadoc-jakarta + find $GWT_EXTRACT_DIR/doc/javadoc-jakarta -type f -exec sed -i 's/javax.servlet/jakarta.servlet/g' {} + + jar cf $JAVADOC_JAKARTA_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc-jakarta . + fi + # Generate POMs with correct version for template in `find $pomDir -name pom-template.xml` do @@ -125,6 +132,10 @@ function maven-gwt() { SOURCES_PATH_FILE=$GWT_EXTRACT_DIR/gwt-user-sources.jar fi + if [[ $i == "servlet-jakarta" ]]; then + JAVADOC_FILE_PATH=$JAVADOC_JAKARTA_FILE_PATH + fi + maven-deploy-file $mavenRepoUrl $mavenRepoId "$CUR_FILE" $gwtPomFile "$JAVADOC_FILE_PATH" "$SOURCES_PATH_FILE" || die done From b5b659f92fb99d16312ddaa12e26f81980ba63ba Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 24 Apr 2023 10:51:06 +0200 Subject: [PATCH 07/31] gwtproject/gwt#9727 : move jakarata specific classes and their dependent classes to own package for source jar --- doc/build.xml | 15 ++++++++++ user/build.xml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+) diff --git a/doc/build.xml b/doc/build.xml index 5f41768b2f4..f55db2ad7d9 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -37,6 +37,20 @@ + + + + + + + + + + + + + + @@ -92,6 +106,7 @@ + diff --git a/user/build.xml b/user/build.xml index a49e624dd68..427d66c2a21 100755 --- a/user/build.xml +++ b/user/build.xml @@ -155,6 +155,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Mon, 15 May 2023 11:50:34 +0200 Subject: [PATCH 08/31] gwtproject/gwt#9727: adjust javadoc generation to match all jakarta related sources --- doc/build.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-- user/build.xml | 2 +- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index f55db2ad7d9..28070ac6f73 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -27,6 +27,7 @@ + @@ -37,23 +38,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -106,7 +151,9 @@ - + + + diff --git a/user/build.xml b/user/build.xml index 427d66c2a21..686548bb51f 100755 --- a/user/build.xml +++ b/user/build.xml @@ -222,7 +222,7 @@ - + From 53652ba0933d1a78a2ab32136566794a7c2e169f Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 15 May 2023 16:49:25 +0200 Subject: [PATCH 09/31] gwtproject/gwt#9727: add encoding information --- doc/build.xml | 10 +++++----- user/build.xml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index 28070ac6f73..9ec57b1d5a9 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -38,7 +38,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -57,8 +57,8 @@ - - + + @@ -78,7 +78,7 @@ - + diff --git a/user/build.xml b/user/build.xml index 686548bb51f..04ecc344277 100755 --- a/user/build.xml +++ b/user/build.xml @@ -147,7 +147,7 @@ - + From 62cb80f593196d55c634dbd4b9d4f74b6f7471d3 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 5 Jun 2023 18:06:04 +0200 Subject: [PATCH 10/31] gwtproject/gwt#9727: fix CI build --- doc/build.xml | 2 +- user/build.xml | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index 9ec57b1d5a9..c71c977845c 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -84,7 +84,7 @@ - + diff --git a/user/build.xml b/user/build.xml index 04ecc344277..70fcd64916e 100755 --- a/user/build.xml +++ b/user/build.xml @@ -217,8 +217,25 @@ - + + + + + + + + + + + + + + + + + + @@ -228,10 +245,12 @@ + + - - + + Date: Wed, 7 Jun 2023 09:26:43 +0200 Subject: [PATCH 11/31] gwtproject/gwt#9727: adjust tools ref for testing --- .github/workflows/full-check.yml | 3 ++- .github/workflows/quick-check.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-check.yml b/.github/workflows/full-check.yml index 9d98ad5f809..7d179f33859 100644 --- a/.github/workflows/full-check.yml +++ b/.github/workflows/full-check.yml @@ -29,8 +29,9 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'gwtproject/tools' + repository: 'sparsick/gwt-tools' path: 'tools' + ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11 to build everything, but can run on newer Java versions uses: actions/setup-java@v3 diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index 75c861c4699..7deb3ed5582 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -19,8 +19,9 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'gwtproject/tools' + repository: 'sparsick/gwt-tools' path: 'tools' + ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11+ to build everything, and can run on newer Java versions uses: actions/setup-java@v3 From 0db7bd8d970f6285fc663786843d2ba7456139f2 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 19 Jun 2023 13:13:02 +0200 Subject: [PATCH 12/31] gwtproject/gwt#9727: add package-info to jakarta package --- user/build.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/user/build.xml b/user/build.xml index 70fcd64916e..38ad2a23f9c 100755 --- a/user/build.xml +++ b/user/build.xml @@ -183,6 +183,13 @@ + + + + + + + @@ -190,6 +197,13 @@ + + + + + + + @@ -215,6 +229,13 @@ + + + + + + + @@ -223,6 +244,7 @@ + From ed48c54c6b98595c160dfaf53acfd054cb2aef99 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 19 Jun 2023 14:06:00 +0200 Subject: [PATCH 13/31] gwtproject/gwt#9727: add package-info to jakarta package in javadoc use case --- doc/build.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index c71c977845c..adf610dc90e 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -44,9 +44,7 @@ - - @@ -58,11 +56,13 @@ + + @@ -75,7 +75,6 @@ - From 82dc4356ea9ba1122b5c07a6703b15c0159a28c8 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 24 Apr 2023 10:51:06 +0200 Subject: [PATCH 14/31] gwtproject/gwt#9727 : move jakarata specific classes and their dependent classes to own package for source jar --- doc/build.xml | 18 +++++++++++- user/build.xml | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) diff --git a/doc/build.xml b/doc/build.xml index a4de13f4295..aac4a0860e0 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -37,6 +37,20 @@ + + + + + + + + + + + + + + @@ -78,7 +92,6 @@ + + + diff --git a/user/build.xml b/user/build.xml index a5af3a7a894..c08dfba838a 100755 --- a/user/build.xml +++ b/user/build.xml @@ -155,6 +155,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Date: Mon, 15 May 2023 11:50:34 +0200 Subject: [PATCH 15/31] gwtproject/gwt#9727: adjust javadoc generation to match all jakarta related sources --- doc/build.xml | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-- user/build.xml | 2 +- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index aac4a0860e0..cdaf69a891c 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -27,6 +27,7 @@ + @@ -37,23 +38,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,7 +156,9 @@ - + + + diff --git a/user/build.xml b/user/build.xml index c08dfba838a..358e9a61db7 100755 --- a/user/build.xml +++ b/user/build.xml @@ -222,7 +222,7 @@ - + From a1bc4e0d7d31eddb4c5e70ec36b72ba6b8e7cab8 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Wed, 7 Jun 2023 09:26:43 +0200 Subject: [PATCH 16/31] gwtproject/gwt#9727: adjust tools ref for testing --- .github/workflows/full-check.yml | 3 ++- .github/workflows/quick-check.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/full-check.yml b/.github/workflows/full-check.yml index 447c7eeb5c8..3e3cd612901 100644 --- a/.github/workflows/full-check.yml +++ b/.github/workflows/full-check.yml @@ -29,8 +29,9 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'gwtproject/tools' + repository: 'sparsick/gwt-tools' path: 'tools' + ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11 to build everything, but can run on newer Java versions uses: actions/setup-java@v3 diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index 3f514bbfe8d..02d69d9c859 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -19,8 +19,9 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'gwtproject/tools' + repository: 'sparsick/gwt-tools' path: 'tools' + ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11 to build everything, but can run on newer Java versions uses: actions/setup-java@v3 From 27bf4387f4b48d7b59453b8a7d111c106b2972d0 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 14 Jun 2023 15:09:58 -0500 Subject: [PATCH 17/31] Reduce files that are moved, rewritten --- user/build.xml | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/user/build.xml b/user/build.xml index 358e9a61db7..e6d86dc3b53 100755 --- a/user/build.xml +++ b/user/build.xml @@ -147,39 +147,32 @@ +<<<<<<< HEAD +======= + + +>>>>>>> 9d964bbe0c (Reduce files that are moved, rewritten) - - - - - - - - - + - - - - - - - + + + - + @@ -187,6 +180,7 @@ + @@ -194,7 +188,6 @@ - @@ -206,12 +199,12 @@ - + @@ -224,15 +217,17 @@ - + + + + - - + Date: Wed, 14 Jun 2023 16:49:46 -0500 Subject: [PATCH 18/31] Reuse the same sources generated for gwt-user when making javadoc --- .../google/doctool/custom/FindPackages.java | 2 +- doc/build.xml | 63 +------------------ 2 files changed, 3 insertions(+), 62 deletions(-) diff --git a/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java b/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java index fb00872b4a5..54404a8960d 100644 --- a/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java +++ b/build_tools/doctool/src/com/google/doctool/custom/FindPackages.java @@ -85,7 +85,7 @@ public class FindPackages { */ private static final String[] SOURCE_DIRS = { "user/src", "user/javadoc", "user/super", "dev/core/src", - "dev/core/super"}; + "dev/core/super", "build/out/user/jakarta-src"}; /** * Individual user classes to include, even if the rest of their packages diff --git a/doc/build.xml b/doc/build.xml index cdaf69a891c..5a6f4620096 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -18,6 +18,7 @@ + @@ -38,65 +39,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -148,17 +94,12 @@ doctitle="GWT API Reference" header="GWT ${gwt.version}" linkoffline="http://download.oracle.com/javaee/6/api/ validation-package-list"> - - - - - From 48f4481b0b50cb6baa0e405178dc1e2b883ea0e8 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 14 Jun 2023 21:16:52 -0500 Subject: [PATCH 19/31] Split copied sources into "doesn't need changes" and "just for jakarta" --- user/build.xml | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/user/build.xml b/user/build.xml index e6d86dc3b53..8c5fe4ff6a1 100755 --- a/user/build.xml +++ b/user/build.xml @@ -147,16 +147,14 @@ -<<<<<<< HEAD - -======= - - ->>>>>>> 9d964bbe0c (Reduce files that are moved, rewritten) - + + + + + - + @@ -166,7 +164,7 @@ - + @@ -176,7 +174,7 @@ - + @@ -185,18 +183,13 @@ - + - - - - - @@ -209,7 +202,7 @@ - + @@ -223,9 +216,26 @@ + + + + + + + + + + + + + + - - + + + + + + From 8536d59bafd6a088739edd1c7b9200eb38b59364 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 14 Jun 2023 21:17:29 -0500 Subject: [PATCH 20/31] Cut another dependency on RPC --- .../user/server/rpc/impl/ServerSerializationStreamReader.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java index f130d3929a9..26425601a7b 100644 --- a/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java +++ b/user/src/com/google/gwt/user/server/rpc/impl/ServerSerializationStreamReader.java @@ -21,7 +21,6 @@ import com.google.gwt.user.client.rpc.SerializedTypeViolationException; import com.google.gwt.user.client.rpc.impl.AbstractSerializationStreamReader; import com.google.gwt.user.server.Base64Utils; -import com.google.gwt.user.server.rpc.RPC; import com.google.gwt.user.server.rpc.SerializationPolicy; import com.google.gwt.user.server.rpc.SerializationPolicyProvider; import com.google.gwt.user.server.rpc.ServerCustomFieldSerializer; @@ -367,7 +366,7 @@ Object read(ServerSerializationStreamReader stream, BoundedList instance private final ClassLoader classLoader; - private SerializationPolicy serializationPolicy = RPC.getDefaultSerializationPolicy(); + private SerializationPolicy serializationPolicy = LegacySerializationPolicy.getInstance(); private final SerializationPolicyProvider serializationPolicyProvider; From a83167effbe0e48ecadc3af5c6b459afa7c7606d Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 14 Jun 2023 21:38:45 -0500 Subject: [PATCH 21/31] Generate a copy of the RPC AdvancedExample --- doc/build.xml | 16 +++++++++++++++- user/build.xml | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/build.xml b/doc/build.xml index 5a6f4620096..14924f982bd 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -19,6 +19,7 @@ + @@ -37,8 +38,21 @@ + + + + + + + + + + + + + - + diff --git a/user/build.xml b/user/build.xml index 8c5fe4ff6a1..1dec5951f3a 100755 --- a/user/build.xml +++ b/user/build.xml @@ -232,6 +232,7 @@ + From 784ad49fd64774114e2b82c351ce9f7a66892590 Mon Sep 17 00:00:00 2001 From: Sandra Parsick Date: Mon, 26 Jun 2023 12:33:32 +0200 Subject: [PATCH 22/31] gwtproject/gwt#9727: fix - wrong merging --- user/build.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/user/build.xml b/user/build.xml index 3824a50cda9..886d780cbf8 100755 --- a/user/build.xml +++ b/user/build.xml @@ -148,6 +148,13 @@ unless="compile.complete"> + + + + + + + From d7f7f4b9feece384e3da03eeea0d7107bd822754 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Sun, 16 Jul 2023 13:15:13 -0500 Subject: [PATCH 23/31] Fix GwtServletBase --- user/build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/build.xml b/user/build.xml index 1dec5951f3a..890d2e6d1e2 100755 --- a/user/build.xml +++ b/user/build.xml @@ -160,6 +160,8 @@ + + From 25665e0b56cd495d60d6e5e33b6861877e03e4c1 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Sun, 16 Jul 2023 13:41:51 -0500 Subject: [PATCH 24/31] Remove no-longer-correct note about javadoc being broken --- maven/lib-gwt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh index e5ea920feb7..e400f446717 100644 --- a/maven/lib-gwt.sh +++ b/maven/lib-gwt.sh @@ -64,7 +64,7 @@ function maven-gwt() { GWT_EXTRACT_DIR=`ls $RANDOM_DIR | tail -n1` GWT_EXTRACT_DIR=$RANDOM_DIR/$GWT_EXTRACT_DIR - JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar #TODO also wrong for jakarta + JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar [ -d $GWT_EXTRACT_DIR/doc/javadoc ] && jar cf $JAVADOC_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc . JAVADOC_JAKARTA_FILE_PATH=$RANDOM_DIR/gwt-jakarta-javadoc.jar From 9835498bfc8c4e73c6d1a56d3c5a6fdb63caee14 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Sun, 16 Jul 2023 20:09:45 -0500 Subject: [PATCH 25/31] Use the same javadoc for all maven jars, and pack modified sources in gwt-user --- doc/build.xml | 3 --- maven/lib-gwt.sh | 15 ++------------- servlet/build.xml | 2 -- user/build.xml | 4 +++- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/doc/build.xml b/doc/build.xml index 0c9486c00b0..ae20a50add4 100644 --- a/doc/build.xml +++ b/doc/build.xml @@ -110,9 +110,6 @@ - - - diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh index e400f446717..5b239f6abee 100644 --- a/maven/lib-gwt.sh +++ b/maven/lib-gwt.sh @@ -67,13 +67,6 @@ function maven-gwt() { JAVADOC_FILE_PATH=$RANDOM_DIR/gwt-javadoc.jar [ -d $GWT_EXTRACT_DIR/doc/javadoc ] && jar cf $JAVADOC_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc . - JAVADOC_JAKARTA_FILE_PATH=$RANDOM_DIR/gwt-jakarta-javadoc.jar - if [[ -d $GWT_EXTRACT_DIR/doc/javadoc ]]; then - cp -r $GWT_EXTRACT_DIR/doc/javadoc $GWT_EXTRACT_DIR/doc/javadoc-jakarta - find $GWT_EXTRACT_DIR/doc/javadoc-jakarta -type f -exec sed -i 's/javax.servlet/jakarta.servlet/g' {} + - jar cf $JAVADOC_JAKARTA_FILE_PATH -C $GWT_EXTRACT_DIR/doc/javadoc-jakarta . - fi - # Generate POMs with correct version for template in `find $pomDir -name pom-template.xml` do @@ -125,17 +118,13 @@ function maven-gwt() { # If there are no sources, use gwt-user sources. # This is a bit hacky but Sonatype requires a # source jar for Central, and lack of sources - # should only happen for gwt-servlet which are basically a + # should only happen for gwt-servlet and + # gwt-servlet-jakarta, which are basically a # subset of gwt-user. - # For servlet-jakarta, a seperate source file is built. if [ ! -f $SOURCES_PATH_FILE ]; then SOURCES_PATH_FILE=$GWT_EXTRACT_DIR/gwt-user-sources.jar fi - if [[ $i == "servlet-jakarta" ]]; then - JAVADOC_FILE_PATH=$JAVADOC_JAKARTA_FILE_PATH - fi - maven-deploy-file $mavenRepoUrl $mavenRepoId "$CUR_FILE" $gwtPomFile "$JAVADOC_FILE_PATH" "$SOURCES_PATH_FILE" || die done diff --git a/servlet/build.xml b/servlet/build.xml index afec4dae2d3..60901a6876c 100644 --- a/servlet/build.xml +++ b/servlet/build.xml @@ -9,7 +9,6 @@ - @@ -81,7 +80,6 @@ - diff --git a/user/build.xml b/user/build.xml index 68ac7c94a49..45fb7a38ff1 100755 --- a/user/build.xml +++ b/user/build.xml @@ -240,7 +240,7 @@ - + + + From 7df339b51af2b8c6543a90cf98afd9aa152cd999 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 27 Sep 2023 11:19:03 -0500 Subject: [PATCH 26/31] Draft of requestfactory-server jakarta variant --- maven/lib-gwt.sh | 2 +- .../server-jakarta/pom-template.xml | 27 +++++++++++++++++++ requestfactory/build.xml | 27 ++++++++++++++++--- user/build.xml | 21 ++++++++++++--- .../server/RequestFactoryJarExtractor.java | 2 ++ 5 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 maven/poms/requestfactory/server-jakarta/pom-template.xml diff --git a/maven/lib-gwt.sh b/maven/lib-gwt.sh index 5b239f6abee..bb8ac49f7e4 100644 --- a/maven/lib-gwt.sh +++ b/maven/lib-gwt.sh @@ -131,7 +131,7 @@ function maven-gwt() { # Deploy RequestFactory jars maven-deploy-file $mavenRepoUrl $mavenRepoId $pomDir/requestfactory/pom.xml $pomDir/requestfactory/pom.xml || die - for i in client server apt + for i in client server apt server-jakarta do maven-deploy-file $mavenRepoUrl $mavenRepoId $GWT_EXTRACT_DIR/requestfactory-${i}.jar $pomDir/requestfactory/${i}/pom.xml \ $JAVADOC_FILE_PATH $GWT_EXTRACT_DIR/requestfactory-${i}-src.jar \ diff --git a/maven/poms/requestfactory/server-jakarta/pom-template.xml b/maven/poms/requestfactory/server-jakarta/pom-template.xml new file mode 100644 index 00000000000..3c2db06e31f --- /dev/null +++ b/maven/poms/requestfactory/server-jakarta/pom-template.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + org.gwtproject.web.bindery + requestfactory + ${gwtVersion} + + org.gwtproject.web.bindery + requestfactory-server-jakarta + jar + ${gwtVersion} + + + javax.validation + validation-api + + + com.google.code.gson + gson + + true + + + diff --git a/requestfactory/build.xml b/requestfactory/build.xml index 334a7278715..c835c86da4e 100755 --- a/requestfactory/build.xml +++ b/requestfactory/build.xml @@ -21,17 +21,24 @@ + + - + + + @@ -81,6 +88,18 @@ + + + + + + + + + + + + - + - - + + @@ -205,13 +205,17 @@ - + + + + + @@ -230,6 +234,17 @@ + + + + + + + + + + + diff --git a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java index 1b09125086c..c7628acdc1f 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java +++ b/user/src/com/google/web/bindery/requestfactory/server/RequestFactoryJarExtractor.java @@ -806,6 +806,7 @@ public String toString() { SEEDS.put("apt", aptClasses); SEEDS.put("client", Collections.unmodifiableList(clientClasses)); SEEDS.put("server", Collections.unmodifiableList(serverClasses)); + SEEDS.put("server-jakarta", Collections.unmodifiableList(serverClasses)); Set> all = new LinkedHashSet>(); for (List> value : SEEDS.values()) { @@ -1052,6 +1053,7 @@ private Type processType(String sourceType, Type type) { assert type.getInternalName().charAt(0) != 'L'; if (type.getInternalName().startsWith("java/") || type.getInternalName().startsWith("javax/") || + type.getInternalName().startsWith("jakarta/") || type.getInternalName().startsWith("com/google/gson/")) { return toReturn; } From 25c2dafe5fa0d3b42ec53663ab5fb4e40ec36ea6 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 27 Sep 2023 11:52:07 -0500 Subject: [PATCH 27/31] Added package-info for new generated types, removed rf-log handler --- user/build.xml | 15 ++---------- .../gwt/core/server/jakarta/package-info.java | 23 ++++++++++++++++++ .../logging/server/jakarta/package-info.java | 23 ++++++++++++++++++ .../gwt/user/server/jakarta/package-info.java | 23 ++++++++++++++++++ .../user/server/rpc/jakarta/package-info.java | 23 ++++++++++++++++++ .../requestfactory/server/Logging.java | 7 +++--- .../server/jakarta/package-info.java | 24 +++++++++++++++++++ 7 files changed, 122 insertions(+), 16 deletions(-) create mode 100644 user/src/com/google/gwt/core/server/jakarta/package-info.java create mode 100644 user/src/com/google/gwt/logging/server/jakarta/package-info.java create mode 100644 user/src/com/google/gwt/user/server/jakarta/package-info.java create mode 100644 user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java create mode 100644 user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java diff --git a/user/build.xml b/user/build.xml index f097d07b760..d488079c87d 100755 --- a/user/build.xml +++ b/user/build.xml @@ -149,7 +149,8 @@ - + + @@ -214,7 +215,6 @@ - @@ -234,17 +234,6 @@ - - - - - - - - - - - diff --git a/user/src/com/google/gwt/core/server/jakarta/package-info.java b/user/src/com/google/gwt/core/server/jakarta/package-info.java new file mode 100644 index 00000000000..d2518d082b2 --- /dev/null +++ b/user/src/com/google/gwt/core/server/jakarta/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.gwt.core.server.jakarta; \ No newline at end of file diff --git a/user/src/com/google/gwt/logging/server/jakarta/package-info.java b/user/src/com/google/gwt/logging/server/jakarta/package-info.java new file mode 100644 index 00000000000..51bc2803c67 --- /dev/null +++ b/user/src/com/google/gwt/logging/server/jakarta/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.gwt.logging.server.jakarta; \ No newline at end of file diff --git a/user/src/com/google/gwt/user/server/jakarta/package-info.java b/user/src/com/google/gwt/user/server/jakarta/package-info.java new file mode 100644 index 00000000000..8b545003b37 --- /dev/null +++ b/user/src/com/google/gwt/user/server/jakarta/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.gwt.user.server.jakarta; \ No newline at end of file diff --git a/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java b/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java new file mode 100644 index 00000000000..b3f453a1f4c --- /dev/null +++ b/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.gwt.user.server.rpc.jakarta; \ No newline at end of file diff --git a/user/src/com/google/web/bindery/requestfactory/server/Logging.java b/user/src/com/google/web/bindery/requestfactory/server/Logging.java index c2aea9583cf..728de548ddf 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/Logging.java +++ b/user/src/com/google/web/bindery/requestfactory/server/Logging.java @@ -25,8 +25,9 @@ /** * Server-side object that handles log messages sent by - * {@link com.google.web.bindery.requestfactory.gwt.client.RequestFactoryLogHandler} - * . + * {@link com.google.web.bindery.requestfactory.gwt.client.RequestFactoryLogHandler}. + * To use this in {@code jakarta.servlet} projects, create your own LoggingRequest + * and RequestFactoryLogHandler types that reference the jakarta variant of this class. */ public class Logging { @@ -36,7 +37,7 @@ public class Logging { * Logs a message. * * @param logRecordJson a json serialized LogRecord, as provided by - * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJsonObject(LogRecord)} + * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJson(java.util.logging.LogRecord)} )} * @throws RemoteLoggingException if logging fails */ public static void logMessage(String logRecordJson) throws RemoteLoggingException { diff --git a/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java b/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java new file mode 100644 index 00000000000..024078429de --- /dev/null +++ b/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}, or + * {@code requestfactory-server-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.web.bindery.requestfactory.server.jakarta; \ No newline at end of file From 5feafe46460918e4cabb317965ad79b04130bfd5 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Thu, 28 Sep 2023 08:07:39 -0500 Subject: [PATCH 28/31] Self-review of docs --- .../gwt/core/server/jakarta/package-info.java | 2 +- .../logging/server/jakarta/package-info.java | 2 +- .../gwt/user/server/jakarta/package-info.java | 2 +- .../user/server/rpc/jakarta/package-info.java | 2 +- .../gwt/client/RequestFactoryLogHandler.java | 4 ++++ .../requestfactory/server/Logging.java | 8 +++++-- .../server/jakarta/package-info.java | 2 +- .../shared/jakarta/package-info.java | 24 +++++++++++++++++++ 8 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 user/src/com/google/web/bindery/requestfactory/shared/jakarta/package-info.java diff --git a/user/src/com/google/gwt/core/server/jakarta/package-info.java b/user/src/com/google/gwt/core/server/jakarta/package-info.java index d2518d082b2..63a3e2ea255 100644 --- a/user/src/com/google/gwt/core/server/jakarta/package-info.java +++ b/user/src/com/google/gwt/core/server/jakarta/package-info.java @@ -20,4 +20,4 @@ * * @since GWT 2.11 */ -package com.google.gwt.core.server.jakarta; \ No newline at end of file +package com.google.gwt.core.server.jakarta; diff --git a/user/src/com/google/gwt/logging/server/jakarta/package-info.java b/user/src/com/google/gwt/logging/server/jakarta/package-info.java index 51bc2803c67..de28fe4c010 100644 --- a/user/src/com/google/gwt/logging/server/jakarta/package-info.java +++ b/user/src/com/google/gwt/logging/server/jakarta/package-info.java @@ -20,4 +20,4 @@ * * @since GWT 2.11 */ -package com.google.gwt.logging.server.jakarta; \ No newline at end of file +package com.google.gwt.logging.server.jakarta; diff --git a/user/src/com/google/gwt/user/server/jakarta/package-info.java b/user/src/com/google/gwt/user/server/jakarta/package-info.java index 8b545003b37..31f287e739e 100644 --- a/user/src/com/google/gwt/user/server/jakarta/package-info.java +++ b/user/src/com/google/gwt/user/server/jakarta/package-info.java @@ -20,4 +20,4 @@ * * @since GWT 2.11 */ -package com.google.gwt.user.server.jakarta; \ No newline at end of file +package com.google.gwt.user.server.jakarta; diff --git a/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java b/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java index b3f453a1f4c..d02d7bc1952 100644 --- a/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java +++ b/user/src/com/google/gwt/user/server/rpc/jakarta/package-info.java @@ -20,4 +20,4 @@ * * @since GWT 2.11 */ -package com.google.gwt.user.server.rpc.jakarta; \ No newline at end of file +package com.google.gwt.user.server.rpc.jakarta; diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java index 32f55253a62..807df82900e 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java @@ -27,6 +27,10 @@ /** * A Handler that does remote logging for applications using RequestFactory. + *

To use this in a project with {@code jakarta.servlet}, a copy will need + * to be made, referencing {@link com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest + * com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest} instead + * of the non-jakarta LoggingFactory that this was originally written for.

*/ public class RequestFactoryLogHandler extends RemoteLogHandlerBase { diff --git a/user/src/com/google/web/bindery/requestfactory/server/Logging.java b/user/src/com/google/web/bindery/requestfactory/server/Logging.java index 728de548ddf..cca656fe1ce 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/Logging.java +++ b/user/src/com/google/web/bindery/requestfactory/server/Logging.java @@ -26,8 +26,12 @@ /** * Server-side object that handles log messages sent by * {@link com.google.web.bindery.requestfactory.gwt.client.RequestFactoryLogHandler}. - * To use this in {@code jakarta.servlet} projects, create your own LoggingRequest - * and RequestFactoryLogHandler types that reference the jakarta variant of this class. + *

To use this in {@code jakarta.servlet} projects, be sure to reference + * {@link com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest + * com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest} instead + * of the non-jakarta version, and making a copy of {@code RequestFactoryLogHandler} + * that uses it. + *

*/ public class Logging { diff --git a/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java b/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java index 024078429de..4275d00f8b7 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java +++ b/user/src/com/google/web/bindery/requestfactory/server/jakarta/package-info.java @@ -21,4 +21,4 @@ * * @since GWT 2.11 */ -package com.google.web.bindery.requestfactory.server.jakarta; \ No newline at end of file +package com.google.web.bindery.requestfactory.server.jakarta; diff --git a/user/src/com/google/web/bindery/requestfactory/shared/jakarta/package-info.java b/user/src/com/google/web/bindery/requestfactory/shared/jakarta/package-info.java new file mode 100644 index 00000000000..8620dfc7814 --- /dev/null +++ b/user/src/com/google/web/bindery/requestfactory/shared/jakarta/package-info.java @@ -0,0 +1,24 @@ +/* + * Copyright 2023 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ + +/** + * Jakarta-specific package for server-only classes. To use these types, be sure + * to use the {@code gwt-servlet-jakarta.jar}, or + * {@code requestfactory-server-jakarta.jar}. + * + * @since GWT 2.11 + */ +package com.google.web.bindery.requestfactory.shared.jakarta; From d0ec92bc66f3f6e87151aeb8cf02f488a41ba63a Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Mon, 13 Nov 2023 19:14:40 -0600 Subject: [PATCH 29/31] Revert CI changes to use tools fork --- .github/workflows/full-check.yml | 3 +-- .github/workflows/quick-check.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/full-check.yml b/.github/workflows/full-check.yml index 7d179f33859..9d98ad5f809 100644 --- a/.github/workflows/full-check.yml +++ b/.github/workflows/full-check.yml @@ -29,9 +29,8 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'sparsick/gwt-tools' + repository: 'gwtproject/tools' path: 'tools' - ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11 to build everything, but can run on newer Java versions uses: actions/setup-java@v3 diff --git a/.github/workflows/quick-check.yml b/.github/workflows/quick-check.yml index 7deb3ed5582..75c861c4699 100644 --- a/.github/workflows/quick-check.yml +++ b/.github/workflows/quick-check.yml @@ -19,9 +19,8 @@ jobs: - name: Checkout GWT tools into a sibling directory uses: actions/checkout@v2 with: - repository: 'sparsick/gwt-tools' + repository: 'gwtproject/tools' path: 'tools' - ref: '9727-jakarta-servlet-support' - name: Set up JDK ${{ matrix.java-version }} # GWT presently requires Java8 to build just the SDK and some tests, or 11+ to build everything, and can run on newer Java versions uses: actions/setup-java@v3 From 2925e34139d766cf344df1c79b73bcce385db7f6 Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 15 Nov 2023 08:24:04 -0600 Subject: [PATCH 30/31] Fix checkstyle warning in javadoc --- .../gwt/client/RequestFactoryLogHandler.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java index 807df82900e..f5a64e7f9cb 100644 --- a/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java +++ b/user/src/com/google/web/bindery/requestfactory/gwt/client/RequestFactoryLogHandler.java @@ -27,10 +27,10 @@ /** * A Handler that does remote logging for applications using RequestFactory. - *

To use this in a project with {@code jakarta.servlet}, a copy will need - * to be made, referencing {@link com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest - * com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest} instead - * of the non-jakarta LoggingFactory that this was originally written for.

+ *

To use this in a project with {@code jakarta.servlet}, a copy will need to be made, + * referencing {@link com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest + * com.google.web.bindery.requestfactory.shared.jakarta.LoggingRequest} instead of the non-jakarta + * LoggingFactory that this was originally written for.

*/ public class RequestFactoryLogHandler extends RemoteLogHandlerBase { From 50043a4e2c8f0366083c76c16d3a90a7b266f73b Mon Sep 17 00:00:00 2001 From: Colin Alworth Date: Wed, 6 Dec 2023 15:38:46 -0600 Subject: [PATCH 31/31] Fix extra chars in javadoc line --- .../com/google/web/bindery/requestfactory/server/Logging.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/src/com/google/web/bindery/requestfactory/server/Logging.java b/user/src/com/google/web/bindery/requestfactory/server/Logging.java index cca656fe1ce..eb407916ba2 100644 --- a/user/src/com/google/web/bindery/requestfactory/server/Logging.java +++ b/user/src/com/google/web/bindery/requestfactory/server/Logging.java @@ -41,7 +41,7 @@ public class Logging { * Logs a message. * * @param logRecordJson a json serialized LogRecord, as provided by - * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJson(java.util.logging.LogRecord)} )} + * {@link com.google.gwt.logging.client.JsonLogRecordClientUtil#logRecordAsJson(java.util.logging.LogRecord)} * @throws RemoteLoggingException if logging fails */ public static void logMessage(String logRecordJson) throws RemoteLoggingException {