This is an automated email from the ASF dual-hosted git repository. jungm pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 0dddb2a40f2725c92f77faae2787224870fa6dbb Merge: 7ad9a2631f 4f2e49571b Author: Markus Jung <ju...@apache.org> AuthorDate: Mon Sep 16 15:00:51 2024 +0200 Merge pull request #1458 from jungm/concurrency-work Implement Concurrency 3.0 .../java/org/apache/openejb/cdi/CdiBeanInfo.java | 33 +++ .../java/org/apache/openejb/cdi/CdiScanner.java | 13 +- .../openejb/cdi/ThreadSingletonServiceImpl.java | 2 +- .../cdi/concurrency/AsynchronousInterceptor.java | 115 ++++++++++ .../apache/openejb/config/AnnotationDeployer.java | 94 +++++++++ .../openejb/config/ConfigurationFactory.java | 3 + .../ConvertManagedExecutorServiceDefinitions.java | 108 ++++++++++ ...ManagedScheduledExecutorServiceDefinitions.java | 108 ++++++++++ .../ConvertManagedThreadFactoryDefinitions.java | 107 ++++++++++ .../org/apache/openejb/core/ThreadContext.java | 7 - .../core/security/AbstractSecurityService.java | 14 +- .../jdbc/managed/local/ManagedConnection.java | 34 +-- .../thread/ManagedExecutorServiceImplFactory.java | 42 +++- ...ManagedScheduledExecutorServiceImplFactory.java | 2 +- .../thread/ManagedThreadFactoryImplFactory.java | 13 +- .../threads/future/CUCompletableFuture.java | 29 +-- ...UScheduleFuture.java => CUScheduledFuture.java} | 4 +- .../threads/future/CUTriggerScheduledFuture.java | 66 ++++++ .../impl/ApplicationThreadContextProvider.java | 62 ++++-- .../openejb/threads/impl/ContextServiceImpl.java | 167 +++++++++------ .../threads/impl/ContextServiceImplFactory.java | 24 ++- .../threads/impl/ManagedExecutorServiceImpl.java | 39 ++-- .../impl/ManagedScheduledExecutorServiceImpl.java | 70 ++++--- .../threads/impl/ManagedThreadFactoryImpl.java | 58 +++-- .../impl/SecurityThreadContextProvider.java | 8 +- ...rovider.java => ThreadContextProviderUtil.java} | 40 +--- .../threads/impl/TxThreadContextProvider.java | 64 +++++- .../org/apache/openejb/threads/task/CUTask.java | 16 +- .../threads/task/ManagedTaskListenerTask.java | 8 +- .../openejb/threads/task/TriggerCallable.java | 2 +- .../openejb/threads/task/TriggerRunnable.java | 2 +- .../apache/openejb/threads/task/TriggerTask.java | 158 +++++++------- .../META-INF/org.apache.openejb/service-jar.xml | 5 + .../main/java/org/apache/openejb/jee/Adapters.java | 2 +- .../org/apache/openejb/jee/Application$JAXB.java | 94 ++++++++- .../apache/openejb/jee/ApplicationClient$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/EntityBean$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/Interceptor$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/ManagedBean$JAXB.java | 94 ++++++++- .../apache/openejb/jee/ManagedExecutor$JAXB.java | 233 +++++++++++++++++++++ .../openejb/jee/ManagedScheduledExecutor$JAXB.java | 233 +++++++++++++++++++++ .../openejb/jee/ManagedThreadFactory$JAXB.java | 221 +++++++++++++++++++ .../apache/openejb/jee/MessageDrivenBean$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/ObjectFactory$JAXB.java | 8 +- .../org/apache/openejb/jee/SessionBean$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/SingletonBean$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/StatefulBean$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/StatelessBean$JAXB.java | 94 ++++++++- .../java/org/apache/openejb/jee/WebApp$JAXB.java | 92 +++++++- .../org/apache/openejb/jee/WebFragment$JAXB.java | 94 ++++++++- .../org/apache/openejb/jee/oejb3/Adapters.java | 2 +- .../openejb/jee/oejb3/ObjectFactory$JAXB.java | 8 +- .../java/org/apache/openejb/jee/Application.java | 38 +++- .../org/apache/openejb/jee/ApplicationClient.java | 39 +++- .../java/org/apache/openejb/jee/EntityBean.java | 37 +++- .../java/org/apache/openejb/jee/Interceptor.java | 37 +++- .../java/org/apache/openejb/jee/JndiConsumer.java | 3 + .../org/apache/openejb/jee/ManagedExecutor.java | 102 +++++++++ .../openejb/jee/ManagedScheduledExecutor.java | 103 +++++++++ .../apache/openejb/jee/ManagedThreadFactory.java | 91 ++++++++ .../org/apache/openejb/jee/MessageDrivenBean.java | 37 +++- .../java/org/apache/openejb/jee/SessionBean.java | 37 +++- .../main/java/org/apache/openejb/jee/WebApp.java | 35 ++++ .../java/org/apache/openejb/jee/WebFragment.java | 39 +++- .../apache/openejb/server/cxf/rs/CxfRSService.java | 36 ++-- tck/concurrency-signature-test/pom.xml | 12 +- .../src/test/resources/arquillian.xml | 2 + tck/concurrency-standalone/pom.xml | 8 +- .../src/test/resources/arquillian.xml | 8 +- tck/concurrency-standalone/suite-web.xml | 4 +- tck/concurrency-standalone/suite.xml | 4 +- 71 files changed, 3613 insertions(+), 409 deletions(-)