This is an automated email from the ASF dual-hosted git repository. matthiasblaesing pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit d26b0903c10237995528b4bf60824b9c7d39be1e Merge: 9ae7041ef5 d31d18a247 Author: Matthias Bläsing <[email protected]> AuthorDate: Sun Dec 22 13:44:37 2024 +0100 Merge pull request #7958 from matthiasblaesing/merge_cdi2 Merge jakarta.web.beans and web.beans .github/workflows/main.yml | 9 +- .../j2ee.api.ejbmodule/nbproject/project.xml | 1 - enterprise/j2ee.common/nbproject/project.xml | 1 - enterprise/jakarta.web.beans/build.xml | 25 - enterprise/jakarta.web.beans/licenseinfo.xml | 39 - enterprise/jakarta.web.beans/manifest.mf | 6 - .../org-netbeans-modules-jakarta-web-beans.sig | 539 ------------- .../jakarta.web.beans/nbproject/project.properties | 27 - enterprise/jakarta.web.beans/nbproject/project.xml | 481 ------------ .../modules/jakarta/web/beans/BeansDataLoader.java | 57 -- .../modules/jakarta/web/beans/BeansDataObject.java | 113 --- .../modules/jakarta/web/beans/Bundle.properties | 18 - .../modules/jakarta/web/beans/CarCdiUtil.java | 59 -- .../jakarta/web/beans/CdiProjectOpenHook.java | 72 -- .../modules/jakarta/web/beans/CdiUtil.java | 332 -------- .../modules/jakarta/web/beans/EjbCdiUtil.java | 61 -- .../jakarta/web/beans/MetaModelSupport.java | 108 --- .../WebBeanInjectionTargetQueryImplementation.java | 122 --- .../modules/jakarta/web/beans/WebCdiUtil.java | 71 -- .../jakarta/web/beans/actions/Bundle.properties | 31 - .../web/beans/actions/InterceptorFactory.java | 106 --- .../web/beans/actions/InterceptorGenerator.java | 264 ------- .../web/beans/actions/InterceptorPanel.form | 98 --- .../web/beans/actions/InterceptorPanel.java | 218 ------ .../web/beans/analysis/AbstractAnalysisTask.java | 65 -- .../jakarta/web/beans/analysis/BeansXmlFix.java | 95 --- .../jakarta/web/beans/analysis/Bundle.properties | 21 - .../beans/analysis/CancellableAnalysysTask.java | 85 -- .../web/beans/analysis/CdiAnalysisResult.java | 134 ---- .../web/beans/analysis/CdiAnalysisTask.java | 130 --- .../beans/analysis/CdiEditorAnalysisFactory.java | 232 ------ .../web/beans/analysis/CdiEditorAnalysisTask.java | 50 -- .../CdiEditorAwareJavaSourceTaskFactory.java | 45 -- .../web/beans/analysis/WebBeansAnalysisTask.java | 206 ----- .../beans/analysis/WebBeansEditorAnalysisTask.java | 54 -- .../analysis/WebBeansModelAnalysisFactory.java | 50 -- .../analyzer/AbstractDecoratorAnalyzer.java | 187 ----- .../AbstractInterceptedElementAnalyzer.java | 51 -- .../analyzer/AbstractProducerAnalyzer.java | 80 -- .../analysis/analyzer/AbstractScopedAnalyzer.java | 138 ---- .../analysis/analyzer/AbstractTypedAnalyzer.java | 182 ----- .../analyzer/AnnotationElementAnalyzer.java | 72 -- .../analysis/analyzer/AnnotationModelAnalyzer.java | 69 -- .../beans/analysis/analyzer/AnnotationUtil.java | 217 ----- .../web/beans/analysis/analyzer/Bundle.properties | 18 - .../analysis/analyzer/ClassElementAnalyzer.java | 69 -- .../analysis/analyzer/ClassModelAnalyzer.java | 77 -- .../web/beans/analysis/analyzer/CtorAnalyzer.java | 67 -- .../beans/analysis/analyzer/ElementAnalyzer.java | 38 - .../analysis/analyzer/FieldElementAnalyzer.java | 74 -- .../analysis/analyzer/FieldModelAnalyzer.java | 74 -- .../analysis/analyzer/MethodElementAnalyzer.java | 84 -- .../analysis/analyzer/MethodModelAnalyzer.java | 81 -- .../web/beans/analysis/analyzer/ModelAnalyzer.java | 126 --- .../analysis/analyzer/annotation/Bundle.properties | 46 -- .../analyzer/annotation/CdiAnnotationAnalyzer.java | 101 --- .../annotation/InterceptorBindingAnalyzer.java | 146 ---- .../InterceptorBindingMembersAnalyzer.java | 90 --- .../annotation/InterceptorBindingVerifier.java | 63 -- .../analyzer/annotation/QualifierAnalyzer.java | 101 --- .../analyzer/annotation/QualifierVerifier.java | 104 --- .../annotation/RuntimeRetentionAnalyzer.java | 79 -- .../analyzer/annotation/ScopeAnalyzer.java | 106 --- .../analyzer/annotation/ScopeVerifier.java | 56 -- .../analyzer/annotation/StereotypeAnalyzer.java | 262 ------- .../analyzer/annotation/StereotypeVerifier.java | 68 -- .../analyzer/annotation/TargetAnalyzer.java | 123 --- .../analyzer/annotation/TargetVerifier.java | 35 - .../analysis/analyzer/field/Bundle.properties | 48 -- .../analyzer/field/DelegateFieldAnalizer.java | 133 ---- .../analyzer/field/InjectionPointAnalyzer.java | 226 ------ .../analyzer/field/ProducerFieldAnalyzer.java | 104 --- .../analyzer/field/ScopedFieldAnalyzer.java | 110 --- .../analyzer/field/TypedFieldAnalyzer.java | 72 -- .../analyzer/method/AnnotationsAnalyzer.java | 242 ------ .../analysis/analyzer/method/Bundle.properties | 87 -- .../analyzer/method/DelegateMethodAnalyzer.java | 138 ---- .../method/InjectionPointParameterAnalyzer.java | 257 ------ .../analyzer/method/InterceptedMethodAnalyzer.java | 188 ----- .../analyzer/method/ProducerMethodAnalyzer.java | 125 --- .../analyzer/method/ScopedMethodAnalyzer.java | 120 --- .../analyzer/method/TypedMethodAnalyzer.java | 205 ----- .../analyzer/type/AnnotationsAnalyzer.java | 275 ------- .../beans/analysis/analyzer/type/Bundle.properties | 93 --- .../analysis/analyzer/type/CtorsAnalyzer.java | 67 -- .../analyzer/type/DeclaredIBindingsAnalyzer.java | 164 ---- .../analyzer/type/InterceptedBeanAnalyzer.java | 117 --- .../analyzer/type/ManagedBeansAnalizer.java | 173 ---- .../analysis/analyzer/type/NamedModelAnalyzer.java | 73 -- .../analysis/analyzer/type/ScopedBeanAnalyzer.java | 225 ------ .../analyzer/type/SessionBeanAnalyzer.java | 89 --- .../analysis/analyzer/type/TypedClassAnalizer.java | 104 --- .../api/model/AbstractModelImplementation.java | 68 -- .../web/beans/api/model/BeanArchiveType.java | 29 - .../jakarta/web/beans/api/model/BeansModel.java | 61 -- .../web/beans/api/model/BeansModelFactory.java | 51 -- .../jakarta/web/beans/api/model/BeansResult.java | 35 - .../jakarta/web/beans/api/model/CdiException.java | 33 - .../beans/api/model/DependencyInjectionResult.java | 119 --- .../api/model/InjectionPointDefinitionError.java | 53 -- .../web/beans/api/model/InterceptorsResult.java | 58 -- .../jakarta/web/beans/api/model/ModelUnit.java | 133 ---- .../jakarta/web/beans/api/model/Result.java | 45 -- .../jakarta/web/beans/api/model/WebBeansModel.java | 303 ------- .../web/beans/api/model/WebBeansModelFactory.java | 61 -- .../web/beans/completion/BeansCompletionItem.java | 366 --------- .../beans/completion/BeansCompletionManager.java | 145 ---- .../beans/completion/BeansCompletionProvider.java | 483 ------------ .../web/beans/completion/BeansCompletor.java | 157 ---- .../web/beans/completion/BeansXmlConstants.java | 31 - .../web/beans/completion/CCPaintComponent.java | 316 -------- .../jakarta/web/beans/completion/CCParser.java | 444 ----------- .../web/beans/completion/CompletionContext.java | 295 ------- .../completion/CompletionContextResolver.java | 33 - .../web/beans/completion/ContextUtilities.java | 146 ---- .../web/beans/completion/DocumentContext.java | 236 ------ .../web/beans/completion/EditorContextFactory.java | 42 - .../jakarta/web/beans/completion/Utils.java | 77 -- .../jakarta/web/beans/hints/Bundle.properties | 35 - .../jakarta/web/beans/hints/CDIAnnotation.java | 96 --- .../web/beans/hints/CreateAnnotationFix.java | 119 --- .../web/beans/hints/CreateInterceptorBinding.java | 67 -- .../jakarta/web/beans/hints/CreateQualifier.java | 417 ---------- .../web/beans/hints/CreateQualifierFix.java | 67 -- .../web/beans/hints/EditorAnnotationsHelper.java | 252 ------ .../impl/model/AbstractAssignabilityChecker.java | 353 --------- .../beans/impl/model/AbstractObjectProvider.java | 147 ---- .../beans/impl/model/AnnotationObjectProvider.java | 474 ----------- .../impl/model/ArchiveTypeBindingTypeFilter.java | 83 -- .../web/beans/impl/model/AssignabilityChecker.java | 149 ---- .../jakarta/web/beans/impl/model/BeansFilter.java | 54 -- .../web/beans/impl/model/BeansModelImpl.java | 504 ------------ .../web/beans/impl/model/BindingQualifier.java | 85 -- .../jakarta/web/beans/impl/model/Bundle.properties | 45 -- .../jakarta/web/beans/impl/model/Checker.java | 29 - .../impl/model/DecoratorInterceptorLogic.java | 410 ---------- .../web/beans/impl/model/DecoratorObject.java | 59 -- .../beans/impl/model/DecoratorObjectProvider.java | 44 -- .../beans/impl/model/DefaultBindingTypeFilter.java | 129 --- .../impl/model/DelegateAssignabilityChecker.java | 262 ------- .../web/beans/impl/model/EnableBeansFilter.java | 597 -------------- .../impl/model/EventAssignabilityChecker.java | 148 ---- .../beans/impl/model/EventInjectionPointLogic.java | 514 ------------ .../beans/impl/model/FieldInjectionPointLogic.java | 872 --------------------- .../jakarta/web/beans/impl/model/Filter.java | 39 - .../impl/model/InterceptorBindingChecker.java | 97 --- .../web/beans/impl/model/InterceptorObject.java | 61 -- .../impl/model/InterceptorObjectProvider.java | 45 -- .../web/beans/impl/model/MemberBindingFilter.java | 164 ---- .../web/beans/impl/model/MemberCheckerFilter.java | 245 ------ .../web/beans/impl/model/MultiLookupStrategy.java | 69 -- .../web/beans/impl/model/NamedStereotype.java | 66 -- .../impl/model/NamedStereotypeObjectProvider.java | 114 --- .../web/beans/impl/model/NormalScopeChecker.java | 42 - .../web/beans/impl/model/PackagingFilter.java | 149 ---- .../impl/model/ParameterInjectionPointLogic.java | 327 -------- .../web/beans/impl/model/QualifierChecker.java | 136 ---- .../beans/impl/model/RestrictedTypedFilter.java | 140 ---- .../web/beans/impl/model/ResultLookupStrategy.java | 46 -- .../beans/impl/model/RuntimeAnnotationChecker.java | 97 --- .../jakarta/web/beans/impl/model/ScopeChecker.java | 88 --- .../impl/model/SingleResultLookupStrategy.java | 92 --- .../web/beans/impl/model/StereotypeChecker.java | 99 --- .../web/beans/impl/model/StereotypedObject.java | 63 -- .../impl/model/StereotypedObjectProvider.java | 49 -- .../web/beans/impl/model/TypeBindingFilter.java | 191 ----- .../web/beans/impl/model/TypeProductionFilter.java | 346 -------- .../impl/model/WebBeansModelImplementation.java | 217 ----- .../impl/model/WebBeansModelProviderImpl.java | 642 --------------- .../impl/model/WebBeansProviderFactoryImpl.java | 49 -- .../web/beans/impl/model/results/BaseResult.java | 59 -- .../impl/model/results/DefinitionErrorResult.java | 58 -- .../web/beans/impl/model/results/ErrorImpl.java | 57 -- .../impl/model/results/InjectableResultImpl.java | 75 -- .../impl/model/results/InjectablesResultImpl.java | 71 -- .../impl/model/results/InterceptorsResultImpl.java | 210 ----- .../impl/model/results/ResolutionErrorImpl.java | 68 -- .../web/beans/impl/model/results/ResultImpl.java | 147 ---- .../web/beans/model/spi/WebBeansModelProvider.java | 84 -- .../model/spi/WebBeansModelProviderFactory.java | 31 - .../web/beans/navigation/BindingsPanel.java | 492 ------------ .../jakarta/web/beans/navigation/Bundle.properties | 112 --- .../jakarta/web/beans/navigation/CDIPanel.form | 474 ----------- .../jakarta/web/beans/navigation/CDIPanel.java | 855 -------------------- .../web/beans/navigation/DecoratorsModel.java | 160 ---- .../web/beans/navigation/DecoratorsPanel.java | 134 ---- .../beans/navigation/DocumentationScrollPane.java | 441 ----------- .../jakarta/web/beans/navigation/EventsModel.java | 144 ---- .../jakarta/web/beans/navigation/EventsPanel.java | 74 -- .../jakarta/web/beans/navigation/HTMLDocView.java | 113 --- .../web/beans/navigation/InjectableTreeNode.java | 217 ----- .../web/beans/navigation/InjectablesModel.java | 418 ---------- .../web/beans/navigation/InjectablesPopup.form | 94 --- .../web/beans/navigation/InjectablesPopup.java | 212 ----- .../web/beans/navigation/InterceptorsModel.java | 157 ---- .../web/beans/navigation/InterceptorsPanel.java | 188 ----- .../jakarta/web/beans/navigation/JavaElement.java | 52 -- .../web/beans/navigation/JavaHierarchyModel.java | 34 - .../web/beans/navigation/JavaTreeCellRenderer.java | 54 -- .../web/beans/navigation/MethodTreeNode.java | 82 -- .../web/beans/navigation/NoBorderToolBar.java | 50 -- .../web/beans/navigation/ObserversModel.java | 158 ---- .../web/beans/navigation/ObserversPanel.java | 99 --- .../jakarta/web/beans/navigation/PopupUtil.java | 239 ------ .../web/beans/navigation/ResizablePopup.java | 87 -- .../jakarta/web/beans/navigation/TypeTreeNode.java | 62 -- .../jakarta/web/beans/navigation/Utils.java | 589 -------------- .../navigation/WebBeansNavigationOptions.java | 106 --- .../navigation/actions/AbstractCdiAction.java | 118 --- .../actions/AbstractInjectableAction.java | 45 -- .../navigation/actions/AbstractWebBeansAction.java | 78 -- .../web/beans/navigation/actions/Bundle.properties | 75 -- .../beans/navigation/actions/CdiGlyphAction.java | 292 ------- .../actions/DecoratoresActionStrategy.java | 114 --- .../navigation/actions/EventsActionStartegy.java | 124 --- .../actions/GoToDecoratorAtCaretAction.java | 262 ------- .../actions/GoToInjectableAtCaretAction.java | 236 ------ .../actions/InjectablesActionStrategy.java | 125 --- .../actions/InspectCDIAtCaretAction.java | 198 ----- .../actions/InterceptorsActionStrategy.java | 105 --- .../navigation/actions/ModelActionStrategy.java | 50 -- .../actions/ObserversActionStrategy.java | 109 --- .../beans/navigation/actions/PositionStrategy.java | 31 - .../navigation/actions/WebBeansActionHelper.java | 778 ------------------ .../jakarta/web/beans/resources/BeansResolver.xml | 41 - .../jakarta/web/beans/resources/BeansXml.html | 29 - .../jakarta/web/beans/resources/Bundle.properties | 34 - .../jakarta/web/beans/resources/Interceptor.html | 29 - .../web/beans/resources/Interceptor.template | 27 - .../jakarta/web/beans/resources/Qualifier.html | 29 - .../jakarta/web/beans/resources/Qualifier.template | 27 - .../modules/jakarta/web/beans/resources/Scope.html | 29 - .../jakarta/web/beans/resources/Scope.template | 28 - .../jakarta/web/beans/resources/Stereotype.html | 29 - .../web/beans/resources/Stereotype.template | 26 - .../jakarta/web/beans/resources/delegate.png | Bin 513 -> 0 bytes .../modules/jakarta/web/beans/resources/event.png | Bin 511 -> 0 bytes .../web/beans/resources/injection_point.png | Bin 511 -> 0 bytes .../modules/jakarta/web/beans/resources/layer.xml | 154 ---- .../jakarta/web/beans/resources/observer.png | Bin 511 -> 0 bytes ...akarta-web-beans-annotations-decorated-bean.xml | 30 - ...akarta-web-beans-annotations-delegate-point.xml | 30 - ...modules-jakarta-web-beans-annotations-event.xml | 30 - ...karta-web-beans-annotations-injection-point.xml | 30 - ...s-jakarta-web-beans-annotations-intercepted.xml | 30 - ...ules-jakarta-web-beans-annotations-observer.xml | 30 - .../jakarta/web/beans/wizard/BeansXmlIterator.java | 324 -------- .../jakarta/web/beans/wizard/Bundle.properties | 21 - .../jakarta/web/beans/xml/AlternativeElement.java | 29 - .../jakarta/web/beans/xml/Alternatives.java | 40 - .../modules/jakarta/web/beans/xml/BeanClass.java | 32 - .../jakarta/web/beans/xml/BeanClassContainer.java | 36 - .../modules/jakarta/web/beans/xml/Beans.java | 43 - .../jakarta/web/beans/xml/BeansAttributes.java | 54 -- .../jakarta/web/beans/xml/BeansElement.java | 31 - .../modules/jakarta/web/beans/xml/Decorators.java | 31 - .../jakarta/web/beans/xml/Interceptors.java | 31 - .../modules/jakarta/web/beans/xml/Stereotype.java | 32 - .../jakarta/web/beans/xml/WebBeansComponent.java | 38 - .../web/beans/xml/WebBeansComponentFactory.java | 38 - .../jakarta/web/beans/xml/WebBeansModel.java | 33 - .../web/beans/xml/WebBeansModelFactory.java | 54 -- .../jakarta/web/beans/xml/WebBeansVisitor.java | 34 - .../web/beans/xml/impl/AlternativesImpl.java | 112 --- .../web/beans/xml/impl/BaseClassContainerImpl.java | 57 -- .../jakarta/web/beans/xml/impl/BeanClassImpl.java | 69 -- .../jakarta/web/beans/xml/impl/BeansImpl.java | 86 -- .../web/beans/xml/impl/ClassContainerImpl.java | 57 -- .../jakarta/web/beans/xml/impl/DecoratorsImpl.java | 55 -- .../web/beans/xml/impl/InterceptorsImpl.java | 55 -- .../jakarta/web/beans/xml/impl/StereotypeImpl.java | 71 -- .../web/beans/xml/impl/SyncUpdateVisitor.java | 171 ---- .../xml/impl/WebBeansComponentBuildVisitor.java | 157 ---- .../xml/impl/WebBeansComponentFactoryImpl.java | 113 --- .../web/beans/xml/impl/WebBeansComponentImpl.java | 85 -- .../web/beans/xml/impl/WebBeansElements.java | 82 -- .../web/beans/xml/impl/WebBeansModelImpl.java | 114 --- .../web/beans/analysis/BaseAnalisysTestCase.java | 349 --------- .../web/beans/analysis/CdiAnalysisTestResult.java | 97 --- .../web/beans/analysis/CdiAnalysisTestTask.java | 59 -- .../jakarta/web/beans/analysis/TestProblems.java | 35 - .../beans/analysis/WebBeansAnalysisTestResult.java | 135 ---- .../beans/analysis/WebBeansAnalysisTestTask.java | 81 -- .../jakarta/web/beans/model/CommonTestCase.java | 216 ----- .../web/beans/model/TestBeansModelImpl.java | 165 ---- .../web/beans/model/TestWebBeansModelImpl.java | 87 -- .../beans/model/TestWebBeansModelProviderImpl.java | 135 ---- .../web/beans/testutilities/CdiTestUtilities.java | 525 ------------- .../web/beans/xdm/model/BeansComponentTest.java | 180 ----- .../web/beans/xdm/model/SyncUpdateTest.java | 104 --- .../web/beans/xdm/model/TestCatalogModel.java | 178 ----- .../modules/jakarta/web/beans/xdm/model/Util.java | 204 ----- .../beans/xdm/model/alternatives-beans-orig.xml | 27 - .../web/beans/xdm/model/alternatives-beans.xml | 30 - .../jakarta/web/beans/xdm/model/beans-orig.xml | 28 - .../jakarta/web/beans/xdm/model/empty-beans.xml | 23 - enterprise/web.beans/licenseinfo.xml | 2 + enterprise/web.beans/nbproject/project.xml | 17 +- .../modules/web/beans/BeansDataLoader.java | 57 -- .../modules/web/beans/BeansDataObject.java | 4 +- .../org/netbeans/modules/web/beans/CdiUtil.java | 6 +- .../web/beans/actions/InterceptorFactory.java | 27 +- .../web/beans/actions/InterceptorGenerator.java | 17 +- .../analyzer/AbstractDecoratorAnalyzer.java | 14 +- .../analysis/analyzer/AbstractScopedAnalyzer.java | 6 +- .../analysis/analyzer/AbstractTypedAnalyzer.java | 51 +- .../beans/analysis/analyzer/AnnotationUtil.java | 238 +++--- .../web/beans/analysis/analyzer/CtorAnalyzer.java | 14 +- .../annotation/InterceptorBindingAnalyzer.java | 22 +- .../InterceptorBindingMembersAnalyzer.java | 23 +- .../analyzer/annotation/QualifierAnalyzer.java | 30 +- .../analyzer/annotation/ScopeAnalyzer.java | 29 +- .../analyzer/annotation/StereotypeAnalyzer.java | 73 +- .../analyzer/field/DelegateFieldAnalizer.java | 26 +- .../analyzer/field/InjectionPointAnalyzer.java | 59 +- .../analyzer/field/ProducerFieldAnalyzer.java | 14 +- .../analyzer/field/ScopedFieldAnalyzer.java | 9 +- .../analyzer/method/AnnotationsAnalyzer.java | 49 +- .../analyzer/method/DelegateMethodAnalyzer.java | 28 +- .../method/InjectionPointParameterAnalyzer.java | 70 +- .../analyzer/method/InterceptedMethodAnalyzer.java | 23 +- .../analyzer/method/ProducerMethodAnalyzer.java | 30 +- .../analyzer/method/ScopedMethodAnalyzer.java | 21 +- .../analyzer/method/TypedMethodAnalyzer.java | 28 +- .../analyzer/type/AnnotationsAnalyzer.java | 84 +- .../beans/analysis/analyzer/type/Bundle.properties | 2 +- .../analysis/analyzer/type/CtorsAnalyzer.java | 6 +- .../analyzer/type/InterceptedBeanAnalyzer.java | 26 +- .../analyzer/type/ManagedBeansAnalizer.java | 52 +- .../analysis/analyzer/type/NamedModelAnalyzer.java | 11 +- .../analysis/analyzer/type/ScopedBeanAnalyzer.java | 69 +- .../analyzer/type/SessionBeanAnalyzer.java | 34 +- .../modules/web/beans/api/model/WebBeansModel.java | 3 +- .../web/beans/completion/BeansCompletor.java | 2 +- .../modules/web/beans/hints/CreateQualifier.java | 75 +- .../beans/impl/model/AbstractObjectProvider.java | 50 +- .../beans/impl/model/AnnotationObjectProvider.java | 114 +-- .../impl/model/ArchiveTypeBindingTypeFilter.java | 20 +- .../modules/web/beans/impl/model/BeansFilter.java | 2 +- .../impl/model/DecoratorInterceptorLogic.java | 38 +- .../web/beans/impl/model/DecoratorObject.java | 11 +- .../beans/impl/model/DecoratorObjectProvider.java | 4 +- .../beans/impl/model/DefaultBindingTypeFilter.java | 35 +- .../web/beans/impl/model/EnableBeansFilter.java | 53 +- .../beans/impl/model/EventInjectionPointLogic.java | 49 +- .../beans/impl/model/FieldInjectionPointLogic.java | 130 +-- .../impl/model/InterceptorBindingChecker.java | 17 +- .../web/beans/impl/model/InterceptorObject.java | 5 +- .../impl/model/InterceptorObjectProvider.java | 4 +- .../web/beans/impl/model/MemberBindingFilter.java | 7 +- .../web/beans/impl/model/MemberCheckerFilter.java | 4 +- .../web/beans/impl/model/MultiLookupStrategy.java | 19 +- .../web/beans/impl/model/NamedStereotype.java | 5 +- .../impl/model/NamedStereotypeObjectProvider.java | 58 +- .../web/beans/impl/model/NormalScopeChecker.java | 13 +- .../impl/model/ParameterInjectionPointLogic.java | 67 +- .../web/beans/impl/model/QualifierChecker.java | 21 +- .../beans/impl/model/RestrictedTypedFilter.java | 6 +- .../beans/impl/model/RuntimeAnnotationChecker.java | 13 +- .../modules/web/beans/impl/model/ScopeChecker.java | 18 +- .../web/beans/impl/model/StereotypeChecker.java | 12 +- .../impl/model/StereotypedObjectProvider.java | 12 +- .../web/beans/impl/model/TypeBindingFilter.java | 7 +- .../impl/model/WebBeansModelImplementation.java | 38 +- .../impl/model/WebBeansModelProviderImpl.java | 89 ++- .../impl/model/results/InterceptorsResultImpl.java | 8 +- .../web/beans/impl/model/results/ResultImpl.java | 6 +- .../web/beans/navigation/BindingsPanel.java | 54 +- .../modules/web/beans/navigation/CDIPanel.java | 4 +- .../web/beans/navigation/DecoratorsPanel.java | 8 +- .../web/beans/navigation/ObserversPanel.java | 4 - .../navigation/actions/WebBeansActionHelper.java | 64 +- .../modules/web/beans/resources/BeansResolver.xml | 41 - .../modules/web/beans/resources/Bundle.properties | 2 - .../web/beans/resources/Interceptor.template | 4 + .../modules/web/beans/resources/Qualifier.template | 4 + .../modules/web/beans/resources/Scope.template | 8 + .../web/beans/resources/Stereotype.template | 4 + .../modules/web/beans/resources/expandTree.png | Bin 0 -> 351 bytes .../netbeans/modules/web/beans/resources/fqn.png | Bin 0 -> 531 bytes .../netbeans/modules/web/beans/resources/layer.xml | 8 +- .../modules/web/beans/wizard/BeansXmlIterator.java | 40 +- .../modules/web/beans/wizard/CDIBeanIterator.java | 173 ++++ .../modules/web/beans/xml/WebBeansComponent.java | 1 + .../xml/impl/WebBeansComponentBuildVisitor.java | 9 +- .../web/beans/xml/impl/WebBeansComponentImpl.java | 2 +- .../web/beans/xml/impl/WebBeansElements.java | 2 +- .../web/beans/analysis/BaseAnalisysTestCase.java | 17 +- .../beans/analysis/CdiAnalysisJakartaTest.java} | 12 +- .../web/beans/analysis/CdiAnalysisTest.java | 2 +- .../analysis/WebBeansAnalysisJakartaTest.java} | 55 +- .../web/beans/analysis/WebBeansAnalysisTest.java | 57 +- .../web/beans/model/AlternativeJakartaTest.java} | 12 +- .../modules/web/beans/model/AlternativeTest.java | 5 +- .../modules/web/beans/model/AnyJakartaTest.java} | 14 +- .../netbeans/modules/web/beans/model/AnyTest.java | 2 +- .../modules/web/beans/model/CommonTestCase.java | 26 +- .../web/beans/model/CurrentJakartaTest.java} | 10 +- .../modules/web/beans/model/CurrentTest.java | 2 +- .../web/beans/model/DecoratorJakartaTest.java} | 10 +- .../modules/web/beans/model/DecoratorTest.java | 2 +- .../model/DelegateAssignabilityJakartaTest.java} | 10 +- .../web/beans/model/DelegateAssignabilityTest.java | 2 +- .../web/beans/model/DisabledBeansJakartaTest.java} | 12 +- .../modules/web/beans/model/DisabledBeansTest.java | 2 +- .../modules/web/beans/model/EventJakartaTest.java} | 10 +- .../modules/web/beans/model/EventTest.java | 2 +- .../model/InterceptorBindingsJakartaTest.java} | 20 +- .../web/beans/model/InterceptorBindingsTest.java | 10 +- .../model/InterceptorResolutionJakartaTest.java} | 20 +- .../web/beans/model/InterceptorResolutionTest.java | 10 +- .../modules/web/beans/model/ModelJakartaTest.java} | 15 +- .../modules/web/beans/model/ModelTest.java | 27 +- .../modules/web/beans/model/NamedJakartaTest.java} | 12 +- .../modules/web/beans/model/NamedTest.java | 2 +- .../modules/web/beans/model/NewJakartaTest.java} | 14 +- .../netbeans/modules/web/beans/model/NewTest.java | 2 +- .../web/beans/model/ObserversJakartaTest.java} | 10 +- .../modules/web/beans/model/ObserversTest.java | 2 +- .../web/beans/model/ParametersJakartaTest.java} | 14 +- .../modules/web/beans/model/ParametersTest.java | 2 +- .../web/beans/model/ProgrammaticJakartaTest.java} | 14 +- .../modules/web/beans/model/ProgrammaticTest.java | 2 +- .../web/beans/model/QualifiersJakartaTest.java} | 10 +- .../modules/web/beans/model/QualifiersTest.java | 2 +- .../RawParameterizedAssignabilityJakartaTest.java} | 10 +- .../model/RawParameterizedAssignabilityTest.java | 2 +- .../modules/web/beans/model/ScopeJakartaTest.java} | 21 +- .../modules/web/beans/model/ScopeTest.java | 21 +- .../web/beans/model/SpecializesJakartaTest.java} | 10 +- .../modules/web/beans/model/SpecializesTest.java | 2 +- .../modules/web/beans/model/TypedJakartaTest.java} | 10 +- .../modules/web/beans/model/TypedTest.java | 2 +- .../web/beans/testutilities/CdiTestUtilities.java | 152 ++-- .../web/beans/xdm/model/BeansComponentTest.java | 25 + .../modules/web/beans/xdm/model/beans_jakarta.xml} | 2 +- enterprise/web.el/nbproject/project.xml | 9 - enterprise/web.jsf.editor/nbproject/project.xml | 9 - .../modules/web/jsf/editor/JsfSupportImpl.java | 16 +- .../jsf/editor/el/WebBeansELVariableResolver.java | 29 +- enterprise/web.jsf/nbproject/project.xml | 9 - .../jsf/hints/rules/FlowScopedBeanWithoutCdi.java | 18 +- .../jsf/palette/items/ManagedBeanCustomizer.java | 34 +- .../web/jsf/wizards/ManagedBeanIterator.java | 11 +- .../web/jsf/wizards/ManagedBeanPanelVisual.java | 9 +- .../web/jsf/wizards/PersistenceClientIterator.java | 4 - enterprise/web.kit/nbproject/project.xml | 7 - ide/xml.text/nbproject/project.xml | 1 - .../nbproject/project.xml | 1 - java/java.hints.legacy.spi/nbproject/project.xml | 1 - .../nbcode/nbproject/platform.properties | 1 - java/javaee.injection/nbproject/project.xml | 1 - nbbuild/cluster.properties | 1 - 453 files changed, 2031 insertions(+), 40607 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
