This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/webbeans-tck/org.testng-testng-7.7.0 in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
discard cf1677040 Bump testng from 6.14.3 to 7.7.0 in /webbeans-tck add 6cc7ac227 OWB-1417 bump version to 4.0.0-SNAPSHOT add f82969b2e OWB-1417 move core parts to CDI-4.0 add 8eef18a98 OWB-1417 re-enable more owb modules add c7c521074 OWB-1417 Fix diff in Session Persistence behaviour of tc10 add 3002d08b7 OWB-1417 use arquillian enricher for jakarta add c7469aa50 OWB-1417 re-enable slf4j plugin add e9884e292 OWB-1417 enable owb-gradle and owb-junit5 add 494886565 OWB1417 inline checkstyle config for now add 4f4688575 OWB-1417 enable owb-ejb and owb-porting add f5c0a72c3 OWB-1417 remove our ancient owb-1.0 site docs add f7411b833 OWB-1417 fix atinject TCK add 78050fea7 OWB-1417 remove webbeans-resources module add e7af802e1 OSB-1417 re-enable 3 more owb modules add 996929233 update our doap file add bc9f839dd OWB-1417 enable tck again add 829520289 Bump testng from 6.14.3 to 7.7.0 in /webbeans-tck This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cf1677040) \ N -- N -- N refs/heads/dependabot/maven/webbeans-tck/org.testng-testng-7.7.0 (829520289) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: atinject-tck/pom.xml | 49 +-- ...Binding.java => AtinjectTckSetupExtension.java} | 29 +- .../atinject/tck/specific/DriverBinding.java | 2 +- .../atinject/tck/specific/SpareBinding.java | 2 +- .../atinject/tck/specific/SpecificProducer.java | 19 +- .../webbeans/atinject/tck/specific/TckNew.java | 21 +- .../META-INF/openwebbeans/openwebbeans.properties | 2 +- .../jakarta.enterprise.inject.spi.Extension | 3 +- bom/openwebbeans-se-bom/pom.xml | 2 +- bom/openwebbeans-web-bom/pom.xml | 2 +- bom/pom.xml | 2 +- distribution/pom.xml | 22 +- doap_OpenWebBeans.rdf | 15 +- pom.xml | 461 +++++++++++++-------- readme/README.txt | 16 +- readme/README_1_0_0-alpha-1.txt | 2 +- readme/README_1_0_0-alpha-2.txt | 2 +- readme/README_1_0_0.txt | 2 +- readme/README_1_1_0.txt | 2 +- readme/README_1_1_1.txt | 2 +- readme/README_1_1_2.txt | 4 +- readme/README_1_1_3.txt | 4 +- readme/README_1_1_4.txt | 6 +- readme/README_1_1_5.txt | 8 +- readme/README_1_1_6.txt | 8 +- readme/README_1_2_0.txt | 8 +- readme/README_M4.txt | 6 +- samples/conversation-sample/pom.xml | 18 +- .../webbeans/samples/conversation/Products.java | 8 +- .../samples/conversation/ShoppingBean.java | 12 +- samples/guess/pom.xml | 22 +- .../sample/bean/ApplicationScopeProducer.java | 8 +- .../org/apache/webbeans/sample/bean/LoginBean.java | 18 +- .../apache/webbeans/sample/bean/LogoutBean.java | 6 +- .../webbeans/sample/bindings/AppScopeBinding.java | 2 +- .../webbeans/sample/bindings/JmsBinding.java | 2 +- .../webbeans/sample/bindings/LoggedInUser.java | 2 +- .../sample/conversation/ShoppingCardBean.java | 10 +- .../webbeans/sample/dependent/LoginCheck.java | 2 +- .../org/apache/webbeans/sample/guess/Highest.java | 2 +- .../webbeans/sample/guess/JSFNumberGuess.java | 14 +- .../apache/webbeans/sample/guess/NextNumber.java | 2 +- .../webbeans/sample/guess/NumberProducer.java | 6 +- .../org/apache/webbeans/sample/model/User.java | 2 +- .../model/conversation/ConversationModel.java | 4 +- .../webbeans/sample/observer/LoggedInObserver.java | 2 +- .../webbeans/sample/util/FacesMessageUtil.java | 4 +- samples/jsf2sample/pom.xml | 24 +- .../org/apache/webbeans/jsf2/ConversationBean.java | 8 +- .../org/apache/webbeans/jsf2/ConversationData.java | 6 +- .../java/org/apache/webbeans/jsf2/Counter.java | 2 +- .../java/org/apache/webbeans/jsf2/CounterBean.java | 6 +- .../org/apache/webbeans/jsf2/HelloJsfBean.java | 6 +- samples/pom.xml | 2 +- samples/reservation/pom.xml | 24 +- .../webbeans/reservation/beans/LoginBean.java | 10 +- .../webbeans/reservation/beans/LogoutBean.java | 6 +- .../webbeans/reservation/beans/RegisterBean.java | 8 +- .../reservation/beans/admin/AdminBean.java | 8 +- .../reservation/beans/admin/AdminListBean.java | 8 +- .../reservation/beans/admin/AdminListUser.java | 8 +- .../reservation/beans/user/UserListBean.java | 8 +- .../beans/user/UserReservationBean.java | 10 +- .../reservation/beans/user/UserUpdateBean.java | 8 +- .../reservation/bindings/ApplicationLog.java | 2 +- .../reservation/bindings/DatabaseLogin.java | 2 +- .../bindings/EntityManagerQualifier.java | 2 +- .../bindings/intercep/Transactional.java | 2 +- .../reservation/controller/InitializeDatabase.java | 8 +- .../reservation/controller/LoginController.java | 6 +- .../reservation/controller/RegisterController.java | 4 +- .../controller/admin/AdminController.java | 6 +- .../controller/user/UserController.java | 8 +- .../reservation/intercept/LoginDecorator.java | 6 +- .../intercept/TransactionalInterceptor.java | 8 +- .../reservation/session/SessionTracker.java | 8 +- .../reservation/util/EntityManagerUtil.java | 6 +- .../webbeans/reservation/util/JSFUtility.java | 2 +- .../apache/webbeans/reservation/util/LogUtil.java | 6 +- samples/standalone-sample/pom.xml | 6 +- .../java/org/apache/webbeans/se/sample/Boot.java | 4 +- .../apache/webbeans/se/sample/beans/FileLogin.java | 2 +- .../se/sample/beans/JavaLoggerFactory.java | 2 +- .../se/sample/bindings/FileLoginBinding.java | 2 +- .../webbeans/se/sample/bindings/JavaLogger.java | 2 +- .../apache/webbeans/se/sample/gui/LoginWindow.java | 4 +- samples/tomcat7-sample/pom.xml | 20 +- .../samples/tomcat/CurrentDateProvider.java | 6 +- .../webbeans/samples/tomcat/InjectorServlet.java | 14 +- .../apache/webbeans/samples/tomcat/MyFilter.java | 18 +- .../samples/tomcat/SampleContextObserver.java | 12 +- src/site/apt/contributing.apt | 84 ---- src/site/apt/documentation.apt | 28 -- src/site/apt/examples/guess.apt | 14 - src/site/apt/extensions/index.apt | 26 -- src/site/apt/index.apt | 82 ---- src/site/apt/irc.apt | 28 -- src/site/apt/jakarta.apt | 110 ----- src/site/apt/jsr299.apt | 29 -- src/site/apt/jsr330.apt | 25 -- src/site/apt/trademarks.apt | 30 -- src/site/fml/faq.fml | 66 --- src/site/resources/documents/userguide.pdf | Bin 91264 -> 0 bytes .../resources/images/logos/openwebbeans_hor.png | Bin 9749 -> 0 bytes .../resources/images/logos/openwebbeans_small.png | Bin 6888 -> 0 bytes .../resources/images/logos/openwebbeans_vert.png | Bin 7763 -> 0 bytes src/site/site.xml | 62 --- .../owb-arquillian-standalone/pom.xml | 35 +- .../standalone/OwbArquillianScannerService.java | 2 +- .../arquillian/standalone/OwbLifecycleHandler.java | 8 +- .../standalone/OwbStandaloneContainer.java | 2 +- .../OwbArquillianImplicitBdaJarDeploymentTest.java | 4 +- .../test/OwbArquillianJarDeploymentTest.java | 2 +- .../OwbArquillianTrimmedBdaJarDeploymentTest.java | 4 +- .../OwbArquillianWebInfClassesDeploymentTest.java | 2 +- .../test/OwbArquillianWebJarDeploymentTest.java | 2 +- .../webbeans/arquillian/test/beans/SampleUser.java | 4 +- webbeans-arquillian/pom.xml | 2 +- webbeans-ee-common/pom.xml | 31 +- webbeans-ee/pom.xml | 47 +-- .../webbeans/ee/beans/UserTransactionBean.java | 3 +- .../webbeans/ee/beans/UserTransactionProvider.java | 4 +- .../apache/webbeans/ee/beans/ValidatorBean.java | 2 +- .../webbeans/ee/beans/ValidatorFactoryBean.java | 2 +- .../ee/beans/ValidatorFactoryProvider.java | 4 +- .../webbeans/ee/beans/ValidatorProvider.java | 4 +- .../ee/event/TransactionalEventNotifier.java | 16 +- webbeans-ejb/pom.xml | 32 +- .../webbeans/ejb/common/component/BaseEjbBean.java | 6 +- .../ejb/common/component/EjbBeanBuilder.java | 12 +- .../webbeans/ejb/common/util/EjbConstants.java | 1 - .../webbeans/ejb/common/util/EjbValidator.java | 17 +- .../ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java | 7 +- webbeans-el22/pom.xml | 47 +-- .../java/org/apache/webbeans/el22/EL22Adaptor.java | 4 +- .../apache/webbeans/el22/WebBeansELResolver.java | 12 +- .../webbeans/el22/WrappedExpressionFactory.java | 10 +- .../webbeans/el22/WrappedMethodExpression.java | 8 +- .../webbeans/el22/WrappedValueExpression.java | 10 +- .../apache/webbeans/el/test/AbstractUnitTest.java | 8 +- .../apache/webbeans/el/test/ELPerformanceTest.java | 6 +- .../org/apache/webbeans/el/test/MockELContext.java | 8 +- .../org/apache/webbeans/el/test/RequestBean.java | 2 +- .../org/apache/webbeans/el/test/SampleBean.java | 6 +- webbeans-gradle/pom.xml | 2 +- webbeans-impl/pom.xml | 36 +- webbeans-impl/src/it/properties/pom.xml | 8 +- .../spi/configuration/ExcludeExtensionsTest.java | 6 +- .../webbeans/annotation/AnnotationManager.java | 123 +----- .../org/apache/webbeans/annotation/AnyLiteral.java | 2 +- .../annotation/ApplicationScopeLiteral.java | 4 +- .../annotation/BeforeDestroyedLiteral.java | 14 +- .../apache/webbeans/annotation/DefaultLiteral.java | 2 +- .../webbeans/annotation/DependentScopeLiteral.java | 2 +- .../webbeans/annotation/DestroyedLiteral.java | 14 +- .../annotation/EmptyAnnotationLiteral.java | 4 +- .../webbeans/annotation/InitializedLiteral.java | 14 +- .../apache/webbeans/annotation/NamedLiteral.java | 4 +- .../org/apache/webbeans/annotation/NewLiteral.java | 53 --- .../webbeans/annotation/RequestedScopeLiteral.java | 2 +- .../webbeans/annotation/SessionScopeLiteral.java | 4 +- .../apache/webbeans/component/AbstractOwbBean.java | 18 +- .../webbeans/component/AbstractProducerBean.java | 6 +- .../webbeans/component/BeanAttributesImpl.java | 16 +- .../apache/webbeans/component/BeanManagerBean.java | 2 +- .../webbeans/component/BeanMetadataBean.java | 6 +- .../apache/webbeans/component/BuiltInOwbBean.java | 4 +- .../webbeans/component/CdiInterceptorBean.java | 10 +- .../webbeans/component/ConversationBean.java | 6 +- .../apache/webbeans/component/DecoratorBean.java | 6 +- .../webbeans/component/DecoratorMetadataBean.java | 4 +- .../webbeans/component/EjbInterceptorBean.java | 10 +- .../org/apache/webbeans/component/EventBean.java | 4 +- .../webbeans/component/EventMetadataBean.java | 2 +- .../apache/webbeans/component/ExtensionBean.java | 2 +- .../component/ExtensionProducerFactory.java | 10 +- .../apache/webbeans/component/IBeanHasParent.java | 2 +- .../webbeans/component/InjectionPointBean.java | 2 +- .../webbeans/component/InjectionTargetBean.java | 8 +- .../apache/webbeans/component/InstanceBean.java | 6 +- .../InterceptedOrDecoratedBeanMetadataBean.java | 12 +- .../component/InterceptionFactoryBean.java | 8 +- .../apache/webbeans/component/InterceptorBean.java | 14 +- .../component/InterceptorMetadataBean.java | 4 +- .../org/apache/webbeans/component/ManagedBean.java | 12 +- .../org/apache/webbeans/component/NewBean.java | 27 -- .../apache/webbeans/component/NewManagedBean.java | 73 ---- .../org/apache/webbeans/component/OwbBean.java | 4 +- .../webbeans/component/PrincipalProvider.java | 2 +- .../ProducerAwareInjectionTargetBean.java | 6 +- .../webbeans/component/ProducerFieldBean.java | 6 +- .../webbeans/component/ProducerMethodBean.java | 4 +- .../apache/webbeans/component/ResourceBean.java | 4 +- .../webbeans/component/ResourceProvider.java | 2 +- .../webbeans/component/SelfInterceptorBean.java | 8 +- .../webbeans/component/SimpleProducerFactory.java | 6 +- .../apache/webbeans/component/WebBeansType.java | 2 +- .../component/creation/AbstractBeanBuilder.java | 16 +- .../creation/AbstractProducerBeanBuilder.java | 10 +- .../component/creation/BaseProducerFactory.java | 28 +- .../component/creation/BeanAttributesBuilder.java | 30 +- .../creation/CdiInterceptorBeanBuilder.java | 6 +- .../component/creation/DecoratorBeanBuilder.java | 18 +- .../creation/EjbInterceptorBeanBuilder.java | 6 +- .../component/creation/ExtensionBeanBuilder.java | 4 +- .../component/creation/FieldProducerFactory.java | 12 +- .../component/creation/InterceptorBeanBuilder.java | 28 +- .../component/creation/ManagedBeanBuilder.java | 8 +- .../component/creation/MethodProducerFactory.java | 10 +- .../component/creation/ObserverMethodsBuilder.java | 28 +- .../creation/ProducerFieldBeanBuilder.java | 4 +- .../creation/ProducerFieldBeansBuilder.java | 10 +- .../creation/ProducerMethodBeanBuilder.java | 10 +- .../creation/ProducerMethodBeansBuilder.java | 18 +- .../component/creation/ResourceBeanBuilder.java | 6 +- .../creation/ResourceProducerFactory.java | 6 +- .../creation/SelfInterceptorBeanBuilder.java | 4 +- .../component/creation/UnproxyableBean.java | 8 +- .../PassivationCapableThirdpartyBeanImpl.java | 4 +- .../third/ThirdpartyBeanAttributesImpl.java | 2 +- .../component/third/ThirdpartyBeanImpl.java | 10 +- .../org/apache/webbeans/config/BeansDeployer.java | 54 +-- .../apache/webbeans/config/DefaultAnnotation.java | 2 +- .../config/DeploymentValidationService.java | 18 +- .../webbeans/config/EJBWebBeansConfigurator.java | 6 +- .../webbeans/config/OpenWebBeansConfiguration.java | 12 +- .../apache/webbeans/config/WebBeansContext.java | 4 +- .../AnnotatedConstructorConfiguratorImpl.java | 6 +- .../AnnotatedFieldConfiguratorImpl.java | 4 +- .../AnnotatedMethodConfiguratorImpl.java | 6 +- .../AnnotatedParameterConfiguratorImpl.java | 4 +- .../AnnotatedTypeConfiguratorImpl.java | 10 +- .../BeanAttributesConfiguratorImpl.java | 6 +- .../configurator/BeanConfiguratorImpl.java | 44 +- .../InjectionPointConfiguratorImpl.java | 8 +- .../ObserverMethodConfiguratorImpl.java | 22 +- .../configurator/ProducerConfiguratorImpl.java | 8 +- .../webbeans/container/AnnotatedTypeWrapper.java | 10 +- .../apache/webbeans/container/BeanCacheKey.java | 4 +- .../apache/webbeans/container/BeanManagerImpl.java | 82 ++-- .../container/DecoratorInjectionTargetFactory.java | 6 +- .../apache/webbeans/container/ExternalScope.java | 4 +- .../webbeans/container/InjectableBeanManager.java | 58 +-- .../webbeans/container/InjectionResolver.java | 107 +---- .../container/InjectionTargetFactoryImpl.java | 18 +- .../container/InterceptionFactoryImpl.java | 8 +- .../InterceptorInjectionTargetFactory.java | 4 +- .../java/org/apache/webbeans/container/OwbCDI.java | 22 +- .../apache/webbeans/container/OwbCDIProvider.java | 4 +- .../webbeans/container/SerializableBean.java | 16 +- .../webbeans/container/SerializableBeanVault.java | 8 +- .../apache/webbeans/context/AbstractContext.java | 12 +- .../webbeans/context/AbstractContextsService.java | 6 +- .../webbeans/context/ApplicationContext.java | 4 +- .../webbeans/context/ConversationContext.java | 2 +- .../CustomAlterablePassivatingContextImpl.java | 4 +- .../context/CustomPassivatingContextImpl.java | 6 +- .../apache/webbeans/context/DependentContext.java | 8 +- .../webbeans/context/PassivatingContext.java | 2 +- .../apache/webbeans/context/RequestContext.java | 8 +- .../apache/webbeans/context/SessionContext.java | 4 +- .../apache/webbeans/context/SingletonContext.java | 2 +- .../ActivateRequestContextInterceptorBean.java | 22 +- .../control/OwbRequestContextController.java | 8 +- .../control/RequestContextControllerBean.java | 2 +- .../control/RequestContextControllerProducer.java | 4 +- .../context/creational/BeanInstanceBag.java | 4 +- .../creational/CreationalContextFactory.java | 4 +- .../context/creational/CreationalContextImpl.java | 10 +- .../creational/DependentCreationalContext.java | 2 +- .../creational/WrappedCreationalContext.java | 4 +- .../webbeans/conversation/ConversationImpl.java | 6 +- .../webbeans/conversation/ConversationManager.java | 16 +- .../conversation/ConversationStorageBean.java | 16 +- .../corespi/scanner/AbstractMetaDataDiscovery.java | 6 +- .../webbeans/corespi/se/BaseSeContextsService.java | 20 +- .../corespi/se/DefaultContextsService.java | 2 +- .../corespi/se/StandaloneContextsService.java | 2 +- .../webbeans/decorator/DecoratorComparator.java | 2 +- .../webbeans/decorator/DecoratorsManager.java | 6 +- .../webbeans/deployment/StereoTypeModel.java | 10 +- .../org/apache/webbeans/el/ELContextStore.java | 6 +- .../event/ContainerEventObserverMethodImpl.java | 10 +- .../apache/webbeans/event/EventContextImpl.java | 4 +- .../java/org/apache/webbeans/event/EventImpl.java | 10 +- .../apache/webbeans/event/EventMetadataImpl.java | 6 +- .../java/org/apache/webbeans/event/EventUtil.java | 4 +- .../apache/webbeans/event/NotificationManager.java | 52 +-- .../apache/webbeans/event/ObserverMethodImpl.java | 38 +- .../apache/webbeans/event/OwbObserverMethod.java | 4 +- .../exception/DuplicateDefinitionException.java | 2 +- .../InconsistentSpecializationException.java | 2 +- .../exception/WebBeansConfigurationException.java | 2 +- .../exception/WebBeansDeploymentException.java | 2 +- .../apache/webbeans/inject/AbstractInjectable.java | 14 +- .../webbeans/inject/AlternativesManager.java | 10 +- .../webbeans/inject/InjectableConstructor.java | 6 +- .../apache/webbeans/inject/InjectableField.java | 4 +- .../apache/webbeans/inject/InjectableMethod.java | 14 +- .../org/apache/webbeans/inject/OWBInjector.java | 8 +- .../inject/impl/InjectionPointFactory.java | 31 +- .../webbeans/inject/impl/InjectionPointImpl.java | 20 +- .../webbeans/inject/instance/InstanceImpl.java | 32 +- .../intercept/AbstractInvocationContext.java | 4 +- .../ApplicationScopedBeanInterceptorHandler.java | 8 +- .../ConstructorInterceptorInvocationContext.java | 6 +- .../webbeans/intercept/DecoratorHandler.java | 8 +- .../intercept/DefaultInterceptorHandler.java | 16 +- .../webbeans/intercept/InterceptorComparator.java | 2 +- .../intercept/InterceptorInvocationContext.java | 6 +- .../intercept/InterceptorResolutionService.java | 42 +- .../apache/webbeans/intercept/InterceptorUtil.java | 4 +- .../webbeans/intercept/InterceptorsManager.java | 10 +- .../LifecycleInterceptorInvocationContext.java | 8 +- .../NormalScopedBeanInterceptorHandler.java | 14 +- .../RequestScopedBeanInterceptorHandler.java | 6 +- .../SessionScopedBeanInterceptorHandler.java | 6 +- .../webbeans/lifecycle/AbstractLifeCycle.java | 2 +- .../webbeans/lifecycle/StandaloneLifeCycle.java | 10 +- .../webbeans/logger/WebBeansLoggerFacade.java | 2 +- .../webbeans/plugins/OpenWebBeansJmsPlugin.java | 2 +- .../org/apache/webbeans/plugins/PluginLoader.java | 2 +- .../webbeans/portable/AbstractAnnotated.java | 2 +- .../portable/AbstractAnnotatedCallable.java | 6 +- .../webbeans/portable/AbstractAnnotatedMember.java | 4 +- .../portable/AbstractDecoratorInjectionTarget.java | 10 +- .../portable/AbstractEjbInjectionTarget.java | 6 +- .../apache/webbeans/portable/AbstractProducer.java | 20 +- .../portable/AnnotatedConstructorImpl.java | 6 +- .../webbeans/portable/AnnotatedElementFactory.java | 12 +- .../webbeans/portable/AnnotatedFieldImpl.java | 4 +- .../webbeans/portable/AnnotatedMethodImpl.java | 6 +- .../webbeans/portable/AnnotatedParameterImpl.java | 4 +- .../webbeans/portable/AnnotatedTypeImpl.java | 10 +- .../webbeans/portable/BaseProducerProducer.java | 16 +- .../webbeans/portable/BeanManagerProducer.java | 4 +- .../webbeans/portable/BeanMetadataProducer.java | 4 +- .../webbeans/portable/ConversationProducer.java | 10 +- .../webbeans/portable/EventMetadataProducer.java | 8 +- .../apache/webbeans/portable/EventProducer.java | 8 +- .../webbeans/portable/ExtensionProducer.java | 6 +- .../webbeans/portable/InjectionPointProducer.java | 10 +- .../webbeans/portable/InjectionTargetImpl.java | 34 +- .../apache/webbeans/portable/InstanceProducer.java | 6 +- .../LazyInterceptorDefinedInjectionTarget.java | 10 +- .../apache/webbeans/portable/MetadataProducer.java | 4 +- .../webbeans/portable/ProducerFieldProducer.java | 14 +- .../webbeans/portable/ProducerMethodProducer.java | 12 +- .../webbeans/portable/ProviderBasedProducer.java | 4 +- .../portable/ProviderBasedProducerFactory.java | 8 +- .../apache/webbeans/portable/ResourceProducer.java | 8 +- .../webbeans/portable/events/ExtensionLoader.java | 10 +- .../portable/events/ProcessAnnotatedTypeImpl.java | 6 +- .../portable/events/ProcessBeanAttributesImpl.java | 8 +- .../webbeans/portable/events/ProcessBeanImpl.java | 6 +- .../portable/events/ProcessInjectionPointImpl.java | 8 +- .../events/ProcessInjectionTargetImpl.java | 6 +- .../portable/events/ProcessManagedBeanImpl.java | 4 +- .../portable/events/ProcessObserverMethodImpl.java | 10 +- .../portable/events/ProcessProducerFieldImpl.java | 6 +- .../portable/events/ProcessProducerImpl.java | 8 +- .../portable/events/ProcessProducerMethodImpl.java | 6 +- .../portable/events/ProcessSessionBeanImpl.java | 8 +- .../events/ProcessSyntheticAnnotatedTypeImpl.java | 8 +- .../events/discovery/AfterBeanDiscoveryImpl.java | 32 +- .../discovery/AfterDeploymentValidationImpl.java | 2 +- .../events/discovery/AfterTypeDiscoveryImpl.java | 8 +- .../discovery/AnnotatedTypeConfiguratorHolder.java | 4 +- .../events/discovery/BeforeBeanDiscoveryImpl.java | 18 +- .../events/discovery/BeforeShutdownImpl.java | 2 +- .../portable/events/discovery/ExtensionAware.java | 2 +- .../events/generics/GProcessAnnotatedType.java | 2 +- .../portable/events/generics/GProcessBean.java | 4 +- .../events/generics/GProcessBeanAttributes.java | 4 +- .../events/generics/GProcessInjectionPoint.java | 4 +- .../events/generics/GProcessInjectionTarget.java | 2 +- .../events/generics/GProcessManagedBean.java | 2 +- .../events/generics/GProcessObserverMethod.java | 4 +- .../portable/events/generics/GProcessProducer.java | 4 +- .../events/generics/GProcessProducerField.java | 4 +- .../events/generics/GProcessProducerMethod.java | 4 +- .../events/generics/GProcessSessionBean.java | 8 +- .../generics/GProcessSyntheticAnnotatedType.java | 4 +- .../events/generics/GProcessSyntheticBean.java | 8 +- .../generics/GProcessSyntheticObserverMethod.java | 8 +- .../webbeans/proxy/AbstractProxyFactory.java | 2 +- .../proxy/InterceptorDecoratorProxyFactory.java | 4 +- .../webbeans/proxy/NormalScopeProxyFactory.java | 8 +- .../apache/webbeans/proxy/OwbNormalScopeProxy.java | 4 +- .../webbeans/proxy/SubclassProxyFactory.java | 4 +- .../service/DefaultInjectionPointService.java | 8 +- .../webbeans/service/DefaultLoaderService.java | 2 +- .../org/apache/webbeans/util/AnnotationUtil.java | 8 +- .../java/org/apache/webbeans/util/ClassUtil.java | 2 +- .../webbeans/util/InjectionExceptionUtil.java | 10 +- .../org/apache/webbeans/util/PriorityClasses.java | 4 +- .../apache/webbeans/util/SpecializationUtil.java | 10 +- .../apache/webbeans/util/WebBeansConstants.java | 12 +- .../org/apache/webbeans/util/WebBeansUtil.java | 172 +++----- .../META-INF/openwebbeans/openwebbeans.properties | 14 +- ...r => jakarta.enterprise.inject.spi.CDIProvider} | 1 + .../webbeans/container/OwbCDIProviderTest.java | 10 +- .../ActivateRequestContextInterceptorBeanTest.java | 14 +- .../control/OwbRequestContextControllerTest.java | 4 +- .../conversation/ConversationManagerTest.java | 2 +- .../scanner/AbstractMetaDataDiscoveryTest.java | 8 +- .../webbeans/portable/AnnotatedTypeImplTest.java | 2 +- .../org/apache/webbeans/test/AbstractUnitTest.java | 8 +- .../AnnotationWithArrayOfBooleanMember.java | 2 +- .../binding/AnnotationWithArrayOfIntMember.java | 2 +- .../binding/AnnotationWithArrayOfStringMember.java | 2 +- .../binding/AnnotationWithBindingMember.java | 2 +- .../binding/AnnotationWithNonBindingMember.java | 4 +- .../test/annotation/binding/Asynchronous.java | 2 +- .../webbeans/test/annotation/binding/Binding1.java | 2 +- .../test/annotation/binding/Binding1Literal.java | 2 +- .../webbeans/test/annotation/binding/Binding2.java | 2 +- .../webbeans/test/annotation/binding/Cash.java | 2 +- .../webbeans/test/annotation/binding/Check.java | 2 +- .../annotation/binding/DummyAnnotationLiteral.java | 2 +- .../binding/NonBindingAnnotationType.java | 4 +- .../annotation/binding/NonBindingArrayType.java | 2 +- .../webbeans/test/annotation/binding/NotAny.java | 2 +- .../test/annotation/binding/NotAnyLiteral.java | 2 +- .../test/annotation/binding/ParameterBinding1.java | 2 +- .../test/annotation/binding/ParameterBinding2.java | 2 +- .../test/annotation/binding/ParameterBinding3.java | 2 +- .../webbeans/test/annotation/binding/PayBy.java | 2 +- .../test/annotation/binding/ProducerBinding1.java | 2 +- .../test/annotation/binding/ProducerBinding2.java | 2 +- .../webbeans/test/annotation/binding/Role.java | 2 +- .../webbeans/test/annotation/binding/Service.java | 2 +- .../test/annotation/binding/SingletonBinding.java | 2 +- .../test/annotation/binding/Synchronous.java | 2 +- .../test/annotation/binding/TestingIfExists.java | 2 +- .../annotation/binding/TestingIfNonExists.java | 2 +- .../test/annotation/binding/TestingNormal.java | 2 +- .../webbeans/test/annotation/binding/Users.java | 2 +- .../test/bean/SerializableBeanEqualTest.java | 15 +- .../test/bean/ThirdPartyBeanLookupTest.java | 28 +- .../webbeans/test/component/BindingComponent.java | 2 +- .../test/component/CheckWithCheckPayment.java | 4 +- .../CheckWithCheckPaymentDecoratorField.java | 2 +- .../test/component/CheckWithMoneyPayment.java | 2 +- .../test/component/ContainUserComponent.java | 6 +- .../test/component/ContaintsCurrentComponent.java | 6 +- .../test/component/CurrentBindingComponent.java | 6 +- .../test/component/DisposalMethodComponent.java | 12 +- .../component/InjectedTypeLiteralComponent.java | 6 +- .../test/component/NonBindingComponent.java | 4 +- .../test/component/PaymentProcessorComponent.java | 6 +- .../test/component/PostConstructComponent.java | 6 +- .../PostConstructDoubleInterceptorComponent.java | 8 +- .../PostConstructInterceptorComponent.java | 8 +- .../test/component/PreDestroyComponent.java | 8 +- .../apache/webbeans/test/component/Singleton.java | 6 +- .../test/component/TypeLiteralComponent.java | 4 +- .../webbeans/test/component/UserComponent.java | 4 +- .../component/binding/AnyBindingComponent.java | 2 +- ...ndingWithNonBindingAnnotationTypeComponent.java | 4 +- .../BindingWithNonBindingArrayTypeComponent.java | 2 +- .../broken/DelegateAttributeIsnotInterface.java | 4 +- ...ateAttributeMustImplementAllDecoratedTypes.java | 4 +- .../broken/MoreThanOneDelegateAttribute.java | 4 +- .../decorator/broken/PaymentDecorator.java | 8 +- .../decorator/clean/AccountComponent.java | 4 +- .../decorator/clean/LargeTransactionDecorator.java | 6 +- .../decorator/clean/ServiceDecorator.java | 8 +- .../ServiceDecoratorWithCtInjectionPoint.java | 8 +- .../component/definition/BeanTypesDefinedBean.java | 6 +- .../component/dependent/DependentComponent.java | 2 +- .../dependent/DependentOwnerComponent.java | 6 +- .../dependent/MultipleDependentComponent.java | 6 +- .../component/dependent/circular/DependentA.java | 6 +- .../component/dependent/circular/DependentB.java | 2 +- .../test/component/disposal/Disposal1.java | 10 +- .../event/broken/BrokenObserverComponent1.java | 2 +- .../event/broken/BrokenObserverComponent2.java | 2 +- .../event/broken/BrokenObserverComponent3.java | 4 +- .../event/broken/BrokenObserverComponent4.java | 4 +- .../event/broken/BrokenObserverComponent5.java | 4 +- .../event/broken/BrokenObserverComponent6.java | 4 +- .../event/normal/ComponentWithObservable1.java | 10 +- .../event/normal/ComponentWithObserves1.java | 6 +- .../event/normal/ComponentWithObserves2.java | 4 +- .../event/normal/ComponentWithObserves3.java | 10 +- .../event/normal/ComponentWithObserves4.java | 8 +- .../event/normal/ComponentWithObserves5.java | 10 +- .../event/normal/ComponentWithObserves6.java | 4 +- .../event/normal/ComponentWithObserves7.java | 8 +- .../test/component/event/normal/Transactional.java | 2 +- .../event/normal/TransactionalInterceptor.java | 14 +- .../AroundInvokeWithFinalMethodComponent.java | 4 +- .../AroundInvokeWithSameMethodNameComponent.java | 4 +- .../AroundInvokeWithStaticMethodComponent.java | 4 +- .../AroundInvokeWithWrongReturnTypeComponent.java | 4 +- .../AroundInvokeWithoutParameterComponent.java | 2 +- .../AroundInvokeWithoutReturnTypeComponent.java | 4 +- .../MoreThanOneAroundInvokeComponent.java | 4 +- .../MoreThanOneConstructureComponent.java | 2 +- .../MoreThanOneConstructureComponent2.java | 2 +- .../MoreThanOnePostConstructComponent.java | 2 +- .../exception/MultipleDisposalMethodComponent.java | 8 +- .../exception/NewComponentBindingComponent.java | 30 -- .../exception/NewComponentInterfaceComponent.java | 30 -- .../NewMethodComponentBindingComponent.java | 37 -- ...ContructMethodHasCheckedExceptionComponent.java | 2 +- .../PostContructMethodHasParameterComponent.java | 2 +- .../PostContructMethodHasReturnTypeComponent.java | 2 +- .../PostContructMethodHasStaticComponent.java | 2 +- .../exception/ProducerTypeExceptionComponent.java | 2 +- .../exception/ProducerTypeStaticComponent.java | 2 +- .../exception/initializer/BrokenInitializer1.java | 4 +- .../exception/initializer/BrokenInitializer2.java | 4 +- .../exception/initializer/BrokenInitializer3.java | 4 +- .../exception/initializer/BrokenInitializer4.java | 4 +- ...ponentDefaultScopeWithDifferentScopeSteros.java | 2 +- .../ComponentDefaultScopeWithNonScopeStero.java | 2 +- .../component/inheritance/types/InhBinding1.java | 2 +- .../component/inheritance/types/InhBinding2.java | 2 +- .../inheritance/types/InhIntBinding1.java | 2 +- .../inheritance/types/InhIntBinding2.java | 2 +- .../component/inheritance/types/InhScopeType1.java | 2 +- .../component/inheritance/types/InhScopeType2.java | 2 +- .../component/inheritance/types/InhStereo1.java | 2 +- .../component/inheritance/types/InhStereo2.java | 2 +- .../inject/alternative/AlternativeComponent.java | 2 +- .../inject/alternative/AlternativeInjector.java | 4 +- .../broken/InstanceInjectedBrokenComponent1.java | 6 +- .../broken/InstanceInjectedBrokenComponent2.java | 6 +- .../broken/InstanceInjectedBrokenComponent3.java | 6 +- .../broken/InstanceInjectedBrokenComponent4.java | 6 +- .../broken/InstanceInjectedWorkingComponent.java | 6 +- .../inject/generic/GenericComponentInjector.java | 4 +- .../inject/named/NamedFieldWithNamedValue.java | 4 +- .../inject/named/NamedFieldWithoutNamedValue.java | 4 +- .../inject/named/NamedOtherWithNamedValue.java | 4 +- .../inject/named/NamedOtherWithoutNamedValue.java | 4 +- .../named/NamedPayment_PaymentProcessor.java | 4 +- .../component/inject/named/NamedPayment_Value.java | 4 +- .../component/intercept/InterceptedComponent.java | 8 +- .../test/component/intercept/Interceptor1.java | 6 +- .../test/component/intercept/Interceptor2.java | 6 +- .../intercept/InterceptorWithSuperClass.java | 4 +- ...erceptorWithSuperClassInterceptedComponent.java | 8 +- ...dInterceptedWithClassInterceptorsComponent.java | 6 +- ...terceptedWithoutClassInterceptorsComponent.java | 8 +- .../intercept/MultipleInterceptedComponent.java | 8 +- .../MultipleListOfInterceptedComponent.java | 4 +- ...ListOfInterceptedWithExcludeClassComponent.java | 10 +- .../component/intercept/MultpleInterceptor.java | 4 +- .../intercept/NoArgConstructorInterceptor.java | 4 +- .../NoArgConstructorInterceptorComponent.java | 2 +- .../intercept/PostConstructInterceptor.java | 4 +- .../intercept/webbeans/ActionInterceptor.java | 6 +- .../webbeans/EnhancedActionInterceptor.java | 6 +- .../webbeans/SecureAndTransactionalComponent.java | 2 +- .../SecureAndTransactionalInterceptor.java | 6 +- .../intercept/webbeans/SecureComponent.java | 2 +- .../intercept/webbeans/SecureInterceptor.java | 8 +- .../component/intercept/webbeans/ShoppingCard.java | 2 +- .../webbeans/TransactionalInterceptor.java | 6 +- .../webbeans/TransactionalInterceptor2.java | 6 +- .../intercept/webbeans/WInterceptorComponent.java | 2 +- .../webbeans/WMetaInterceptorComponent.java | 2 +- .../intercept/webbeans/bindings/Action.java | 2 +- .../webbeans/bindings/RuntimeExceptions.java | 2 +- .../intercept/webbeans/bindings/Secure.java | 4 +- .../intercept/webbeans/bindings/Secure2.java | 4 +- .../intercept/webbeans/bindings/Transactional.java | 2 +- .../webbeans/test/component/library/BookShop.java | 8 +- .../literals/InstanceTypeLiteralBean.java | 10 +- .../pfield/ProducerFieldDefinitionComponent.java | 8 +- .../ProducerFieldDefinitionParameterized.java | 2 +- .../pfield/ProducerFieldInjectedComponent.java | 4 +- .../pfield/ProducerFieldInjectedWrongType.java | 2 +- .../pfield/broken/TypeVariableProducerField.java | 2 +- .../component/producer/ParametrizedProducer.java | 4 +- .../test/component/producer/Producer1.java | 8 +- .../test/component/producer/Producer2.java | 4 +- .../test/component/producer/Producer3.java | 4 +- .../test/component/producer/Producer4.java | 2 +- .../producer/Producer4ConsumerComponent.java | 4 +- .../component/producer/ScopeAdaptorComponent.java | 6 +- .../producer/ScopeAdaptorInjectorComponent.java | 4 +- .../test/component/producer/StaticProducer1.java | 6 +- .../producer/broken/BrokenProducerComponent1.java | 4 +- .../producer/broken/BrokenProducerComponent2.java | 4 +- .../producer/broken/BrokenProducerComponent3.java | 6 +- .../producer/broken/BrokenProducerComponent4.java | 4 +- .../producer/broken/BrokenProducerComponent5.java | 4 +- .../producer/broken/BrokenProducerComponent6.java | 2 +- .../producer/primitive/PrimitiveConsumer.java | 6 +- .../producer/primitive/PrimitiveProducer.java | 4 +- .../producer/specializes/SpecializesProducer1.java | 4 +- .../specializes/SpecializesProducerParentBean.java | 2 +- .../superclazz/SpecializesProducer1SuperClazz.java | 2 +- .../test/component/service/InjectedComponent.java | 2 +- .../service/Producer1ConsumerComponent.java | 6 +- .../test/component/service/ServiceImpl1.java | 2 +- .../webbeans/test/component/service/Typed2.java | 2 +- .../test/component/service/TypedInjection.java | 4 +- .../service/TypedInjectionWithoutArguments.java | 4 +- .../specializes/AsynhrounousSpecalizesService.java | 6 +- .../SpecializesServiceInjectorComponent.java | 6 +- .../specializes/logger/DefaultLogger.java | 2 +- .../specializes/logger/LoggerBinding.java | 2 +- .../logger/MockNotSpecializedLogger.java | 2 +- .../specializes/logger/MockSpecializedLogger.java | 4 +- .../specializes/logger/SpecializedInjector.java | 2 +- .../test/component/third/ThirdPartyExtension.java | 19 +- .../third/ThirdPartyProgrammaticLookupTest.java | 2 +- .../alternativebean/CustomAlternativeBean.java | 16 +- .../alternatives/common/AlternativeBean.java | 2 +- .../AlternativeOnClassAndProducerMethodBean.java | 4 +- .../common/AlternativeOnClassOnlyBean.java | 4 +- .../AlternativeOnProducerMethodOnlyBean.java | 4 +- .../AlternativeWithEvenHigherPriorityBean.java | 4 +- .../common/AlternativeWithHighPriorityBean.java | 4 +- .../common/AlternativeWithPriorityBean.java | 4 +- .../common/AlternativeWithSamePriorityBean.java | 4 +- .../alternatives/common/DefaultBeanProducer.java | 4 +- .../common/DefaultBeanProducerWithoutDisposes.java | 2 +- .../test/concepts/alternatives/common/Pen.java | 2 +- .../alternatives/common/PencilProducerBean.java | 4 +- .../common/QualifierProducerBased.java | 2 +- .../alternatives/common/SimpleInjectionTarget.java | 6 +- .../alternatives/common/YetAnotherPencil.java | 2 +- .../tests/AlternativeBeanResolvingTest.java | 4 +- .../tests/AlternativeInstanceTest.java | 4 +- .../tests/AlternativeOnProducerFieldTest.java | 4 +- .../tests/AlternativeProducerMethodTest.java | 2 +- .../tests/CustomAlternativeBeanTest.java | 12 +- .../BrokenInitializerMethodBecauseofGeneric.java | 5 +- .../test/concepts/stereotypes/MyStereoType1.java | 2 +- .../test/concepts/stereotypes/MyStereoType2.java | 4 +- .../test/concepts/typeliterals/MyType.java | 2 +- .../test/concepts/vetoes/VetoedPackageTest.java | 2 +- .../vetoes/vetoedpackage/package-info.java | 2 +- .../webbeans/test/config/BeansDeployerTest.java | 10 +- .../AnnotatedTypeConfiguratorImplTest.java | 16 +- .../BeanAttributesConfiguratorImplTest.java | 10 +- .../test/configurator/DefaultQualifierTest.java | 10 +- ...erMethodConfiguratorAfterBeanDiscoveryTest.java | 16 +- .../ComponentResolutionByTypeTest.java | 2 +- .../webbeans/test/contexts/SerializationTest.java | 10 +- .../contexts/StandaloneContextsServiceTest.java | 2 +- .../conversation/ConversationScopedBean.java | 6 +- .../conversation/ConversationScopedInitBean.java | 6 +- .../conversation/ConversationScopedTest.java | 6 +- .../conversation/EndConversationObserver.java | 8 +- .../test/contexts/serialize/AppScopedBean.java | 2 +- .../test/contexts/serialize/SessScopedBean.java | 4 +- .../contexts/session/common/AppScopedBean.java | 14 +- .../contexts/session/common/PersonalDataBean.java | 8 +- .../contexts/session/tests/SessionContextTest.java | 4 +- .../threadsafety/LongInitApplicationBean.java | 4 +- .../ThreadSafeBeanInitialisationTest.java | 8 +- .../test/decorators/broken/BrokenAlternative.java | 8 +- .../test/decorators/broken/BrokenName.java | 8 +- .../test/decorators/broken/BrokenScope.java | 8 +- .../test/decorators/broken/ValidDecorator.java | 6 +- .../decorators/common/ConversationDecorator.java | 8 +- .../test/decorators/common/GarphlyDecorator.java | 6 +- .../DecoratorConstructorInjectionTest.java | 12 +- .../decorators/dependent/DependentDecorator.java | 8 +- .../test/decorators/generic/DecoratedBean.java | 4 +- .../decorators/generic/ExtendedDecoratedBean.java | 2 +- .../generic/ExtendedGenericInterface.java | 2 +- .../generic/ExtendedSampleDecorator.java | 8 +- .../test/decorators/generic/SampleDecorator.java | 8 +- .../test/decorators/multiple/Decorator1.java | 6 +- .../test/decorators/multiple/Decorator2.java | 12 +- .../test/decorators/multiple/Decorator3.java | 18 +- .../test/decorators/multiple/Decorator4.java | 12 +- .../decorators/multiple/MultipleCallDecorator.java | 6 +- .../test/decorators/multiple/MyIntercept.java | 2 +- .../decorators/multiple/OutputInterceptor.java | 8 +- .../test/decorators/multiple/OutputProvider.java | 6 +- .../test/decorators/multiple/OutsideBean.java | 4 +- .../decorators/multiple/RequestStringBuilder.java | 2 +- .../test/decorators/simple/LogDecorator.java | 8 +- .../webbeans/test/decorators/simple/MyLog.java | 2 +- .../webbeans/test/decorators/simple/OtherLog.java | 2 +- .../decorators/simple/SimpleDecoratorTest.java | 6 +- .../tests/ConversationDecoratorTest.java | 8 +- .../tests/DecoratorAndInterceptorStackTests.java | 8 +- .../decorators/tests/DecoratorInheritanceTest.java | 6 +- .../tests/DependentDecoratorDestroyTest.java | 8 +- .../tests/ExtendedGenericDecoratorTest.java | 14 +- .../ExtendedMulitpleGenericDecoratorTest.java | 10 +- .../decorators/tests/GenericDecoratorTest.java | 2 +- .../tests/MultipleCallDecoratorTest.java | 6 +- .../tests/MultipleDecoratorStackTests.java | 6 +- .../tests/RepeatedGenericTypeDecoratorTest.java | 8 +- .../proxyable/ProxyableBeanTypeTest.java | 2 +- .../beans/BeanWithPrivateFinalMethod.java | 2 +- .../proxyable/beans/BeanWithPublicFinalMethod.java | 2 +- .../proxyable/beans/NonAbstractSubClassBean.java | 2 +- .../proxyable/beans/SubClassWithNormalScope.java | 2 +- .../InterceptorAnnotatedDiscoveryTest.java | 12 +- .../test/disposes/DependentMethodBeanTest.java | 6 +- .../test/disposes/DisposerMethodBeanTest.java | 10 +- .../webbeans/test/disposes/StaticProducerTest.java | 16 +- .../test/disposes/beans/AppScopedBean.java | 17 +- .../disposes/beans/DependentModelProducer.java | 10 +- .../test/disposes/beans/DisposerMethodBean.java | 15 +- .../test/disposes/beans/InjectedIntoBean.java | 6 +- .../disposes/beans/IntermediateDependentBean.java | 2 +- .../test/disposes/beans/RequestModelProducer.java | 12 +- .../disposes/beans/broken/BrokenDisposalTest.java | 2 +- .../beans/broken/DecoratorWithDisposes.java | 8 +- .../beans/broken/InterceptorWithDisposes.java | 8 +- .../beans/broken/NonProducerBeanWithDisposes.java | 2 +- .../webbeans/test/disposes/common/HttpHeader.java | 2 +- .../test/disposes/common/RequestModel.java | 4 +- .../webbeans/test/event/LoggedInObserver.java | 6 +- .../test/event/TypeArgumentInterfaceObserver.java | 6 +- .../webbeans/test/event/TypeArgumentObserver.java | 6 +- .../webbeans/test/event/broke/BrokenObserver.java | 6 +- .../test/events/async/ObserversAsyncTest.java | 6 +- .../container/SpecificContainerEventTest.java | 10 +- .../container/WildcardExtensionMatchingTest.java | 30 +- .../ShouldNotCatchExtensionEventBean.java | 10 +- .../test/events/generics/GenericObserverTest.java | 8 +- .../injectiontarget/ProcessBeanAttributesTest.java | 18 +- .../injectiontarget/ProcessInjectionPointTest.java | 18 +- .../ProcessInjectionTargetTest.java | 12 +- .../ReplaceInjectionTargetTest.java | 16 +- .../webbeans/test/events/observer/BeanA.java | 4 +- .../webbeans/test/events/observer/BeanB.java | 2 +- .../test/events/observer/EventSourceOwnerBean.java | 6 +- .../webbeans/test/events/observer/EventTest.java | 18 +- .../webbeans/test/events/observer/Litographer.java | 4 +- .../webbeans/test/events/observer/Painter.java | 4 +- .../webbeans/test/events/observer/Superclass.java | 2 +- .../AlternativeSpecializedFactory.java | 4 +- .../EventSourceOwnerBean.java | 6 +- .../events/specializedalternative/Factory.java | 2 +- .../beans/CircularApplicationScopedBean.java | 6 +- ...arConstructorOrProducerMethodParameterBean.java | 6 +- .../beans/CircularDependentScopedBean.java | 6 +- .../beans/CircularNormalInConstructor.java | 6 +- .../CircularInjectionIntoConstructorTest.java | 4 +- .../injection/constructor/beans/Administrator.java | 4 +- .../BeanWithSingleParamInjectConstructor.java | 2 +- .../beans/BeanWithTwoParamInjectConstructor.java | 2 +- .../test/injection/constructor/beans/User.java | 2 +- .../ArrayOuttOfBouncExceptionFromMLTest.java | 2 +- .../webbeans/test/injection/generics/Bar.java | 6 +- .../test/injection/generics/BarVetoExtension.java | 6 +- .../test/injection/generics/BazEnumProducer.java | 2 +- .../generics/FastMatchingGenericsTest.java | 4 +- .../webbeans/test/injection/generics/Foo.java | 2 +- .../test/injection/generics/GenericBeanTest.java | 2 +- .../test/injection/generics/GenericFactory.java | 2 +- .../test/injection/generics/GenericQualifier.java | 2 +- .../test/injection/generics/GenericsTest.java | 10 +- .../webbeans/test/injection/generics/MyBean.java | 4 +- .../test/injection/generics/StringBean.java | 2 +- .../injection/generics/StringBeanAbstract.java | 2 +- .../webbeans/test/injection/generics/UsingBaz.java | 2 +- .../generics/zoo/GenericsInTheZooTest.java | 4 +- .../test/injection/generics/zoo/HorseStable.java | 2 +- .../test/injection/generics/zoo/PigStable.java | 2 +- .../test/injection/generics/zoo/Stable.java | 2 +- .../injection/generics/zoo/StableProducer.java | 6 +- .../beans/AbstractInjectionPointOwner.java | 2 +- .../beans/ConstructorInjectionPointOwner.java | 8 +- .../beans/FieldInjectionPointOwner.java | 6 +- .../beans/InjectionPointBeansOwner.java | 6 +- .../beans/InjectionPointMetaDataOwner.java | 8 +- .../beans/InjectionPointObserver.java | 4 +- .../beans/InjectionPointOwnerInstance.java | 4 +- .../beans/InjectionPointOwnerProducer.java | 6 +- .../injectionpoint/beans/LoggerInjectedBean.java | 6 +- .../beans/MethodInjectionPointOwner.java | 6 +- .../injectionpoint/beans/MyContainer.java | 2 +- .../beans/ProducerInjectionPointInstanceOwner.java | 4 +- .../beans/ProducerMethodInjectionPointOwner.java | 2 +- .../injectionpoint/beans/PropertyHolder.java | 4 +- .../beans/PropertyHolderFactory.java | 6 +- .../injectionpoint/beans/PropertyInjector.java | 4 +- .../beans/UnmanagedClassWithInjectionPoints.java | 2 +- .../injectionpoint/common/LoggerQualifier.java | 2 +- .../test/injection/named/DefaultNamedBean.java | 2 +- .../webbeans/test/injection/named/NamedBean.java | 2 +- .../test/injection/named/NamedInjectionPoints.java | 4 +- .../webbeans/test/injection/named/NamedTests.java | 12 +- .../injection/noncontextual/ContextualBean.java | 2 +- .../noncontextual/InjectNonContextualTest.java | 16 +- .../injection/noncontextual/NonContextualBean.java | 2 +- .../ProducerWithNonSerializableParameterBean.java | 4 +- .../ProducerWithNonSerializableResultBean.java | 4 +- .../serialization/beans/SerializableBean.java | 2 +- .../SerializableDependentInjectionTarget.java | 4 +- .../beans/SerializableInjectionTargetFailA.java | 4 +- .../webbeans/test/injection/typed/NotInTyped.java | 2 +- .../webbeans/test/injection/typed/Raven.java | 2 +- .../test/injection/typed/TypedFieldProducer.java | 6 +- .../test/injection/typed/TypedMethodProducer.java | 6 +- .../test/injection/typed/TypedProducerTest.java | 2 +- .../injection/typeliteral/TypeLiteralTest.java | 4 +- .../webbeans/test/injection/unused/UnusedBean.java | 2 +- .../test/injection/unused/UnusedBeanDeclarer.java | 2 +- .../test/injection/unused/UnusedBeanProducer.java | 6 +- .../test/injection/unused/UnusedBeanTest.java | 2 +- .../webbeans/test/instance/CdiCurrentTest.java | 8 +- .../webbeans/test/instance/CustomProviderTest.java | 16 +- .../test/instance/InstanceDestroyalTest.java | 22 +- .../test/instance/InstanceInjectionPointTest.java | 20 +- .../test/instance/InstanceIteratorTest.java | 20 +- .../InstanceQualifierInjectionPointTest.java | 18 +- .../webbeans/test/instance/InstanceSelectTest.java | 10 +- .../test/instance/InstanceWithTypedTest.java | 8 +- .../DependentInterceptorBindingType.java | 2 +- .../interceptors/annotation/LoggingStereoType.java | 2 +- .../interceptors/annotation/SecureStereoType.java | 2 +- .../interceptors/beans/ApplicationScopedBean.java | 4 +- .../interceptors/beans/DependentScopedBean.java | 6 +- .../test/interceptors/beans/RequestScopedBean.java | 8 +- .../interceptors/broken/BrokenAlternative.java | 6 +- .../test/interceptors/broken/BrokenName.java | 6 +- .../test/interceptors/broken/BrokenScope.java | 6 +- .../common/RuntimeExceptionBindingTypeBean.java | 2 +- .../business/common/TransactionalBaseBean.java | 2 +- .../business/common/TransactionalChildBean.java | 2 +- .../common/WithInheritedBindingTypeBean.java | 4 +- .../WithInheritedStereoTypeInterceptorBean.java | 4 +- .../common/WithStereoTypeInterceptorBean.java | 4 +- .../business/tests/DependingInterceptorTest.java | 6 +- .../business/tests/InterceptorPerformanceTest.java | 6 +- .../business/tests/MultiRequestProxyTest.java | 2 +- .../interceptors/business/tests/NewProxyTest.java | 12 +- .../tests/WithInheritedBindingTypeTest.java | 6 +- .../WithInheritedStereoTypeInterceptorTest.java | 4 +- .../tests/WithStereoTypeInterceptorTest.java | 4 +- .../interceptors/common/DependentInterceptor.java | 6 +- .../common/RuntimeExceptionsInterceptor.java | 6 +- .../interceptors/common/SecureInterceptor.java | 6 +- .../common/TransactionInterceptor.java | 6 +- .../constructor/AroundConstructTest.java | 12 +- ...rceptionOfBeanWithConstructorInjectionTest.java | 10 +- .../dependent/DependentInterceptorTest.java | 4 +- .../dependent/DependentLifecycleBean.java | 6 +- .../dependent/DependentLifecycleTest.java | 4 +- .../interceptors/dependent/DependentSuperBean.java | 4 +- .../test/interceptors/dependent/MyExtraSuper.java | 4 +- .../test/interceptors/ejb/EjbInterceptor.java | 4 +- .../interceptors/ejb/EjbInterceptorExtension.java | 12 +- .../ejb/ManagedBeanWithEjbInterceptor.java | 4 +- .../ejb/ManagedBeanWithMethodEjbInterceptor.java | 4 +- .../ejb/ManagedBeanWithoutInterceptor.java | 2 +- .../extension/BeforeBeanDiscoveryImplTest.java | 28 +- .../InterceptorDecoratorProxyFactoryTest.java | 12 +- .../factory/NormalScopeProxyFactoryTest.java | 19 +- .../interceptors/factory/ProtectedUsageBean.java | 4 +- .../factory/SubPackageInterceptedClass.java | 6 +- .../factory/beans/ClassInterceptedClass.java | 6 +- .../factory/beans/ClassMultiInterceptedClass.java | 6 +- .../interceptors/factory/beans/DecoratedClass.java | 2 +- .../beans/InterceptionFactoryBeansProducer.java | 8 +- .../factory/beans/MyAbstractTestDecorator.java | 6 +- .../factory/beans/PartialBeanClass.java | 2 +- .../factory/beans/Secure2Interceptor.java | 6 +- .../interceptors/factory/beans/SomeBaseClass.java | 2 +- .../beans/TonsOfMethodsInterceptedClass.java | 2 +- .../factory/beans/TransactionalInterceptor.java | 6 +- .../factory/beans/UnproxyableClassProducer.java | 6 +- .../inheritance/BindingIncludedByIndirect.java | 2 +- .../inheritance/BindingIndirectInterceptor.java | 2 +- .../BindingInheritedIncludedByIndirect.java | 2 +- .../inheritance/BindingInheritedInterceptor.java | 2 +- .../inheritance/BindingMethodInterceptor.java | 2 +- .../inheritance/BindingSimpleInterceptor.java | 2 +- .../test/interceptors/inheritance/Deck.java | 4 +- .../test/interceptors/inheritance/DeckChild.java | 4 +- .../interceptors/inheritance/DeckStereotyped.java | 4 +- .../inheritance/DeckStereotypedChild.java | 4 +- .../inheritance/DeckStereotypedGrandchild.java | 4 +- .../inheritance/DeckStereotypedNotInherited.java | 4 +- .../DeckStereotypedNotInheritedChild.java | 4 +- .../inheritance/InheritedInterceptorTest.java | 4 +- .../inheritance/InterceptorIncludedByIndirect.java | 8 +- .../inheritance/InterceptorInherited.java | 8 +- .../InterceptorInheritedIncludedByIndirect.java | 8 +- .../inheritance/InterceptorMethod.java | 8 +- .../inheritance/InterceptorSimple.java | 8 +- .../interceptors/inheritance/StereotypeChild.java | 2 +- .../interceptors/inheritance/StereotypeParent.java | 2 +- .../inheritance/StereotypeParentNotInherited.java | 2 +- .../lifecycle/InterceptorExtension.java | 10 +- .../test/interceptors/lifecycle/LifecycleBean.java | 20 +- .../lifecycle/LifecycleInterceptor.java | 8 +- .../lifecycle/LifecycleInterceptorBbd.java | 10 +- .../lifecycle/LifecycleInterceptorPat.java | 8 +- .../test/interceptors/lifecycle/LifecycleTest.java | 7 +- .../interceptors/lifecycle/NotAnnotatedBean.java | 2 +- .../inheritance/LifecycleInheritanceTest.java | 4 +- .../LifecycleInheritedOverridenTest.java | 4 +- .../lifecycle/inheritance/SubClassBean.java | 6 +- .../inheritance/SubClassInheritedBean.java | 2 +- .../lifecycle/inheritance/SuperClassBean.java | 4 +- .../resolution/CdiInterceptorBeanBuilderTest.java | 8 +- .../resolution/EjbInterceptorBeanBuilderTest.java | 8 +- .../resolution/InterceptBridgeMethodTest.java | 2 +- .../resolution/InterceptorProxyChainTest.java | 10 +- .../InterceptorResolutionServiceTest.java | 8 +- .../resolution/SelfInterceptorBeanBuilderTest.java | 2 +- .../resolution/beans/UtilitySampleBean.java | 2 +- .../interceptors/SelfInterceptedClass.java | 6 +- .../interceptors/SelfInterceptionSubclass.java | 6 +- .../resolution/interceptors/TestIntercepted1.java | 2 +- .../resolution/interceptors/TestInterceptor1.java | 14 +- .../interceptors/TestInterceptorParent.java | 10 +- .../test/lifecycle/ExceptionOnCallbackTest.java | 6 +- .../webbeans/test/managed/ProxyFactoryTest.java | 28 +- .../test/managed/generic/GenericInjectionTest.java | 4 +- .../instance/InjectedInstanceComponentTest.java | 8 +- .../test/managed/instance/beans/DependentBean.java | 4 +- .../instance/beans/DependentBeanProducer.java | 6 +- .../instance/beans/InstanceForDependentBean.java | 6 +- .../instance/beans/InstanceInjectedComponent.java | 8 +- .../test/managed/instance/beans/MeaningOfLife.java | 4 +- .../multipleinterfaces/MyEntityServiceImpl.java | 2 +- .../test/managed/newcomp/NewComponent.java | 43 -- .../test/managed/newcomp/NewComponentTest.java | 74 ---- .../test/managed/newcomp/ProducerNewComponent.java | 49 --- .../specialized/SpecializeDeactivationTest.java | 10 +- .../org/apache/webbeans/test/mock/MockManager.java | 64 ++- .../performance/BeanResolvingPerformanceTest.java | 4 +- .../test/performance/StartupPerformanceTest.java | 2 - .../test/portable/AnnotatedTypeImplTest.java | 12 +- .../webbeans/test/portable/BeanInjectionTest.java | 4 +- .../webbeans/test/portable/BeanManagerTest.java | 2 +- .../test/portable/BeforeBeanDiscoveryTest.java | 18 +- .../test/portable/CustomBeanDestroyCalledTest.java | 36 +- .../test/portable/CustomPrioritizedBeanTest.java | 28 +- .../webbeans/test/portable/ExtensionTest.java | 8 +- .../GetInjectionPointFromCustomBeanCreateTest.java | 28 +- .../webbeans/test/portable/PortableTests.java | 22 +- .../webbeans/test/portable/WithAnnotationTest.java | 12 +- .../AddAdditionalAnnotatedTypeExtension.java | 14 +- .../webbeans/test/portable/alternative/Egg.java | 4 +- .../test/portable/alternative/HalfEgg.java | 4 +- .../test/portable/alternative/WoodEgg.java | 4 +- .../events/AfterBeanDiscoveryEventTest.java | 14 +- .../test/portable/events/ExtensionTest.java | 2 +- .../test/portable/events/PortableAddBeanTest.java | 14 +- .../portable/events/ProcessObserverMethodTest.java | 4 +- .../webbeans/test/portable/events/beans/Apple.java | 2 +- .../test/portable/events/beans/PortableType1.java | 12 +- .../events/extensions/AddBeanExtension.java | 20 +- .../extensions/AddObserverMethodExtension.java | 14 +- .../events/extensions/AlternativeExtension.java | 10 +- .../portable/events/extensions/AppleExtension.java | 8 +- .../events/extensions/AppleExtension1.java | 8 +- .../extensions/MessageReceiverExtension.java | 6 +- .../events/extensions/MessageSenderExtension.java | 10 +- .../portable/events/extensions/MyExtension.java | 24 +- .../events/extensions/NotAppleExtnsion.java | 8 +- .../extensions/ProcessObserverMethodExtension.java | 8 +- .../events/extensions/RawTypeExtension.java | 6 +- .../portable/events/extensions/TreeExtension.java | 6 +- .../events/extensions/TypeVariableExtension.java | 6 +- .../events/extensions/WildcardExtension.java | 6 +- .../extensions/WrongTypeVariableExtension.java | 6 +- .../events/extensions/WrongWildcardExtension.java | 6 +- .../errors/AfterBeanDiscoveryErrorExtension.java | 6 +- .../errors/AfterBeansValidationErrorExtension.java | 6 +- .../injectiontarget/InjectionTargetTest.java | 16 +- .../test/portable/injectiontarget/PersonModel.java | 2 +- .../injectiontarget/customtarget/CustomTarget.java | 4 +- .../CustomTargetNoConstructorTest.java | 10 +- .../injectiontarget/supportInjections/Chair.java | 2 +- .../supportInjections/SupportInjectionBean.java | 12 +- .../supportInjections/SupportInjectionTest.java | 16 +- .../injectiontarget/supportInjections/Table.java | 2 +- .../test/portable/javaee/MockInstance.java | 4 +- .../scopeextension/BeanWithExtensionInjected.java | 4 +- .../scopeextension/ExternalTestScopeContext.java | 10 +- .../scopeextension/ExternalTestScopeExtension.java | 10 +- .../scopeextension/ExternalTestScopedBean.java | 2 +- .../broken/CdiBeanWithLifecycleObserver.java | 8 +- ...ativeWithBeanAndMethodProducerPriorityTest.java | 8 +- .../test/producer/AmbigousProducerTest.java | 2 +- .../webbeans/test/producer/ConsumerBean.java | 4 +- .../test/producer/GenericProducerTest.java | 4 +- .../webbeans/test/producer/NamedProducerTest.java | 4 +- .../webbeans/test/producer/ProducerBean.java | 4 +- .../webbeans/test/producer/ProducerBean2.java | 4 +- .../test/producer/ProducerPassivationTest.java | 10 +- .../SerializableAtRuntimeProducerTest.java | 6 +- .../webbeans/test/producer/StringProducerTest.java | 6 +- .../test/producer/beans/ListConsumerBean.java | 4 +- .../producer/beans/MultipleListProducerBean.java | 4 +- .../test/producer/beans/PrivateProducedBean.java | 2 +- .../test/producer/beans/ProtectedProducedBean.java | 2 +- .../test/producer/beans/SampleProducerOwner.java | 6 +- .../webbeans/test/producer/beans/SomeUserBean.java | 2 +- .../test/producer/broken/BrokenProducesTest.java | 2 +- .../broken/DecoratorWithProducerField.java | 8 +- .../broken/DecoratorWithProducerMethod.java | 8 +- .../broken/InterceptorWithProducerField.java | 8 +- .../broken/InterceptorWithProducerMethod.java | 8 +- .../specializes/SpecializesProducer1Test.java | 4 +- .../test/profields/GetterStringInjectorTest.java | 2 +- .../InnerClassInjectStringProducerTest.java | 2 +- .../profields/InterceptedProducerFieldTest.java | 12 +- .../beans/classproducer/MyProductBean.java | 2 +- .../beans/classproducer/MyProductProducer.java | 8 +- .../beans/classproducer/ProductInjectedBean.java | 2 +- .../stringproducer/GetterStringFieldInjector.java | 4 +- .../stringproducer/GetterStringProducerBean.java | 4 +- .../stringproducer/InformationConsumerBean.java | 6 +- .../beans/stringproducer/MultipleListProducer.java | 6 +- .../beans/stringproducer/StringProducerBean.java | 4 +- .../innerClass/InnerClassInjectStringProducer.java | 4 +- .../test/promethods/MethodProducer1Test.java | 10 +- .../test/promethods/PersonProducerTest.java | 6 +- .../promethods/beans/InjectorofMethod1Bean.java | 4 +- .../test/promethods/beans/MethodTypeProduces1.java | 6 +- .../test/promethods/beans/PersonProducerBean.java | 6 +- .../test/promethods/beans/ProducerBean.java | 4 +- .../beans/RequestScopedNullPersonProducerBean.java | 6 +- .../beans/SessionScopedPersonProducerBean.java | 6 +- ...DecoratorInterceptorProxySerializationTest.java | 14 +- .../proxy/DecoratorProxySerializationTest.java | 6 +- .../webbeans/test/proxy/InnerClassProxyTest.java | 10 +- .../proxy/InterceptorProxySerializationTest.java | 10 +- .../webbeans/test/proxy/ProxyGenericsTest.java | 4 +- .../webbeans/test/proxy/ProxyMappingTest.java | 2 +- .../webbeans/test/proxy/ProxyVetoedTest.java | 2 +- .../webbeans/test/proxy/beans/ApplicationBean.java | 2 +- .../test/proxy/beans/ConversationBean.java | 2 +- .../webbeans/test/proxy/beans/DummyScoped.java | 2 +- .../test/proxy/beans/DummyScopedContext.java | 6 +- .../test/proxy/beans/DummyScopedExtension.java | 6 +- .../test/proxy/unproxyable/AllowProxyingTest.java | 10 +- .../qualifier/CacheUsesQualifierOverridesTest.java | 24 +- .../qualifier/QualifierWithOptionalInjectTest.java | 10 +- .../test/specalization/AdvancedPenProducer.java | 10 +- .../AlternativeSpecializesProducerTest.java | 6 +- .../test/specalization/DefaultPenProducer.java | 6 +- .../apache/webbeans/test/specalization/Pen.java | 2 +- .../test/specalization/PremiumPenProducer.java | 10 +- .../ProducerMethodSpecialisationTest.java | 10 +- .../test/specalization/QualifierSpecialized.java | 2 +- .../disabledspecialization/LoginService.java | 2 +- .../disabledspecialization/MockLoginService.java | 4 +- .../disabledspecialization/VetoMeExtension.java | 6 +- .../VetoMeProcessBeanAttributesExtension.java | 6 +- .../test/specalization/multiple/BeanA.java | 4 +- .../test/specalization/multiple/BeanB.java | 2 +- .../test/specalization/multiple/BeanB2.java | 2 +- .../test/specalization/multiple/BeanC.java | 2 +- .../test/specalization/multiple/BeanD.java | 4 +- .../multiple/MultipleSpecializationTest.java | 2 +- .../MultipleSpecializedProducerMethodsTest.java | 6 +- .../test/specalization/observer/prot/BeanA.java | 4 +- .../test/specalization/observer/prot/BeanB.java | 6 +- .../test/specalization/observer/prot/BeanC.java | 6 +- .../test/specalization/observer/prot/BeanD.java | 8 +- .../test/specalization/observer/prot/BeanE.java | 4 +- .../observer/prot/ProtectedObserverTest.java | 10 +- .../test/specalization/observer/pub/BeanA.java | 4 +- .../test/specalization/observer/pub/BeanB.java | 6 +- .../test/specalization/observer/pub/BeanC.java | 6 +- .../test/specalization/observer/pub/BeanD.java | 8 +- .../test/specalization/observer/pub/BeanE.java | 4 +- .../observer/pub/PublicObserverTest.java | 10 +- .../specalization/passivation/DefaultXyBean.java | 2 +- .../passivation/SpecializedXyBean.java | 4 +- .../test/sterotype/StereoWithNonScope.java | 2 +- .../test/sterotype/StereoWithRequestScope.java | 4 +- .../test/sterotype/StereoWithSessionScope.java | 4 +- .../test/sterotype/StereoWithSessionScope2.java | 4 +- .../DependentProducerMethodInjectionPointTest.java | 6 +- ...ntProducerMethodMultipleInjectionPointTest.java | 4 +- .../test/tests/InjectionPointInjectionTest.java | 21 +- .../test/tests/MultipleTimeTheSameBindingTest.java | 12 +- .../test/tests/PackageInjectionPointOwner.java | 2 +- .../tests/PackageMethodInjectionPointOwner.java | 4 +- .../test/unittests/annotation/LiteralType.java | 2 +- .../test/unittests/binding/AnyBindingTest.java | 2 +- .../binding/BrokenBindingComponentTest.java | 2 +- .../test/unittests/clazz/GenericsUtilTest.java | 2 +- .../test/unittests/config/ScannerTestBean.java | 4 +- .../test/unittests/decorator/Decorator1Test.java | 2 +- .../decorator/DecoratorExceptionTest.java | 2 +- .../test/unittests/definition/BeanTypesTest.java | 2 +- .../test/unittests/disposal/DisposalTest.java | 2 +- .../webbeans/test/unittests/event/EventTest.java | 8 +- .../event/component/BrokenComponentTest.java | 2 +- .../event/component/ObserversComponentTest.java | 20 +- .../event/exception/EventExceptionTest.java | 8 +- .../exception/ExceptionComponentTest.java | 29 +- .../exception/ScopeTypeExceptionComponentTest.java | 8 +- .../initializer/BrokenInitializerTest.java | 2 +- .../inject/InjectedComponentWithMemberTest.java | 2 +- .../test/unittests/inject/TypedComponentTest.java | 2 +- .../inject/TypedInjectedComponentTest.java | 2 +- .../test/unittests/inject/UserComponentTest.java | 2 +- .../InjectedInstanceBrokenComponentTest.java | 2 +- .../test/unittests/inject/named/NamedTests.java | 10 +- .../intercept/PreDestroyComponentTest.java | 2 +- .../unittests/library/LibraryComponentTest.java | 4 +- .../pfield/ProducerFieldComponentTest.java | 2 +- .../unittests/producer/ProducerComponentTest.java | 2 +- .../producer/broken/BrokenProducerTest.java | 2 +- .../resolution/ManagerResolutionTest.java | 2 +- .../specializes/SpecializationComponentTest.java | 2 +- .../unittests/typedliteral/TypeLiteralTest.java | 4 +- .../typedliteral/TypedLiteralComponentTest.java | 8 +- .../unittests/xml/strict/AlternativesTest.java | 2 +- .../webbeans/test/util/AnnotationUtilTest.java | 6 +- .../webbeans/test/util/WebBeansUtilTest.java | 4 +- .../webbeans/test/xml/BeanArchiveServiceTest.java | 2 +- .../webbeans/test/xml/strict/Alternative1.java | 2 +- .../webbeans/test/xml/strict/Alternative3.java | 2 +- .../test/xml/strict/AlternativeStereotype.java | 4 +- .../webbeans/test/xml/strict/DummyDecorator.java | 6 +- .../webbeans/test/xml/strict/DummyInterceptor.java | 2 +- .../META-INF/openwebbeans/openwebbeans.properties | 4 +- .../AlternativeSpecializesProducer.xml | 8 +- webbeans-jetty9/pom.xml | 16 +- webbeans-jetty9/src/it/fatwar/pom.xml | 4 +- .../apache/webbeans/web/jetty9/test/TestBean.java | 6 +- .../webbeans/web/jetty9/test/TestServlet.java | 14 +- webbeans-jetty9/src/it/module/pom.xml | 10 +- .../apache/webbeans/web/jetty9/test/TestBean.java | 6 +- .../webbeans/web/jetty9/test/TestServlet.java | 14 +- webbeans-jetty9/src/it/servletinjection/pom.xml | 10 +- .../apache/webbeans/web/jetty9/test/TestBean.java | 6 +- .../webbeans/web/jetty9/test/TestServlet.java | 14 +- .../webbeans/web/jetty9/JettySecurityFilter.java | 14 +- .../org/apache/webbeans/web/jetty9/JettyUtil.java | 6 +- .../apache/webbeans/web/jetty9/JettyWebPlugin.java | 20 +- .../webbeans/web/jetty9/OwbConfiguration.java | 4 +- .../test/JettyNormalScopeProxyFactoryTest.java | 12 +- .../webbeans/web/jetty9/test/MySessionScoped.java | 2 +- .../apache/webbeans/web/jetty9/test/MyWrapper.java | 4 +- webbeans-jms/pom.xml | 38 +- .../org/apache/webbeans/jms/component/JmsBean.java | 6 +- .../jms/component/JmsComponentFactory.java | 20 +- .../webbeans/jms/plugin/OpenWebBeansJmsPlugin.java | 2 +- .../apache/webbeans/jms/util/JmsProxyHandler.java | 22 +- .../java/org/apache/webbeans/jms/util/JmsUtil.java | 34 +- webbeans-jsf/pom.xml | 16 +- .../webbeans/jsf/ConversationAwareViewHandler.java | 4 +- .../main/java/org/apache/webbeans/jsf/JSFUtil.java | 2 +- .../org/apache/webbeans/jsf/OwbApplication.java | 2 +- .../apache/webbeans/jsf/OwbExceptionHandler.java | 2 +- webbeans-junit5/pom.xml | 20 +- .../org/apache/openwebbeans/junit5/SkipInject.java | 2 +- .../openwebbeans/junit5/internal/CdiExtension.java | 14 +- .../internal/CdiParametersResolverExtension.java | 8 +- .../junit5/internal/ScopesExtension.java | 8 +- .../junit5/CdiParameterResolversTest.java | 8 +- .../org/apache/openwebbeans/junit5/ScopesTest.java | 12 +- .../apache/openwebbeans/junit5/bean/MyService.java | 2 +- .../openwebbeans/junit5/extension/DummyScoped.java | 2 +- .../openwebbeans/junit5/extension/MyScope.java | 8 +- .../junit5/parameter/ParameterResolutionTest.java | 2 +- .../openwebbeans/junit5/perclass/CdiTest.java | 2 +- .../junit5/perclass/PerMethodTest.java | 4 +- .../apache/openwebbeans/junit5/reusable/Base.java | 2 +- ...ion => jakarta.enterprise.inject.spi.Extension} | 0 webbeans-osgi/pom.xml | 14 +- .../osgi/scanner/OsgiMetaDataScannerService.java | 2 +- webbeans-porting/pom.xml | 133 ++++-- .../org/apache/webbeans/test/tck/ContextsImpl.java | 4 +- .../java/org/apache/webbeans/test/tck/ELImpl.java | 24 +- .../apache/webbeans/test/tck/OwbTckElResolver.java | 8 +- webbeans-resource/pom.xml | 78 ---- .../spi/se/StandaloneResourceInjectionService.java | 173 -------- .../spi/se/StandaloneResourceProcessor.java | 179 -------- .../META-INF/openwebbeans/openwebbeans.properties | 30 -- webbeans-resource/src/site/site.xml | 47 --- webbeans-se/pom.xml | 84 ++-- .../org/apache/openwebbeans/se/CDILauncher.java | 10 +- .../apache/openwebbeans/se/CDISeLoaderService.java | 2 +- .../org/apache/openwebbeans/se/OWBContainer.java | 22 +- .../org/apache/openwebbeans/se/OWBInitializer.java | 10 +- .../openwebbeans/se/SeContainerSelector.java | 2 +- .../openwebbeans/se/SeInitializerFacade.java | 8 +- ...ta.enterprise.inject.se.SeContainerInitializer} | 0 .../apache/openwebbeans/se/CDILauncherTest.java | 4 +- .../java/org/apache/openwebbeans/se/CDISETest.java | 8 +- webbeans-slf4j/pom.xml | 2 +- webbeans-spi/pom.xml | 21 +- .../apache/webbeans/spi/ContainerLifecycle.java | 2 +- .../org/apache/webbeans/spi/ContextsService.java | 4 +- .../apache/webbeans/spi/InjectionPointService.java | 2 +- .../webbeans/spi/ResourceInjectionService.java | 4 +- .../org/apache/webbeans/spi/ScannerService.java | 2 + .../apache/webbeans/spi/TransactionService.java | 10 +- .../org/apache/webbeans/spi/ValidatorService.java | 4 +- .../org/apache/webbeans/spi/adaptor/ELAdaptor.java | 4 +- .../spi/plugins/OpenWebBeansEjbPlugin.java | 8 +- webbeans-tck-jakarta/pom.xml | 2 +- webbeans-tck/pom.xml | 162 +++++--- .../META-INF/openwebbeans/openwebbeans.properties | 2 +- .../scoped/BeanDiscoveryModeScopedTest.java | 6 +- .../scoped/DefaultDiscoveryModeModule.java | 2 +- .../beandiscovery/scoped/ModeScopedModule.java | 2 +- .../beandiscovery/scoped/ScopedBeanConsumer.java | 2 +- webbeans-tck/standalone-suite.xml | 36 +- {webbeans-tomcat7 => webbeans-tomcat}/pom.xml | 54 +-- .../src/it/fatwar/pom.xml | 4 +- .../apache/webbeans/web/tomcat7/test/TestBean.java | 6 +- .../webbeans/web/tomcat7/test/TestRequestBean.java | 2 +- .../webbeans/web/tomcat7/test/TestServlet.java | 18 +- .../webbeans/web/tomcat7/test/TestSessionBean.java | 2 +- .../it/fatwar/src/main/webapp/META-INF/context.xml | 0 .../it/fatwar/src/main/webapp/WEB-INF/beans.xml | 0 .../src/it/fatwar/src/main/webapp/WEB-INF/web.xml | 0 .../web/tomcat7/test/OwbTomcatPluginIT.java | 0 .../src/it/servletinjection/pom.xml | 10 +- .../apache/webbeans/web/tomcat7/test/TestBean.java | 6 +- .../webbeans/web/tomcat7/test/TestServlet.java | 14 +- .../src/main/webapp/META-INF/context.xml | 2 +- .../src/main/webapp/WEB-INF/beans.xml | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../web/tomcat7/test/OwbTomcatPluginIT.java | 0 .../src/it/settings.xml | 0 .../web/tomcat}/ContextLifecycleListener.java | 8 +- .../web/tomcat}/TomcatInstanceManager.java | 2 +- .../webbeans/web/tomcat}/TomcatSecurityFilter.java | 16 +- .../web/tomcat}/TomcatSecurityService.java | 2 +- .../apache/webbeans/web/tomcat}/TomcatUtil.java | 8 +- .../webbeans/web/tomcat}/TomcatWebPlugin.java | 22 +- .../META-INF/openwebbeans/openwebbeans.properties | 2 +- ....apache.webbeans.spi.plugins.OpenWebBeansPlugin | 2 +- .../src/main/resources/META-INF/web-fragment.xml | 2 +- .../src/site/site.xml | 0 .../webbeans/web/tomcat}/test/MySessionScoped.java | 4 +- .../webbeans/web/tomcat}/test/MyWrapper.java | 6 +- .../test/TomcatNormalScopeProxyFactoryTest.java | 34 +- webbeans-web/pom.xml | 86 ++-- webbeans-web/src/it/forward/b/pom.xml | 16 +- .../java/org/superbiz/beans/RequestScopedBean.java | 2 +- .../src/it/forward/b/src/main/webapp/target.jsp | 2 +- .../org/apache/openwebbeans/web/it/ForwardIT.java | 2 +- webbeans-web/src/it/webcdiapp/pom.xml | 20 +- .../src/main/java/org/superbiz/TestServlet.java | 10 +- .../org/superbiz/beans/ContextEventCounter.java | 14 +- .../java/org/superbiz/beans/RequestScopedBean.java | 14 +- .../org/superbiz/beans/SessionScopedCounter.java | 4 +- .../conversation/ConversationITServlet.java | 12 +- .../conversation/ConversationalShoppingCart.java | 6 +- .../org/superbiz/conversation/SessionUser.java | 2 +- .../openwebbeans/web/it/ConversationScopedIT.java | 4 +- .../openwebbeans/web/it/RequestScopedIT.java | 2 +- .../servlet/WebBeansConfigurationFilter.java | 20 +- .../WebBeansConfigurationHttpSessionListener.java | 8 +- .../servlet/WebBeansConfigurationListener.java | 22 +- .../web/context/ServletRequestContext.java | 2 +- .../webbeans/web/context/WebContextsService.java | 24 +- .../web/context/WebConversationFilter.java | 14 +- .../web/context/WebConversationService.java | 6 +- .../webbeans/web/lifecycle/ServletContextBean.java | 4 +- .../webbeans/web/lifecycle/ServletRequestBean.java | 4 +- .../web/lifecycle/WebContainerLifecycle.java | 24 +- .../lifecycle/test/EnterpriseTestLifeCycle.java | 8 +- .../web/lifecycle/test/MockHttpSession.java | 40 +- .../web/lifecycle/test/MockServletContext.java | 93 +++-- .../lifecycle/test/MockServletContextEvent.java | 2 +- .../webbeans/web/scanner/WebScannerService.java | 2 +- .../web/util/ServletCompatibilityUtil.java | 2 +- .../java/WebBeansConfigurationListenerTest.java | 4 +- .../webbeans/web/tests/BeforeDestroyTest.java | 6 +- .../web/tests/ConversationLoggingTest.java | 4 +- .../apache/webbeans/web/tests/MockHttpSession.java | 35 +- .../webbeans/web/tests/MockServletRequest.java | 76 ++-- .../apache/webbeans/web/tests/WebBeansTest.java | 10 +- .../webbeans/web/tests/WebContextsServiceTest.java | 4 +- .../InitializedSessionScopedTest.java | 6 +- .../web/tests/initialization/MySession.java | 2 +- .../web/tests/initialization/MySessionHandler.java | 16 +- .../interceptor/CachedInterceptorHandlerTest.java | 8 +- .../web/tests/interceptor/SerializationTest.java | 8 +- 1282 files changed, 5072 insertions(+), 6727 deletions(-) copy atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/{DriverBinding.java => AtinjectTckSetupExtension.java} (52%) copy webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericQualifier.java => atinject-tck/src/test/java/org/apache/webbeans/atinject/tck/specific/TckNew.java (83%) copy webbeans-web/src/it/webcdiapp/src/main/resources/META-INF/openwebbeans/openwebbeans.properties => atinject-tck/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension (92%) delete mode 100644 src/site/apt/contributing.apt delete mode 100644 src/site/apt/documentation.apt delete mode 100644 src/site/apt/examples/guess.apt delete mode 100644 src/site/apt/extensions/index.apt delete mode 100644 src/site/apt/index.apt delete mode 100644 src/site/apt/irc.apt delete mode 100644 src/site/apt/jakarta.apt delete mode 100644 src/site/apt/jsr299.apt delete mode 100644 src/site/apt/jsr330.apt delete mode 100644 src/site/apt/trademarks.apt delete mode 100644 src/site/fml/faq.fml delete mode 100644 src/site/resources/documents/userguide.pdf delete mode 100644 src/site/resources/images/logos/openwebbeans_hor.png delete mode 100644 src/site/resources/images/logos/openwebbeans_small.png delete mode 100644 src/site/resources/images/logos/openwebbeans_vert.png delete mode 100644 src/site/site.xml delete mode 100644 webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java delete mode 100644 webbeans-impl/src/main/java/org/apache/webbeans/component/NewBean.java delete mode 100644 webbeans-impl/src/main/java/org/apache/webbeans/component/NewManagedBean.java rename webbeans-impl/src/main/resources/META-INF/services/{javax.enterprise.inject.spi.CDIProvider => jakarta.enterprise.inject.spi.CDIProvider} (99%) delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentBindingComponent.java delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewComponentInterfaceComponent.java delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/component/exception/NewMethodComponentBindingComponent.java delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/managed/newcomp/NewComponent.java delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/managed/newcomp/NewComponentTest.java delete mode 100644 webbeans-impl/src/test/java/org/apache/webbeans/test/managed/newcomp/ProducerNewComponent.java rename webbeans-junit5/src/test/resources/META-INF/services/{javax.enterprise.inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} (100%) delete mode 100644 webbeans-resource/pom.xml delete mode 100644 webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceInjectionService.java delete mode 100644 webbeans-resource/src/main/java/org/apache/webbeans/resource/spi/se/StandaloneResourceProcessor.java delete mode 100644 webbeans-resource/src/main/resources/META-INF/openwebbeans/openwebbeans.properties delete mode 100644 webbeans-resource/src/site/site.xml rename webbeans-se/src/main/resources/META-INF/services/{javax.enterprise.inject.se.SeContainerInitializer => jakarta.enterprise.inject.se.SeContainerInitializer} (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/pom.xml (87%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/pom.xml (98%) rename {webbeans-tomcat7/src/it/servletinjection => webbeans-tomcat/src/it/fatwar}/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java (90%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestRequestBean.java (95%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java (90%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/java/org/apache/webbeans/web/tomcat7/test/TestSessionBean.java (95%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/webapp/META-INF/context.xml (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/webapp/WEB-INF/beans.xml (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/main/webapp/WEB-INF/web.xml (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/fatwar/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/pom.xml (97%) rename {webbeans-tomcat7/src/it/fatwar => webbeans-tomcat/src/it/servletinjection}/src/main/java/org/apache/webbeans/web/tomcat7/test/TestBean.java (90%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/src/main/java/org/apache/webbeans/web/tomcat7/test/TestServlet.java (88%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/src/main/webapp/META-INF/context.xml (91%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/src/main/webapp/WEB-INF/beans.xml (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/src/main/webapp/WEB-INF/web.xml (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/servletinjection/src/test/java/org/apache/webbeans/web/tomcat7/test/OwbTomcatPluginIT.java (100%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/it/settings.xml (100%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/ContextLifecycleListener.java (96%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/TomcatInstanceManager.java (99%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/TomcatSecurityFilter.java (86%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/TomcatSecurityService.java (98%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/TomcatUtil.java (93%) rename {webbeans-tomcat7/src/main/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/main/java/org/apache/webbeans/web/tomcat}/TomcatWebPlugin.java (86%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/main/resources/META-INF/openwebbeans/openwebbeans.properties (97%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin (94%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/main/resources/META-INF/web-fragment.xml (93%) rename {webbeans-tomcat7 => webbeans-tomcat}/src/site/site.xml (100%) rename {webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat}/test/MySessionScoped.java (92%) rename {webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat}/test/MyWrapper.java (89%) rename {webbeans-tomcat7/src/test/java/org/apache/webbeans/web/tomcat7 => webbeans-tomcat/src/test/java/org/apache/webbeans/web/tomcat}/test/TomcatNormalScopeProxyFactoryTest.java (86%)