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 2026/09/11 17:34:38 UTC
(tomee) branch tomee-10.x updated (b12d24c6ce -> 71e4594ced)
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a change to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
from b12d24c6ce use secure random for OIDC nonce/state
new a06afc1c04 Revert "Unwrap InternalApplication before passing to CXF"
new 71e4594ced keep the test HttpAuthenticationMechanism out of the bean archive
The 2 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:
.../org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 10 +---------
.../security/cdi/RememberMeInterceptorCleanSubjectTest.java | 8 ++++++++
2 files changed, 9 insertions(+), 9 deletions(-)
(tomee) 02/02: keep the test HttpAuthenticationMechanism out of the bean archive
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 71e4594ced254ebf3f7eb226b6b259f738763838
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Wed Sep 9 20:44:48 2026 +0200
keep the test HttpAuthenticationMechanism out of the bean archive
The tests in tomee-security are deployed as a single webapp, so the
@RememberMe mechanism declared in RememberMeInterceptorCleanSubjectTest was
picked up by every other test in the module. They all failed to deploy with
"Multiple HttpAuthenticationMechanism found ... without a @WebServlet
association".
The class is only used directly by that test and is never resolved through
CDI, so @Vetoed is enough.
(cherry picked from commit fed59ff233f97cfb8613ae970e7ad7c0a891daa8)
---
.../tomee/security/cdi/RememberMeInterceptorCleanSubjectTest.java | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tomee/tomee-security/src/test/java/org/apache/tomee/security/cdi/RememberMeInterceptorCleanSubjectTest.java b/tomee/tomee-security/src/test/java/org/apache/tomee/security/cdi/RememberMeInterceptorCleanSubjectTest.java
index 221fa0e218..d3ecdd96cb 100644
--- a/tomee/tomee-security/src/test/java/org/apache/tomee/security/cdi/RememberMeInterceptorCleanSubjectTest.java
+++ b/tomee/tomee-security/src/test/java/org/apache/tomee/security/cdi/RememberMeInterceptorCleanSubjectTest.java
@@ -18,6 +18,7 @@ package org.apache.tomee.security.cdi;
import jakarta.el.ELResolver;
import jakarta.enterprise.inject.Instance;
+import jakarta.enterprise.inject.Vetoed;
import jakarta.enterprise.inject.spi.Bean;
import jakarta.enterprise.inject.spi.BeanManager;
import jakarta.interceptor.InvocationContext;
@@ -41,6 +42,13 @@ import static org.mockito.Mockito.when;
public class RememberMeInterceptorCleanSubjectTest {
+ /**
+ * Only ever used directly, never resolved through CDI. It has to stay out of the bean archive:
+ * the tests in this module are deployed as a single webapp, so an HttpAuthenticationMechanism
+ * declared here is found by every other test and makes them all fail to deploy with
+ * "Multiple HttpAuthenticationMechanism found ... without a @WebServlet association".
+ */
+ @Vetoed
@RememberMe
public static class RememberMeMechanism implements HttpAuthenticationMechanism {
@Override
(tomee) 01/02: Revert "Unwrap InternalApplication before passing to CXF"
Posted by rz...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit a06afc1c047a1fe0e9e9fcb4a08f8f529fac8523
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Fri Sep 11 19:19:23 2026 +0200
Revert "Unwrap InternalApplication before passing to CXF"
This reverts commit 078a4d2f120c83e7b358ce22376b7ac894a33bbb.
It breaks JAX-RS deployments (404s across the jaxrs Arquillian tests,
MP-JWT/Telemetry TCKs, tomee-embedded). The follow-up fix on main
(f2406998e7) relies on ApplicationInfo#getApplicationPath from CXF 4.2,
which is not available with CXF 4.1.x on 10.x. The change only serves
UriInfo#getMatchedResourceTemplate (JAX-RS 4.0), so it is not needed here.
---
.../org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
index 861f5b0f83..b0e82b19da 100644
--- a/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
+++ b/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
@@ -733,16 +733,8 @@ public class CxfRsHttpListener implements RsHttpListener {
*
* Global binding annotations are tested in:
* com/sun/ts/tests/jaxrs/spec/filter/globalbinding/JAXRSClient#globalBoundResourceTest_from_standalone
- *
- * We unwrap any InternalApplication wrapper so CXF inspects the user's real
- * Application subclass. Without this, the @ApplicationPath annotation on the
- * user's class is invisible to CXF, and UriInfoImpl#getMatchedResourceTemplate
- * omits the application path prefix from the returned template.
*/
- final Application appForFactory = application instanceof InternalApplication wrapper && wrapper.getOriginal() != null
- ? wrapper.getOriginal()
- : application;
- factory.setApplication(appForFactory);
+ factory.setApplication(application);
this.context = webContext;
if (!webContext.startsWith("/")) {