You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2024/11/19 07:04:00 UTC
(tomee) branch TOMEE-4343 updated (4fca8912fb -> 4ba85af7b9)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch TOMEE-4343
in repository https://gitbox.apache.org/repos/asf/tomee.git
from 4fca8912fb Merge remote-tracking branch 'origin/main' into TOMEE-4343
add 9a68d9f8f7 fix oidc example after keycloak update
add 05d9f2c6a1 TOMEE-4424 - improved JAX-RS request matching if a welcome-file is defined (#1600)
new 4ba85af7b9 Merge branch 'main' into TOMEE-4343
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../servlets/welcomefile/MyFiletypeServlet.java} | 23 +++-------
.../{Echo.java => welcomefile/MyRestApi.java} | 14 +++---
.../servlets/welcomefile/MyRestApplication.java | 9 +---
.../welcomefile/ServletsWithWelcomeFileTest.java} | 50 +++++++++++-----------
.../org/superbiz/openid/SecuredServletTest.java | 4 +-
.../apache/tomee/webservices/CXFJAXRSFilter.java | 25 ++++++++---
6 files changed, 62 insertions(+), 63 deletions(-)
copy arquillian/{arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TestServlet.java => arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/welcomefile/MyFiletypeServlet.java} (76%)
copy arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/{Echo.java => welcomefile/MyRestApi.java} (77%)
copy examples/jsonb-configuration/src/main/java/org/superbiz/JAXRSApplication.java => arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/servlets/welcomefile/MyRestApplication.java (85%)
copy arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxrs/{faces/AvoidConflictWithFacesTest.java => servlets/welcomefile/ServletsWithWelcomeFileTest.java} (52%)
(tomee) 01/01: Merge branch 'main' into TOMEE-4343
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch TOMEE-4343
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 4ba85af7b92e24572f00d9b3e59e9199ea8c396c
Merge: 4fca8912fb 05d9f2c6a1
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Nov 19 08:03:46 2024 +0100
Merge branch 'main' into TOMEE-4343
.../servlets/welcomefile/MyFiletypeServlet.java | 31 ++++++++++
.../jaxrs/servlets/welcomefile/MyRestApi.java | 30 +++++++++
.../servlets/welcomefile/MyRestApplication.java | 22 +++++++
.../welcomefile/ServletsWithWelcomeFileTest.java | 72 ++++++++++++++++++++++
.../org/superbiz/openid/SecuredServletTest.java | 4 +-
.../apache/tomee/webservices/CXFJAXRSFilter.java | 25 ++++++--
6 files changed, 176 insertions(+), 8 deletions(-)