This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 0d122198a7 Review "Synchronize access to the bindings of a naming
context"
new 2ff3d6b789 Remove the CXF optional module
new 0e51c68a5e Update OWB module to Apache OpenWebBeans 4.1.1
new cb2b4d5222 Add CDI 4.1 integration test for the OWB module
new 46c7235e8d Expand OWB module test coverage
new b945d5fdb5 Add optional OWB module coverage and documentation
new 1dc1e1f1f8 Clean up OWB module build and test warnings
new e747e04eb1 Add extended OWB integration and unit test coverage
new b116f8de30 Start OWB from ServletContainerInitializer for listener
injection
new 1c33320082 Complete OWB test coverage for lifecycle, instance manager
and EL
new 94bd7704e5 Merge branch 'main' of [email protected]:apache/tomcat.git
into main
The 10 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:
modules/cxf/.gitignore | 28 ---
modules/cxf/pom.xml | 185 ----------------
modules/cxf/src/main/java/tomcat/cxf/JsonBean.java | 28 ---
modules/cxf/src/main/resources/META-INF/beans.xml | 27 ---
.../src/main/resources/META-INF/web-fragment.xml | 39 ----
modules/owb/README.md | 205 +++++++++++++++++
modules/owb/pom.xml | 122 ++++++++++-
.../OpenWebBeansContextLifecycleListener.java | 18 +-
.../webbeans/web/tomcat/OpenWebBeansCdi41IT.java | 70 ++++++
.../web/tomcat/OpenWebBeansClassLoaderLeakIT.java | 95 ++++++++
.../web/tomcat/OpenWebBeansInstanceManagerIT.java | 58 +++++
.../tomcat/OpenWebBeansInstanceManagerTest.java | 151 +++++++++++++
.../webbeans/web/tomcat/OpenWebBeansJspIT.java | 59 +++++
.../web/tomcat/OpenWebBeansRedeployIT.java | 109 +++++++++
.../web/tomcat/OpenWebBeansSecurityFilterIT.java | 58 +++++
.../web/tomcat/OpenWebBeansSecurityFilterTest.java | 67 ++++++
.../web/tomcat/OpenWebBeansSecurityIT.java | 109 +++++++++
.../web/tomcat/OpenWebBeansSecurityValveTest.java | 67 ++++++
.../tomcat/OpenWebBeansTomcatIntegrationIT.java | 209 ++++++++++++++++++
.../apache/webbeans/web/tomcat/OwbTestServer.java | 243 +++++++++++++++++++++
.../apache/webbeans/web/tomcat/OwbTestSupport.java | 90 ++++++++
.../webbeans/web/tomcat/TomcatPluginTest.java | 150 +++++++++++++
.../apache/webbeans/web/tomcat/WebAppBuilder.java | 197 +++++++++++++++++
.../web/tomcat/testapp/CustomPrincipal.java | 13 +-
.../owb/src/test/webapp/cdi41/WEB-INF/beans.xml | 10 +-
.../jakarta.enterprise.inject.spi.Extension | 2 +-
.../webbeans/web/tomcat/testapp/Cdi41Event.java | 9 +-
.../web/tomcat/testapp/Cdi41EventObserver.java | 22 +-
.../webbeans/web/tomcat/testapp/Cdi41Features.java | 57 +++++
.../webbeans/web/tomcat/testapp/Cdi41Servlet.java | 86 ++++++++
.../webbeans/web/tomcat/testapp/Greeting.java | 15 +-
.../web/tomcat/testapp/InvokerExtension.java | 48 ++++
.../webbeans/web/tomcat/testapp/InvokerTarget.java | 19 +-
.../web/tomcat/testapp/MatchingTarget.java | 11 +-
.../web/tomcat/testapp/RequestScopedBean.java | 21 +-
.../web/tomcat/testapp/SessionScopedBean.java | 21 +-
.../apache/webbeans/web/tomcat/testapp/Traced.java | 23 +-
.../webbeans/web/tomcat/testapp/TracedService.java | 16 +-
.../web/tomcat/testapp/TracingInterceptor.java | 37 ++++
.../owb/src/test/webapp/instance/WEB-INF/beans.xml | 10 +-
.../webbeans/web/tomcat/testapp/InstanceProbe.java | 56 +++++
.../web/tomcat/testapp/InstanceProbeServlet.java | 79 +++++++
.../webbeans/web/tomcat/testapp/ProbeGreeting.java | 19 +-
.../owb/src/test/webapp/jsp/WEB-INF/beans.xml | 10 +-
.../src/test/webapp/jsp/WEB-INF/tags/greeting.tag | 3 +-
.../owb/src/test/webapp/jsp/included.jsp | 2 +-
.../owb/src/test/webapp/jsp/index.jsp | 19 +-
.../webbeans/web/tomcat/testapp/ElServlet.java | 49 +++++
.../webbeans/web/tomcat/testapp/JspGreeting.java | 21 +-
.../web/tomcat/testapp/MethodGreeting.java | 21 +-
.../web/tomcat/testapp/RequestGreeting.java | 25 ++-
.../src/test/webapp/lifecycle/WEB-INF/beans.xml | 10 +-
.../tomcat/testapp/LifecycleContextListener.java | 61 ++++++
.../web/tomcat/testapp/LifecycleFilter.java | 70 ++++++
.../web/tomcat/testapp/LifecycleGreeting.java | 19 +-
.../web/tomcat/testapp/LifecycleMarkerWriter.java | 33 ++-
.../tomcat/testapp/LifecycleRequestListener.java | 46 ++++
.../web/tomcat/testapp/LifecycleServlet.java | 71 ++++++
.../tomcat/testapp/LifecycleSessionListener.java | 46 ++++
.../src/test/webapp/multi/one/WEB-INF/beans.xml | 10 +-
.../webapp/multi/one/WEB-INF/classes/value.txt | 1 +
.../webbeans/web/tomcat/testapp/MultiGreeting.java | 31 ++-
.../webbeans/web/tomcat/testapp/MultiServlet.java | 27 +--
.../src/test/webapp/multi/two/WEB-INF/beans.xml | 10 +-
.../webapp/multi/two/WEB-INF/classes/value.txt | 1 +
.../webbeans/web/tomcat/testapp/MultiGreeting.java | 31 ++-
.../webbeans/web/tomcat/testapp/MultiServlet.java | 27 +--
.../owb/src/test/webapp/redeploy/WEB-INF/beans.xml | 10 +-
.../web/tomcat/testapp/RedeployGreeting.java | 19 +-
.../web/tomcat/testapp/RedeployServlet.java | 66 ++++++
.../test/webapp/security-filter/WEB-INF/beans.xml | 10 +-
.../test/webapp/security-filter}/WEB-INF/web.xml | 56 ++---
.../web/tomcat/testapp/FilterWhoAmIServlet.java} | 36 ++-
.../owb/src/test/webapp/security/WEB-INF/beans.xml | 10 +-
.../owb/src/test/webapp/security}/WEB-INF/web.xml | 43 ++--
.../webbeans/web/tomcat/testapp/WhoAmIServlet.java | 64 ++++++
webapps/docs/cdi.xml | 124 ++++++++---
webapps/docs/changelog.xml | 7 +
webapps/docs/index.xml | 4 +-
webapps/docs/project.xml | 2 +-
80 files changed, 3337 insertions(+), 716 deletions(-)
delete mode 100644 modules/cxf/.gitignore
delete mode 100644 modules/cxf/pom.xml
delete mode 100644 modules/cxf/src/main/java/tomcat/cxf/JsonBean.java
delete mode 100644 modules/cxf/src/main/resources/META-INF/beans.xml
delete mode 100644 modules/cxf/src/main/resources/META-INF/web-fragment.xml
create mode 100644 modules/owb/README.md
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansCdi41IT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansClassLoaderLeakIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManagerIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansInstanceManagerTest.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansJspIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansRedeployIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansSecurityFilterIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansSecurityFilterTest.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansSecurityIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansSecurityValveTest.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OpenWebBeansTomcatIntegrationIT.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OwbTestServer.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/OwbTestSupport.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/TomcatPluginTest.java
create mode 100644
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/WebAppBuilder.java
copy test/webapp/WEB-INF/classes/org/apache/tomcat/Bug58096.java =>
modules/owb/src/test/java/org/apache/webbeans/web/tomcat/testapp/CustomPrincipal.java
(67%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/cdi41/WEB-INF/beans.xml (73%)
copy java/org/apache/catalina/core/RestrictedListeners.properties =>
modules/owb/src/test/webapp/cdi41/WEB-INF/classes/META-INF/services/jakarta.enterprise.inject.spi.Extension
(93%)
copy test/org/apache/el/lang/TesterBean.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Cdi41Event.java
(76%)
copy test/jakarta/el/TesterBeanA.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Cdi41EventObserver.java
(60%)
create mode 100644
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Cdi41Features.java
create mode 100644
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Cdi41Servlet.java
copy test/org/apache/tomcat/util/buf/TestUriUtil26.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Greeting.java
(66%)
create mode 100644
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/InvokerExtension.java
copy test/org/apache/el/lang/TesterType.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/InvokerTarget.java
(65%)
copy test/jakarta/el/TesterBeanC.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/MatchingTarget.java
(72%)
copy test/org/apache/el/TesterBeanBB.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/RequestScopedBean.java
(62%)
copy test/org/apache/catalina/startup/UrlPatternServlet.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/SessionScopedBean.java
(62%)
copy java/jakarta/annotation/PostConstruct.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/Traced.java
(66%)
copy test/org/apache/tomcat/util/buf/TestUriUtil26.java =>
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/TracedService.java
(67%)
create mode 100644
modules/owb/src/test/webapp/cdi41/src/org/apache/webbeans/web/tomcat/testapp/TracingInterceptor.java
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/instance/WEB-INF/beans.xml (73%)
create mode 100644
modules/owb/src/test/webapp/instance/src/org/apache/webbeans/web/tomcat/testapp/InstanceProbe.java
create mode 100644
modules/owb/src/test/webapp/instance/src/org/apache/webbeans/web/tomcat/testapp/InstanceProbeServlet.java
copy test/org/apache/el/lang/TesterType.java =>
modules/owb/src/test/webapp/instance/src/org/apache/webbeans/web/tomcat/testapp/ProbeGreeting.java
(66%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/jsp/WEB-INF/beans.xml (73%)
copy test/webapp/jsp/encoding/bom-none-prolog-none.jsp =>
modules/owb/src/test/webapp/jsp/WEB-INF/tags/greeting.tag (93%)
copy test/webapp/jsp/encoding/bom-none-prolog-none.jsp =>
modules/owb/src/test/webapp/jsp/included.jsp (95%)
copy java/org/apache/tomcat/util/file/package.html =>
modules/owb/src/test/webapp/jsp/index.jsp (71%)
create mode 100644
modules/owb/src/test/webapp/jsp/src/org/apache/webbeans/web/tomcat/testapp/ElServlet.java
copy test/org/apache/el/TesterBeanAA.java =>
modules/owb/src/test/webapp/jsp/src/org/apache/webbeans/web/tomcat/testapp/JspGreeting.java
(63%)
copy test/org/apache/el/TesterBeanBB.java =>
modules/owb/src/test/webapp/jsp/src/org/apache/webbeans/web/tomcat/testapp/MethodGreeting.java
(64%)
copy test/jakarta/el/TesterBeanA.java =>
modules/owb/src/test/webapp/jsp/src/org/apache/webbeans/web/tomcat/testapp/RequestGreeting.java
(59%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/lifecycle/WEB-INF/beans.xml (73%)
create mode 100644
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleContextListener.java
create mode 100644
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleFilter.java
copy test/org/apache/el/lang/TesterType.java =>
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleGreeting.java
(66%)
copy java/org/apache/catalina/webresources/war/Handler.java =>
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleMarkerWriter.java
(50%)
create mode 100644
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleRequestListener.java
create mode 100644
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleServlet.java
create mode 100644
modules/owb/src/test/webapp/lifecycle/src/org/apache/webbeans/web/tomcat/testapp/LifecycleSessionListener.java
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/multi/one/WEB-INF/beans.xml (73%)
create mode 100644
modules/owb/src/test/webapp/multi/one/WEB-INF/classes/value.txt
copy test/jakarta/servlet/TestServletResponse.java =>
modules/owb/src/test/webapp/multi/one/src/org/apache/webbeans/web/tomcat/testapp/MultiGreeting.java
(53%)
copy webapps/examples/WEB-INF/classes/async/Async3.java =>
modules/owb/src/test/webapp/multi/one/src/org/apache/webbeans/web/tomcat/testapp/MultiServlet.java
(58%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/multi/two/WEB-INF/beans.xml (73%)
create mode 100644
modules/owb/src/test/webapp/multi/two/WEB-INF/classes/value.txt
copy test/jakarta/servlet/TestServletResponse.java =>
modules/owb/src/test/webapp/multi/two/src/org/apache/webbeans/web/tomcat/testapp/MultiGreeting.java
(53%)
copy webapps/examples/WEB-INF/classes/async/Async3.java =>
modules/owb/src/test/webapp/multi/two/src/org/apache/webbeans/web/tomcat/testapp/MultiServlet.java
(58%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/redeploy/WEB-INF/beans.xml (73%)
copy test/org/apache/el/lang/TesterType.java =>
modules/owb/src/test/webapp/redeploy/src/org/apache/webbeans/web/tomcat/testapp/RedeployGreeting.java
(66%)
create mode 100644
modules/owb/src/test/webapp/redeploy/src/org/apache/webbeans/web/tomcat/testapp/RedeployServlet.java
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/security-filter/WEB-INF/beans.xml (73%)
copy {test/webapp-url-patterns =>
modules/owb/src/test/webapp/security-filter}/WEB-INF/web.xml (52%)
copy
modules/{manager2/src/main/java/org/apache/tomcat/manager2/LogoutServlet.java
=>
owb/src/test/webapp/security-filter/src/org/apache/webbeans/web/tomcat/testapp/FilterWhoAmIServlet.java}
(55%)
copy java/org/apache/naming/package.html =>
modules/owb/src/test/webapp/security/WEB-INF/beans.xml (73%)
copy {test/webapp-servletsecurity-b =>
modules/owb/src/test/webapp/security}/WEB-INF/web.xml (53%)
create mode 100644
modules/owb/src/test/webapp/security/src/org/apache/webbeans/web/tomcat/testapp/WhoAmIServlet.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
