You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2023/05/23 17:11:04 UTC

[netbeans] branch master updated: NETBEANS-4035: CDI Bean as Named is not listed in xhtml for selection

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


The following commit(s) were added to refs/heads/master by this push:
     new 697d0320ea NETBEANS-4035: CDI Bean as Named is not listed in xhtml for selection
     new 788ba1f725 Merge pull request #5866 from juneau001/NETBEANS-4035
697d0320ea is described below

commit 697d0320eaffbd054813a5d0c369bf5ebae47703
Author: Josh Juneau <ju...@gmail.com>
AuthorDate: Fri Apr 21 07:50:41 2023 -0500

    NETBEANS-4035: CDI Bean as Named is not listed in xhtml for selection
    
    Closes: #4035
    Co-authored-by: José Contreras <pe...@apache.org>
    Co-authored-by: Matthias Bläsing <mb...@doppel-helix.eu>
---
 .../j2ee.api.ejbmodule/nbproject/project.xml       |    1 +
 enterprise/j2ee.common/nbproject/project.xml       |    1 +
 .../build.xml}                                     |   13 +-
 enterprise/jakarta.web.beans/licenseinfo.xml       |   39 +
 enterprise/jakarta.web.beans/manifest.mf           |    6 +
 .../org-netbeans-modules-jakarta-web-beans.sig}    |  160 +-
 .../nbproject/project.properties}                  |   24 +-
 .../nbproject/project.xml                          |  262 +--
 .../modules/jakarta/web/beans/BeansDataLoader.java |   57 +
 .../modules/jakarta/web/beans/BeansDataObject.java |  113 +
 .../modules/jakarta/web/beans}/Bundle.properties   |   17 +-
 .../modules/jakarta/web/beans/CarCdiUtil.java      |   59 +
 .../jakarta/web/beans/CdiProjectOpenHook.java      |   72 +
 .../modules/jakarta/web/beans/CdiUtil.java         |  330 +++
 .../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   |   26 +-
 .../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  |   18 +-
 .../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} |   44 +-
 .../CdiEditorAwareJavaSourceTaskFactory.java}      |   41 +-
 .../web/beans/analysis/WebBeansAnalysisTask.java   |  206 ++
 .../analysis/WebBeansEditorAnalysisTask.java}      |   48 +-
 .../analysis/WebBeansModelAnalysisFactory.java     |   50 +
 .../analyzer/AbstractDecoratorAnalyzer.java        |   44 +-
 .../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 |   17 +-
 .../analysis/analyzer/ClassElementAnalyzer.java    |   69 +
 .../analysis/analyzer/ClassModelAnalyzer.java      |   77 +
 .../web/beans/analysis/analyzer/CtorAnalyzer.java  |   67 +
 .../beans/analysis/analyzer/ElementAnalyzer.java}  |   34 +-
 .../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}       |   31 +-
 .../analysis/analyzer/field/Bundle.properties      |   48 +
 .../analyzer/field/DelegateFieldAnalizer.java      |  133 ++
 .../analyzer/field/InjectionPointAnalyzer.java     |   30 +-
 .../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    |   32 +-
 .../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}      |   35 +-
 .../jakarta/web/beans/api/model/BeansModel.java    |   61 +
 .../web/beans/api/model/BeansModelFactory.java}    |   45 +-
 .../jakarta/web/beans/api/model/BeansResult.java}  |   31 +-
 .../jakarta/web/beans/api/model/CdiException.java} |   31 +-
 .../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}       |   35 +-
 .../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}     |   29 +-
 .../web/beans/completion/ContextUtilities.java     |  146 ++
 .../web/beans/completion/DocumentContext.java      |  236 +++
 .../beans/completion/EditorContextFactory.java}    |   40 +-
 .../jakarta/web/beans/completion/Utils.java        |   77 +
 .../jakarta/web/beans/hints}/Bundle.properties     |   30 +-
 .../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} |   36 +-
 .../beans/impl/model/DefaultBindingTypeFilter.java |  129 ++
 .../impl/model/DelegateAssignabilityChecker.java   |  262 +++
 .../web/beans/impl/model/EnableBeansFilter.java    |   74 +-
 .../impl/model/EventAssignabilityChecker.java      |  148 ++
 .../beans/impl/model/EventInjectionPointLogic.java |  514 +++++
 .../beans/impl/model/FieldInjectionPointLogic.java |  872 ++++++++
 .../jakarta/web/beans/impl/model/Filter.java}      |   35 +-
 .../impl/model/InterceptorBindingChecker.java      |   97 +
 .../web/beans/impl/model/InterceptorObject.java    |   61 +
 .../impl/model/InterceptorObjectProvider.java}     |   37 +-
 .../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}  |   36 +-
 .../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}   |   29 +-
 .../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}  |   28 +-
 .../web/beans/navigation/JavaTreeCellRenderer.java |   54 +
 .../web/beans/navigation/MethodTreeNode.java       |   82 +
 .../web/beans/navigation/NoBorderToolBar.java}     |   42 +-
 .../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}         |   37 +-
 .../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}   |   46 +-
 .../actions/ObserversActionStrategy.java           |  109 +
 .../navigation/actions/PositionStrategy.java}      |   29 +-
 .../navigation/actions/WebBeansActionHelper.java   |  778 +++++++
 .../jakarta}/web/beans/resources/BeansResolver.xml |    5 +-
 .../jakarta/web/beans/resources/BeansXml.html}     |   19 +-
 .../jakarta}/web/beans/resources/Bundle.properties |   19 +-
 .../jakarta/web/beans/resources/Interceptor.html}  |   19 +-
 .../web/beans/resources/Interceptor.template       |   27 +
 .../jakarta/web/beans/resources/Qualifier.html}    |   19 +-
 .../jakarta/web/beans/resources/Qualifier.template |   27 +
 .../jakarta/web/beans/resources/Scope.html}        |   19 +-
 .../jakarta/web/beans/resources/Scope.template     |   28 +
 .../jakarta/web/beans/resources/Stereotype.html}   |   19 +-
 .../web/beans/resources/Stereotype.template        |   26 +
 .../jakarta/web/beans/resources/delegate.png       |  Bin 0 -> 513 bytes
 .../modules/jakarta/web/beans/resources/event.png  |  Bin 0 -> 511 bytes
 .../web/beans/resources/injection_point.png        |  Bin 0 -> 511 bytes
 .../modules/jakarta/web/beans/resources/layer.xml  |  154 ++
 .../jakarta/web/beans/resources/observer.png       |  Bin 0 -> 511 bytes
 ...karta-web-beans-annotations-decorated-bean.xml} |   18 +-
 ...karta-web-beans-annotations-delegate-point.xml} |   18 +-
 ...odules-jakarta-web-beans-annotations-event.xml} |   18 +-
 ...arta-web-beans-annotations-injection-point.xml} |   18 +-
 ...-jakarta-web-beans-annotations-intercepted.xml} |   18 +-
 ...les-jakarta-web-beans-annotations-observer.xml} |   18 +-
 .../jakarta/web/beans/wizard/BeansXmlIterator.java |  322 +++
 .../jakarta/web/beans/wizard}/Bundle.properties    |   18 +-
 .../jakarta/web/beans/xml/AlternativeElement.java} |   29 +-
 .../jakarta/web/beans/xml/Alternatives.java}       |   34 +-
 .../modules/jakarta/web/beans/xml/BeanClass.java}  |   30 +-
 .../jakarta/web/beans/xml/BeanClassContainer.java} |   32 +-
 .../modules/jakarta/web/beans/xml/Beans.java}      |   37 +-
 .../jakarta/web/beans/xml/BeansAttributes.java}    |   56 +-
 .../jakarta/web/beans/xml/BeansElement.java}       |   29 +-
 .../modules/jakarta/web/beans/xml/Decorators.java} |   27 +-
 .../jakarta/web/beans/xml/Interceptors.java}       |   27 +-
 .../modules/jakarta/web/beans/xml/Stereotype.java} |   30 +-
 .../jakarta/web/beans/xml/WebBeansComponent.java}  |   32 +-
 .../web/beans/xml/WebBeansComponentFactory.java}   |   34 +-
 .../jakarta/web/beans/xml/WebBeansModel.java}      |   29 +-
 .../web/beans/xml/WebBeansModelFactory.java        |   54 +
 .../jakarta/web/beans/xml/WebBeansVisitor.java}    |   36 +-
 .../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/CdiAnalysisTest.java        | 1519 ++++++++++++++
 .../web/beans/analysis/CdiAnalysisTestResult.java  |   97 +
 .../web/beans/analysis/CdiAnalysisTestTask.java    |   59 +
 .../jakarta/web/beans/analysis/TestProblems.java}  |   31 +-
 .../web/beans/analysis/WebBeansAnalysisTest.java   | 2148 ++++++++++++++++++++
 .../beans/analysis/WebBeansAnalysisTestResult.java |  135 ++
 .../beans/analysis/WebBeansAnalysisTestTask.java   |   81 +
 .../jakarta/web/beans/model/AlternativeTest.java   | 1153 +++++++++++
 .../modules/jakarta/web/beans/model/AnyTest.java   |  242 +++
 .../jakarta/web/beans/model/CommonTestCase.java    |  216 ++
 .../jakarta/web/beans/model/CurrentTest.java       |  373 ++++
 .../jakarta/web/beans/model/DecoratorTest.java     |  310 +++
 .../web/beans/model/DelegateAssignabilityTest.java |  330 +++
 .../jakarta/web/beans/model/DisabledBeansTest.java | 1068 ++++++++++
 .../modules/jakarta/web/beans/model/EventTest.java |  669 ++++++
 .../web/beans/model/InterceptorBindingsTest.java   |  354 ++++
 .../web/beans/model/InterceptorResolutionTest.java |  612 ++++++
 .../modules/jakarta/web/beans/model/ModelTest.java |  574 ++++++
 .../modules/jakarta/web/beans/model/NamedTest.java |  393 ++++
 .../modules/jakarta/web/beans/model/NewTest.java   |  128 ++
 .../jakarta/web/beans/model/ObserversTest.java     |  698 +++++++
 .../jakarta/web/beans/model/ParametersTest.java    |  439 ++++
 .../jakarta/web/beans/model/ProgrammaticTest.java  |  145 ++
 .../jakarta/web/beans/model/QualifiersTest.java    |  379 ++++
 .../model/RawParameterizedAssignabilityTest.java   |  317 +++
 .../modules/jakarta/web/beans/model/ScopeTest.java |  318 +++
 .../jakarta/web/beans/model/SpecializesTest.java   |  592 ++++++
 .../web/beans/model/TestBeansModelImpl.java        |  165 ++
 .../web/beans/model/TestWebBeansModelImpl.java     |   87 +
 .../beans/model/TestWebBeansModelProviderImpl.java |  135 ++
 .../modules/jakarta/web/beans/model/TypedTest.java |  351 ++++
 .../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      |   17 +-
 .../modules/jakarta}/web/beans/xdm/model/Util.java |   21 +-
 .../beans/xdm/model/alternatives-beans-orig.xml}   |   17 +-
 .../web/beans/xdm/model/alternatives-beans.xml}    |   20 +-
 .../jakarta/web/beans/xdm/model/beans-orig.xml}    |   18 +-
 .../modules/jakarta/web/beans/xdm/model/beans.xml} |   26 +-
 .../jakarta/web/beans/xdm/model/empty-beans.xml}   |   13 +-
 enterprise/web.beans/manifest.mf                   |    2 +-
 .../nbproject/org-netbeans-modules-web-beans.sig   |    2 +-
 .../analyzer/AbstractDecoratorAnalyzer.java        |   34 +-
 .../analyzer/field/InjectionPointAnalyzer.java     |    2 +-
 .../method/InjectionPointParameterAnalyzer.java    |    2 +-
 .../web/beans/impl/model/EnableBeansFilter.java    |    2 +-
 .../modules/web/beans/resources/BeansResolver.xml  |    1 -
 .../modules/web/beans/resources/Bundle.properties  |    4 +-
 ...odules-web-beans-annotations-decorated-bean.xml |   18 +-
 .../web/beans/xdm/model/TestCatalogModel.java      |   15 +-
 .../netbeans/modules/web/beans/xdm/model/Util.java |   15 +-
 enterprise/web.el/nbproject/project.xml            |    9 +
 .../web/el/refactoring/ELRenameRefactoring.java    |   24 +-
 enterprise/web.jsf.editor/nbproject/project.xml    |    9 +
 .../modules/web/jsf/editor/JsfSupportImpl.java     |   60 +-
 .../jsf/editor/el/WebBeansELVariableResolver.java  |   55 +-
 enterprise/web.jsf/manifest.mf                     |    2 +-
 enterprise/web.jsf/nbproject/project.xml           |    9 +
 .../src/org/netbeans/modules/web/jsf/JSFUtils.java |   10 +
 .../jsf/hints/rules/FlowScopedBeanWithoutCdi.java  |   22 +-
 .../web/jsf/palette/items/JsfLibrariesSupport.java |    6 +-
 .../jsf/palette/items/ManagedBeanCustomizer.java   |   41 +-
 .../web/jsf/wizards/ManagedBeanIterator.java       |   16 +-
 .../web/jsf/wizards/ManagedBeanPanelVisual.java    |   13 +-
 .../web/jsf/wizards/PersistenceClientIterator.java |   11 +-
 .../nbproject/org-netbeans-modules-web-jsfapi.sig  |    3 +-
 .../modules/web/jsfapi/api/JsfSupport.java         |    6 +-
 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 +
 352 files changed, 48529 insertions(+), 1631 deletions(-)

diff --git a/enterprise/j2ee.api.ejbmodule/nbproject/project.xml b/enterprise/j2ee.api.ejbmodule/nbproject/project.xml
index 67806c00d6..32419ba381 100644
--- a/enterprise/j2ee.api.ejbmodule/nbproject/project.xml
+++ b/enterprise/j2ee.api.ejbmodule/nbproject/project.xml
@@ -247,6 +247,7 @@
                 <friend>org.netbeans.modules.maven.jaxws</friend>
                 <friend>org.netbeans.modules.profiler.j2ee</friend>
                 <friend>org.netbeans.modules.web.beans</friend>
+                <friend>org.netbeans.modules.jakarta.web.beans</friend>
                 <friend>org.netbeans.modules.web.project</friend>
                 <friend>org.netbeans.modules.websvc.core</friend>
                 <friend>org.netbeans.modules.websvc.dev</friend>
diff --git a/enterprise/j2ee.common/nbproject/project.xml b/enterprise/j2ee.common/nbproject/project.xml
index 9c5939c006..7ce39afc5d 100644
--- a/enterprise/j2ee.common/nbproject/project.xml
+++ b/enterprise/j2ee.common/nbproject/project.xml
@@ -522,6 +522,7 @@
                 <friend>org.netbeans.modules.visualweb.dataconnectivity</friend>
                 <friend>org.netbeans.modules.visualweb.project.jsf</friend>
                 <friend>org.netbeans.modules.web.beans</friend>
+                <friend>org.netbeans.modules.jakarta.web.beans</friend>
                 <friend>org.netbeans.modules.web.core</friend>
                 <friend>org.netbeans.modules.web.freeform</friend>
                 <friend>org.netbeans.modules.web.jsf</friend>
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/org-netbeans-modules-web-beans-annotations-decorated-bean.xml b/enterprise/jakarta.web.beans/build.xml
similarity index 62%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/org-netbeans-modules-web-beans-annotations-decorated-bean.xml
copy to enterprise/jakarta.web.beans/build.xml
index e4861fe998..bb0563e052 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/org-netbeans-modules-web-beans-annotations-decorated-bean.xml
+++ b/enterprise/jakarta.web.beans/build.xml
@@ -19,12 +19,7 @@
     under the License.
 
 -->
-       <!DOCTYPE type PUBLIC
-                 "-//NetBeans//DTD annotation type 1.1//EN"
-                 "http://www.netbeans.org/dtds/annotation-type-1_1.dtd">
-       <type name="org-netbeans-modules-web-beans-annotations-decorated-bean"
-             description_key="DSCR_Decorated"
-             localizing_bundle="org.netbeans.modules.web.beans.resources.Bundle"
-             visible="true"
-             glyph="nbresloc:/org/netbeans/modules/web/beans/resources/delegate.png"
-             priority="5"/>
+<project basedir="." default="build" name="enterprise/jakarta.web.beans">
+    <description>Builds, tests, and runs the project org.netbeans.modules.jakarta.web.beans</description>
+    <import file="../../nbbuild/templates/projectized.xml"/>
+</project>
diff --git a/enterprise/jakarta.web.beans/licenseinfo.xml b/enterprise/jakarta.web.beans/licenseinfo.xml
new file mode 100644
index 0000000000..fb786cf0fc
--- /dev/null
+++ b/enterprise/jakarta.web.beans/licenseinfo.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<licenseinfo>
+    <fileset>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/delegate.png</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/injection_point.png</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/event.png</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/observer.png</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="COMMENT_UNSUPPORTED" />
+    </fileset>
+    <fileset>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/Interceptor.template</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/Qualifier.template</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/Scope.template</file>
+        <file>src/org/netbeans/modules/jakarta/web/beans/resources/Stereotype.template</file>
+        <license ref="Apache-2.0-ASF" />
+        <comment type="TEMPLATE_MINIMAL_IP"/>
+    </fileset>
+</licenseinfo>
diff --git a/enterprise/jakarta.web.beans/manifest.mf b/enterprise/jakarta.web.beans/manifest.mf
new file mode 100644
index 0000000000..3a8ae23a8c
--- /dev/null
+++ b/enterprise/jakarta.web.beans/manifest.mf
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.modules.jakarta.web.beans/1
+OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jakarta/web/beans/resources/Bundle.properties
+OpenIDE-Module-Layer: org/netbeans/modules/jakarta/web/beans/resources/layer.xml
+OpenIDE-Module-Specification-Version: 2.38
+AutoUpdate-Show-In-Client: false
diff --git a/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig b/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig
similarity index 78%
copy from enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig
copy to enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig
index f79cf21f03..329df3b5bc 100644
--- a/enterprise/web.beans/nbproject/org-netbeans-modules-web-beans.sig
+++ b/enterprise/jakarta.web.beans/nbproject/org-netbeans-modules-jakarta-web-beans.sig
@@ -86,28 +86,24 @@ meth public void printStackTrace(java.io.PrintWriter)
 meth public void setStackTrace(java.lang.StackTraceElement[])
 supr java.lang.Object
 
-CLSS public abstract interface org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation
-meth public abstract boolean isInjectionTarget(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
-meth public abstract boolean isStaticReferenceRequired(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
-
-CLSS public org.netbeans.modules.web.beans.BeansDataObject
+CLSS public org.netbeans.modules.jakarta.web.beans.BeansDataObject
 cons public init(org.openide.filesystems.FileObject,org.openide.loaders.MultiFileLoader) throws java.io.IOException
 meth protected int associateLookup()
 supr org.openide.loaders.MultiDataObject
 
-CLSS public org.netbeans.modules.web.beans.CarCdiUtil
+CLSS public org.netbeans.modules.jakarta.web.beans.CarCdiUtil
 cons public init(org.netbeans.api.project.Project)
 meth public java.util.Collection<org.openide.filesystems.FileObject> getBeansTargetFolder(boolean)
-supr org.netbeans.modules.web.beans.CdiUtil
+supr org.netbeans.modules.jakarta.web.beans.CdiUtil
 
-CLSS public org.netbeans.modules.web.beans.CdiProjectOpenHook
+CLSS public org.netbeans.modules.jakarta.web.beans.CdiProjectOpenHook
 cons public init(org.netbeans.api.project.Project)
 meth protected void projectClosed()
 meth protected void projectOpened()
 supr org.netbeans.spi.project.ui.ProjectOpenedHook
 hfds myProject
 
-CLSS public org.netbeans.modules.web.beans.CdiUtil
+CLSS public org.netbeans.modules.jakarta.web.beans.CdiUtil
 cons public init(org.netbeans.api.project.Project)
 fld public final static java.lang.String BEANS = "beans"
 fld public final static java.lang.String BEANS_XML = "beans.xml"
@@ -126,70 +122,70 @@ meth public void log(java.lang.String,java.lang.Class<?>,java.lang.Object[],bool
 supr java.lang.Object
 hfds LOG,META_INF,myMessages,myProject
 
-CLSS public org.netbeans.modules.web.beans.EjbCdiUtil
+CLSS public org.netbeans.modules.jakarta.web.beans.EjbCdiUtil
 cons public init(org.netbeans.api.project.Project)
 meth public java.util.Collection<org.openide.filesystems.FileObject> getBeansTargetFolder(boolean)
-supr org.netbeans.modules.web.beans.CdiUtil
+supr org.netbeans.modules.jakarta.web.beans.CdiUtil
 
-CLSS public org.netbeans.modules.web.beans.MetaModelSupport
+CLSS public org.netbeans.modules.jakarta.web.beans.MetaModelSupport
 cons public init(org.netbeans.api.project.Project)
 meth public org.netbeans.api.java.classpath.ClassPath getClassPath(java.lang.String)
-meth public org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.web.beans.api.model.WebBeansModel> getMetaModel()
+meth public org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel> getMetaModel()
 supr java.lang.Object
 hfds MODELS,myProject
 
-CLSS public org.netbeans.modules.web.beans.WebBeanInjectionTargetQueryImplementation
+CLSS public org.netbeans.modules.jakarta.web.beans.WebBeanInjectionTargetQueryImplementation
 cons public init()
 intf org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation
 meth public boolean isInjectionTarget(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
 meth public boolean isStaticReferenceRequired(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
 supr java.lang.Object
 
-CLSS public org.netbeans.modules.web.beans.WebCdiUtil
+CLSS public org.netbeans.modules.jakarta.web.beans.WebCdiUtil
 cons public init(org.netbeans.api.project.Project)
 meth public java.util.Collection<org.openide.filesystems.FileObject> getBeansTargetFolder(boolean)
-supr org.netbeans.modules.web.beans.CdiUtil
-
-CLSS public abstract org.netbeans.modules.web.beans.api.model.AbstractModelImplementation
-cons protected init(org.netbeans.modules.web.beans.api.model.ModelUnit)
-meth protected org.netbeans.modules.web.beans.api.model.WebBeansModel getModel()
-meth protected org.netbeans.modules.web.beans.model.spi.WebBeansModelProvider getProvider()
-meth public org.netbeans.modules.web.beans.api.model.BeansModel getBeansModel()
-meth public org.netbeans.modules.web.beans.api.model.ModelUnit getModelUnit()
+supr org.netbeans.modules.jakarta.web.beans.CdiUtil
+
+CLSS public abstract org.netbeans.modules.jakarta.web.beans.api.model.AbstractModelImplementation
+cons protected init(org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit)
+meth protected org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel getModel()
+meth protected org.netbeans.modules.jakarta.web.beans.model.spi.WebBeansModelProvider getProvider()
+meth public org.netbeans.modules.jakarta.web.beans.api.model.BeansModel getBeansModel()
+meth public org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit getModelUnit()
 supr java.lang.Object
 hfds myModel,myProvider,myUnit
 
-CLSS public final !enum org.netbeans.modules.web.beans.api.model.BeanArchiveType
-fld public final static org.netbeans.modules.web.beans.api.model.BeanArchiveType EXPLICIT
-fld public final static org.netbeans.modules.web.beans.api.model.BeanArchiveType IMPLICIT
-fld public final static org.netbeans.modules.web.beans.api.model.BeanArchiveType NONE
-meth public static org.netbeans.modules.web.beans.api.model.BeanArchiveType valueOf(java.lang.String)
-meth public static org.netbeans.modules.web.beans.api.model.BeanArchiveType[] values()
-supr java.lang.Enum<org.netbeans.modules.web.beans.api.model.BeanArchiveType>
+CLSS public final !enum org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType EXPLICIT
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType IMPLICIT
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType NONE
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType valueOf(java.lang.String)
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType[] values()
+supr java.lang.Enum<org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType>
 
-CLSS public abstract interface org.netbeans.modules.web.beans.api.model.BeansModel
+CLSS public abstract interface org.netbeans.modules.jakarta.web.beans.api.model.BeansModel
 meth public abstract boolean isCdi11OrLater()
 meth public abstract java.util.LinkedHashSet<java.lang.String> getDecoratorClasses()
 meth public abstract java.util.LinkedHashSet<java.lang.String> getInterceptorClasses()
 meth public abstract java.util.Set<java.lang.String> getAlternativeClasses()
 meth public abstract java.util.Set<java.lang.String> getAlternativeStereotypes()
-meth public abstract org.netbeans.modules.web.beans.api.model.BeanArchiveType getBeanArchiveType()
+meth public abstract org.netbeans.modules.jakarta.web.beans.api.model.BeanArchiveType getBeanArchiveType()
 
-CLSS public final org.netbeans.modules.web.beans.api.model.BeansModelFactory
-meth public static org.netbeans.modules.web.beans.api.model.BeansModel createModel(org.netbeans.modules.web.beans.api.model.ModelUnit)
-meth public static org.netbeans.modules.web.beans.api.model.BeansModel getModel(org.netbeans.modules.web.beans.api.model.ModelUnit)
+CLSS public final org.netbeans.modules.jakarta.web.beans.api.model.BeansModelFactory
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.BeansModel createModel(org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit)
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.BeansModel getModel(org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit)
 supr java.lang.Object
 hfds MODELS
 
-CLSS public abstract interface org.netbeans.modules.web.beans.api.model.BeansResult
+CLSS public abstract interface org.netbeans.modules.jakarta.web.beans.api.model.BeansResult
 meth public abstract boolean isDisabled(javax.lang.model.element.Element)
 
-CLSS public org.netbeans.modules.web.beans.api.model.CdiException
+CLSS public org.netbeans.modules.jakarta.web.beans.api.model.CdiException
 cons public init(java.lang.String)
 supr java.lang.Exception
 hfds serialVersionUID
 
-CLSS public abstract interface org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
+CLSS public abstract interface org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
 innr public abstract interface static ApplicableResult
 innr public abstract interface static Error
 innr public abstract interface static InjectableResult
@@ -197,57 +193,57 @@ innr public abstract interface static ResolutionResult
 innr public final static !enum ResultKind
 meth public abstract javax.lang.model.element.VariableElement getVariable()
 meth public abstract javax.lang.model.type.TypeMirror getVariableType()
-meth public abstract org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind getKind()
+meth public abstract org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind getKind()
 
-CLSS public abstract interface static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ApplicableResult
- outer org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-intf org.netbeans.modules.web.beans.api.model.BeansResult
-intf org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
+CLSS public abstract interface static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ApplicableResult
+ outer org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.BeansResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
 meth public abstract java.util.Set<javax.lang.model.element.Element> getProductions()
 meth public abstract java.util.Set<javax.lang.model.element.TypeElement> getTypeElements()
 
-CLSS public abstract interface static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$Error
- outer org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-intf org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
+CLSS public abstract interface static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$Error
+ outer org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
 meth public abstract java.lang.String getMessage()
 
-CLSS public abstract interface static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$InjectableResult
- outer org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-intf org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
+CLSS public abstract interface static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$InjectableResult
+ outer org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
 meth public abstract javax.lang.model.element.Element getElement()
 
-CLSS public abstract interface static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResolutionResult
- outer org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-intf org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-intf org.netbeans.modules.web.beans.api.model.Result
+CLSS public abstract interface static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResolutionResult
+ outer org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.Result
 meth public abstract boolean hasAlternative(javax.lang.model.element.Element)
 meth public abstract boolean isAlternative(javax.lang.model.element.Element)
 
-CLSS public final static !enum org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind
- outer org.netbeans.modules.web.beans.api.model.DependencyInjectionResult
-fld public final static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind DEFINITION_ERROR
-fld public final static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind INJECTABLES_RESOLVED
-fld public final static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind INJECTABLE_RESOLVED
-fld public final static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind RESOLUTION_ERROR
-meth public static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind valueOf(java.lang.String)
-meth public static org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind[] values()
-supr java.lang.Enum<org.netbeans.modules.web.beans.api.model.DependencyInjectionResult$ResultKind>
-
-CLSS public org.netbeans.modules.web.beans.api.model.InjectionPointDefinitionError
+CLSS public final static !enum org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind
+ outer org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind DEFINITION_ERROR
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind INJECTABLES_RESOLVED
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind INJECTABLE_RESOLVED
+fld public final static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind RESOLUTION_ERROR
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind valueOf(java.lang.String)
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind[] values()
+supr java.lang.Enum<org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult$ResultKind>
+
+CLSS public org.netbeans.modules.jakarta.web.beans.api.model.InjectionPointDefinitionError
 cons public init(javax.lang.model.element.Element,java.lang.String)
 meth public javax.lang.model.element.Element getErrorElement()
-supr org.netbeans.modules.web.beans.api.model.CdiException
+supr org.netbeans.modules.jakarta.web.beans.api.model.CdiException
 hfds myElement,serialVersionUID
 
-CLSS public abstract interface org.netbeans.modules.web.beans.api.model.InterceptorsResult
-intf org.netbeans.modules.web.beans.api.model.BeansResult
-intf org.netbeans.modules.web.beans.api.model.Result
+CLSS public abstract interface org.netbeans.modules.jakarta.web.beans.api.model.InterceptorsResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.BeansResult
+intf org.netbeans.modules.jakarta.web.beans.api.model.Result
 meth public abstract java.util.List<javax.lang.model.element.TypeElement> getAllInterceptors()
 meth public abstract java.util.List<javax.lang.model.element.TypeElement> getDeclaredInterceptors()
 meth public abstract java.util.List<javax.lang.model.element.TypeElement> getResolvedInterceptors()
 meth public abstract javax.lang.model.element.Element getElement()
 
-CLSS public org.netbeans.modules.web.beans.api.model.ModelUnit
+CLSS public org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit
 meth public boolean equals(java.lang.Object)
 meth public int hashCode()
 meth public org.netbeans.api.java.classpath.ClassPath getBootPath()
@@ -255,22 +251,22 @@ meth public org.netbeans.api.java.classpath.ClassPath getCompilePath()
 meth public org.netbeans.api.java.classpath.ClassPath getSourcePath()
 meth public org.netbeans.api.java.source.ClasspathInfo getClassPathInfo()
 meth public org.netbeans.api.project.Project getProject()
-meth public static org.netbeans.modules.web.beans.api.model.ModelUnit create(org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.project.Project)
+meth public static org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit create(org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.java.classpath.ClassPath,org.netbeans.api.project.Project)
 supr java.lang.Object
 hfds myBootPath,myClassPathInfo,myCompilePath,myProject,mySourcePath
 
-CLSS public abstract interface org.netbeans.modules.web.beans.api.model.Result
+CLSS public abstract interface org.netbeans.modules.jakarta.web.beans.api.model.Result
 meth public abstract java.util.List<javax.lang.model.element.AnnotationMirror> getAllStereotypes(javax.lang.model.element.Element)
 meth public abstract java.util.List<javax.lang.model.element.AnnotationMirror> getStereotypes(javax.lang.model.element.Element)
 
-CLSS public final org.netbeans.modules.web.beans.api.model.WebBeansModel
+CLSS public final org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel
 meth public boolean hasImplicitDefaultQualifier(javax.lang.model.element.Element)
 meth public boolean isCdi11OrLater()
 meth public boolean isDynamicInjectionPoint(javax.lang.model.element.VariableElement)
 meth public boolean isEventInjectionPoint(javax.lang.model.element.VariableElement)
-meth public boolean isInjectionPoint(javax.lang.model.element.VariableElement) throws org.netbeans.modules.web.beans.api.model.InjectionPointDefinitionError
+meth public boolean isInjectionPoint(javax.lang.model.element.VariableElement) throws org.netbeans.modules.jakarta.web.beans.api.model.InjectionPointDefinitionError
 meth public java.lang.String getName(javax.lang.model.element.Element)
-meth public java.lang.String getScope(javax.lang.model.element.Element) throws org.netbeans.modules.web.beans.api.model.CdiException
+meth public java.lang.String getScope(javax.lang.model.element.Element) throws org.netbeans.modules.jakarta.web.beans.api.model.CdiException
 meth public java.util.Collection<javax.lang.model.element.AnnotationMirror> getInterceptorBindings(javax.lang.model.element.Element)
 meth public java.util.Collection<javax.lang.model.element.TypeElement> getDecorators(javax.lang.model.element.TypeElement)
 meth public java.util.List<javax.lang.model.element.AnnotationMirror> getQualifiers(javax.lang.model.element.Element,boolean)
@@ -280,18 +276,22 @@ meth public java.util.List<javax.lang.model.element.VariableElement> getEventInj
 meth public javax.lang.model.element.VariableElement getObserverParameter(javax.lang.model.element.ExecutableElement)
 meth public javax.lang.model.type.TypeMirror resolveType(java.lang.String)
 meth public org.netbeans.api.java.source.CompilationController getCompilationController()
-meth public org.netbeans.modules.web.beans.api.model.AbstractModelImplementation getModelImplementation()
-meth public org.netbeans.modules.web.beans.api.model.DependencyInjectionResult lookupInjectables(javax.lang.model.element.VariableElement,javax.lang.model.type.DeclaredType,java.util.concurrent.atomic.AtomicBoolean)
-meth public org.netbeans.modules.web.beans.api.model.InterceptorsResult getInterceptors(javax.lang.model.element.Element)
+meth public org.netbeans.modules.jakarta.web.beans.api.model.AbstractModelImplementation getModelImplementation()
+meth public org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult lookupInjectables(javax.lang.model.element.VariableElement,javax.lang.model.type.DeclaredType,java.util.concurrent.atomic.AtomicBoolean)
+meth public org.netbeans.modules.jakarta.web.beans.api.model.InterceptorsResult getInterceptors(javax.lang.model.element.Element)
 supr java.lang.Object
 hfds myImpl
 
-CLSS public final org.netbeans.modules.web.beans.api.model.WebBeansModelFactory
-meth public static org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.web.beans.api.model.WebBeansModel> createMetaModel(org.netbeans.modules.web.beans.api.model.ModelUnit)
-meth public static org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.web.beans.api.model.WebBeansModel> getMetaModel(org.netbeans.modules.web.beans.api.model.ModelUnit)
+CLSS public final org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModelFactory
+meth public static org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel> createMetaModel(org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit)
+meth public static org.netbeans.modules.j2ee.metadata.model.api.MetadataModel<org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel> getMetaModel(org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit)
 supr java.lang.Object
 hfds MODELS
 
+CLSS public abstract interface org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation
+meth public abstract boolean isInjectionTarget(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
+meth public abstract boolean isStaticReferenceRequired(org.netbeans.api.java.source.CompilationController,javax.lang.model.element.TypeElement)
+
 CLSS public abstract org.netbeans.spi.project.ui.ProjectOpenedHook
 cons protected init()
 meth protected abstract void projectClosed()
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties b/enterprise/jakarta.web.beans/nbproject/project.properties
similarity index 54%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
copy to enterprise/jakarta.web.beans/nbproject/project.properties
index cee8b660a7..ea59ff1cb5 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
+++ b/enterprise/jakarta.web.beans/nbproject/project.properties
@@ -14,20 +14,14 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Contexts and Dependency Injection Support
 
-Templates/CDI=Contexts and Dependency Injection
-Templates/CDI/beans.xml=beans.xml (CDI Configuration File)
-Templates/CDI/Interceptor.java=Interceptor Binding Type
-Templates/CDI/Qualifier.java=Qualifier Type
-Templates/CDI/Scope.java=Scope Type
-Templates/CDI/Stereotype.java=Stereotype
+javac.compilerargs=-Xlint -Xlint:-serial
+javac.source=1.8
+nbm.module.author=Josh Juneau
+requires.nb.javac=true
 
-DSCR_InjectionPoint=CDI Injection Point
-DSCR_Decorated=CDI Decorated Bean
-DSCR_Delegate=CDI Delegate Injection Point
-DSCR_Event=CDI Event
-DSCR_Observer=CDI Observer
-DSCR_Intercepted=CDI Intercepted Element
-
-Loaders/text/x-beans+xml/Factories/org-netbeans-modules-web-beans-BeansDataLoader.instance=Persistence Unit Files
+test-unit-sys-prop.java.awt.headless=true
+test.config.stable.includes=\
+**/*Test.class
+test.config.stableBTD.includes=\
+    **/xdm/model/*Test.class
diff --git a/enterprise/web.el/nbproject/project.xml b/enterprise/jakarta.web.beans/nbproject/project.xml
similarity index 74%
copy from enterprise/web.el/nbproject/project.xml
copy to enterprise/jakarta.web.beans/nbproject/project.xml
index 58e270eb7a..87cc689e83 100644
--- a/enterprise/web.el/nbproject/project.xml
+++ b/enterprise/jakarta.web.beans/nbproject/project.xml
@@ -23,172 +23,172 @@
     <type>org.netbeans.modules.apisupport.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
-            <code-name-base>org.netbeans.modules.web.el</code-name-base>
+            <code-name-base>org.netbeans.modules.jakarta.web.beans</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
+                    <code-name-base>org.netbeans.api.annotations.common</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.20</specification-version>
+                        <specification-version>1.17</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <code-name-base>org.netbeans.api.java.classpath</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.40</specification-version>
+                        <specification-version>1.20</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.progress.nb</code-name-base>
+                    <code-name-base>org.netbeans.api.web.webmodule</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.40</specification-version>
+                        <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.api.web.webmodule</code-name-base>
+                    <code-name-base>org.netbeans.libs.javacapi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.15</specification-version>
+                        <specification-version>0.5</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.elimpl</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <release-version>3</release-version>
+                        <specification-version>1.53</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.libs.javacapi</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>0.9</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.38</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.csl.api</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor.document</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>2.46</specification-version>
+                        <specification-version>1.3</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.csl.types</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.0</specification-version>
+                        <release-version>3</release-version>
+                        <specification-version>4.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>1.53</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>2.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor.completion</code-name-base>
+                    <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.15</specification-version>
+                        <specification-version>1.34</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor.indent</code-name-base>
+                    <code-name-base>org.netbeans.modules.j2ee.api.ejbmodule</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>2</release-version>
-                        <specification-version>1.13</specification-version>
+                        <specification-version>1.15</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor.lib</code-name-base>
+                    <code-name-base>org.netbeans.modules.j2ee.common</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>3</release-version>
-                        <specification-version>4.0</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.86</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor.lib2</code-name-base>
+                    <code-name-base>org.netbeans.modules.j2ee.core</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>2.0</specification-version>
+                        <release-version>0-1</release-version>
+                        <specification-version>1.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor.util</code-name-base>
+                    <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.30</specification-version>
+                        <release-version>0-1</release-version>
+                        <specification-version>1.7</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.el.lexer</code-name-base>
+                    <code-name-base>org.netbeans.modules.j2ee.metadata.model.support</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.5</specification-version>
+                        <specification-version>1.14</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.glassfish.javaee</code-name-base>
+                    <code-name-base>org.netbeans.modules.java.hints.legacy.spi</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
                     <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.1</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.j2ee.metadata</code-name-base>
+                    <code-name-base>org.netbeans.modules.java.lexer</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>0-1</release-version>
-                        <specification-version>1.7</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.11</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.java.platform</code-name-base>
+                    <code-name-base>org.netbeans.modules.java.project</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.32</specification-version>
+                        <specification-version>1.62</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.java.project</code-name-base>
+                    <code-name-base>org.netbeans.modules.java.source</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.62</specification-version>
+                        <specification-version>0.141</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -208,22 +208,29 @@
                         <specification-version>1.8</specification-version>
                     </run-dependency>
                 </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.javaee.injection</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.0</specification-version>
+                    </run-dependency>
+                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.lexer</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>1.31</specification-version>
+                        <specification-version>1.36</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
+                    <code-name-base>org.netbeans.modules.libs.corba.omgapi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.19</specification-version>
+                        <specification-version>1.0</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -236,96 +243,105 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.parsing.indexing</code-name-base>
+                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>9.0</specification-version>
+                        <release-version>1</release-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
+                    <code-name-base>org.netbeans.modules.projectuiapi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.27</specification-version>
+                        <specification-version>1.78</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.refactoring.api</code-name-base>
+                    <code-name-base>org.netbeans.modules.projectuiapi.base</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.23</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.78</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.refactoring.java</code-name-base>
+                    <code-name-base>org.netbeans.modules.xml.lexer</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.54</specification-version>
+                        <specification-version>1.30</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.servletjspapi</code-name-base>
+                    <code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>1</release-version>
-                        <specification-version>1.0.20</specification-version>
+                        <specification-version>1.1</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.web.beans</code-name-base>
+                    <code-name-base>org.netbeans.modules.xml.text</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>2</release-version>
-                        <specification-version>2.0</specification-version>
+                        <specification-version>1.60</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.web.common</code-name-base>
+                    <code-name-base>org.netbeans.modules.xml.xam</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>1.49</specification-version>
+                        <release-version>1</release-version>
+                        <specification-version>1.6</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.xml.xam</code-name-base>
+                    <code-name-base>org.netbeans.spi.editor.hints</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.11</specification-version>
+                        <release-version>0-1</release-version>
+                        <specification-version>1.15</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.filesystems</code-name-base>
+                    <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>9.0</specification-version>
+                        <specification-version>7.11</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.loaders</code-name-base>
+                    <code-name-base>org.openide.dialogs</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.61</specification-version>
+                        <specification-version>7.14</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.openide.modules</code-name-base>
+                    <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.11</specification-version>
+                        <specification-version>9.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.loaders</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.61</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -333,7 +349,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>7.23</specification-version>
+                        <specification-version>7.13</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -341,7 +357,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.23</specification-version>
+                        <specification-version>6.40</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -378,6 +394,7 @@
                 </dependency>
             </module-dependencies>
             <test-dependencies>
+                <!-- Dependencies for a source root with tests: -->
                 <test-type>
                     <name>unit</name>
                     <test-dependency>
@@ -386,49 +403,14 @@
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.csl.api</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.css.editor</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor.bracesmatching</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor.mimelookup</code-name-base>
-                        <compile-dependency/>
-                        <test/>
+                        <recursive/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.editor.mimelookup.impl</code-name-base>
-                        <test/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor.settings</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.editor.util</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.html</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.html.editor</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.html.lexer</code-name-base>
+                        <code-name-base>org.netbeans.modules.j2ee.dd</code-name-base>
+                        <recursive/>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
@@ -437,12 +419,8 @@
                         <test/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.lexer</code-name-base>
-                        <compile-dependency/>
-                        <test/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.lexer.nbbridge</code-name-base>
+                        <code-name-base>org.netbeans.modules.javahelp</code-name-base>
+                        <recursive/>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
@@ -455,43 +433,27 @@
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.parsing.nb</code-name-base>
-                        <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.netbeans.modules.projectapi.nb</code-name-base>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.common</code-name-base>
-                        <compile-dependency/>
+                        <code-name-base>org.netbeans.modules.projectui</code-name-base>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.jsf</code-name-base>
-                        <recursive/>
+                        <code-name-base>org.netbeans.modules.xml.retriever</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.jsf20</code-name-base>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.netbeans.modules.web.project</code-name-base>
-                        <recursive/>
+                        <code-name-base>org.netbeans.modules.xml.text</code-name-base>
                         <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
-                        <code-name-base>org.openide.loaders</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.nodes</code-name-base>
-                        <compile-dependency/>
-                    </test-dependency>
-                    <test-dependency>
-                        <code-name-base>org.openide.options</code-name-base>
-                        <compile-dependency/>
+                        <code-name-base>org.netbeans.modules.xml.xdm</code-name-base>
+                        <recursive/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.openide.text</code-name-base>
-                        <compile-dependency/>
                     </test-dependency>
                     <test-dependency>
                         <code-name-base>org.openide.util.ui</code-name-base>
@@ -506,13 +468,13 @@
                 </test-type>
             </test-dependencies>
             <friend-packages>
-                <friend>org.netbeans.modules.spring.webmvc</friend>
-                <friend>org.netbeans.modules.web.core.syntax</friend>
+                <friend>org.netbeans.modules.j2ee.ejbcore</friend>
+                <friend>org.netbeans.modules.web.el</friend>
                 <friend>org.netbeans.modules.web.jsf</friend>
                 <friend>org.netbeans.modules.web.jsf.editor</friend>
-                <friend>org.netbeans.modules.web.jsfapi</friend>
-                <package>org.netbeans.modules.web.el</package>
-                <package>org.netbeans.modules.web.el.spi</package>
+                <friend>org.netbeans.gradle.javaee.project</friend>
+                <package>org.netbeans.modules.jakarta.web.beans</package>
+                <package>org.netbeans.modules.jakarta.web.beans.api.model</package>
             </friend-packages>
         </data>
     </configuration>
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataLoader.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataLoader.java
new file mode 100644
index 0000000000..d415a39ddd
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataLoader.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+//package org.netbeans.modules.jakarta.web.beans;
+//
+//import java.io.IOException;
+//import org.openide.filesystems.FileObject;
+//import org.openide.loaders.DataLoader;
+//import org.openide.loaders.DataObject;
+//import org.openide.util.NbBundle;
+//
+///**
+// */
+//public class BeansDataLoader extends DataLoader {
+//
+//    public static final String REQUIRED_MIME = "text/x-beans-jakarta+xml";
+//
+//    public BeansDataLoader() {
+//        super(BeansDataObject.class.getName());
+//    }
+//
+//    @Override
+//    protected void initialize() {
+//        super.initialize();
+//    }
+//
+//    @Override
+//    protected String defaultDisplayName() {
+//        return NbBundle.getMessage(BeansDataLoader.class, "LBL_loaderName"); // NOI18N
+//    }
+//
+//    @Override
+//    protected String actionsContext() {
+//        return "Loaders/" + REQUIRED_MIME + "/Actions";
+//    }
+//
+//    @Override
+//    protected DataObject handleFindDataObject(FileObject fo, RecognizedFiles recognized) throws IOException {
+//        return new BeansDataObject(fo, this);
+//    }
+//}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataObject.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataObject.java
new file mode 100644
index 0000000000..995e71be9d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/BeansDataObject.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.io.IOException;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.MIMEResolver;
+import org.openide.loaders.DataObject;
+import org.openide.loaders.DataObjectExistsException;
+import org.openide.loaders.MultiDataObject;
+import org.openide.loaders.MultiFileLoader;
+import org.openide.util.Lookup;
+import org.openide.util.NbBundle.Messages;
+import org.openide.windows.TopComponent;
+
+@Messages({
+    "LBL_Beans_LOADER_JAKARTA=Files of Beans"
+})
+@MIMEResolver.NamespaceRegistration(
+        displayName = "#LBL_Beans_LOADER_JAKARTA",
+        mimeType = "text/x-beans-jakarta+xml",
+        elementNS = {"https://jakarta.ee/xml/ns/jakartaee"},
+        position = 819
+)
+@DataObject.Registration(
+        mimeType = "text/x-beans-jakarta+xml",
+        iconBase = "org/netbeans/modules/jakarta/web/beans/resources/delegate.png",
+        displayName = "#LBL_Beans_LOADER_JAKARTA"
+)
+@ActionReferences({
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.OpenAction"),
+            position = 100,
+            separatorAfter = 200
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "Edit", id = "org.openide.actions.CutAction"),
+            position = 300
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "Edit", id = "org.openide.actions.CopyAction"),
+            position = 400,
+            separatorAfter = 500
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "Edit", id = "org.openide.actions.DeleteAction"),
+            position = 600
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.RenameAction"),
+            position = 700,
+            separatorAfter = 800
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.SaveAsTemplateAction"),
+            position = 900,
+            separatorAfter = 1000
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.FileSystemAction"),
+            position = 1100,
+            separatorAfter = 1200
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.ToolsAction"),
+            position = 1300
+    ),
+    @ActionReference(
+            path = "Loaders/text/x-beans-jakarta+xml/Actions",
+            id = @ActionID(category = "System", id = "org.openide.actions.PropertiesAction"),
+            position = 1400
+    )
+})
+public class BeansDataObject extends MultiDataObject {
+
+    public BeansDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException {
+        super(pf, loader);
+        registerEditor("text/x-beans-jakarta+xml", false);
+    }
+
+    @Override
+    protected int associateLookup() {
+        return 1;
+    }
+
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/Bundle.properties
similarity index 54%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/Bundle.properties
index cee8b660a7..19b03cffa4 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/Bundle.properties
@@ -14,20 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Contexts and Dependency Injection Support
 
-Templates/CDI=Contexts and Dependency Injection
-Templates/CDI/beans.xml=beans.xml (CDI Configuration File)
-Templates/CDI/Interceptor.java=Interceptor Binding Type
-Templates/CDI/Qualifier.java=Qualifier Type
-Templates/CDI/Scope.java=Scope Type
-Templates/CDI/Stereotype.java=Stereotype
-
-DSCR_InjectionPoint=CDI Injection Point
-DSCR_Decorated=CDI Decorated Bean
-DSCR_Delegate=CDI Delegate Injection Point
-DSCR_Event=CDI Event
-DSCR_Observer=CDI Observer
-DSCR_Intercepted=CDI Intercepted Element
-
-Loaders/text/x-beans+xml/Factories/org-netbeans-modules-web-beans-BeansDataLoader.instance=Persistence Unit Files
+USG_CDI_BEANS_OPENED_PROJECT=Opened Project "{0}" with existing beans.xml file. 
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CarCdiUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CarCdiUtil.java
new file mode 100644
index 0000000000..2195f29d34
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CarCdiUtil.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.j2ee.api.ejbjar.Car;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.netbeans.spi.project.ui.ProjectOpenedHook;
+import org.openide.filesystems.FileObject;
+
+
+/**
+ * @author ads
+ *
+ */
+@ProjectServiceProvider(service=CdiUtil.class, projectType = {
+    "org-netbeans-modules-j2ee-clientproject","org-netbeans-modules-maven/app-client"})
+public class CarCdiUtil extends CdiUtil {
+
+    public CarCdiUtil( Project project ) {
+        super(project);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.CdiUtil#getBeansTargetFolder(boolean)
+     */
+    @Override
+    public Collection<FileObject> getBeansTargetFolder( boolean create ) {
+        Project project = getProject();
+        if ( project == null ){
+            return Collections.emptyList();
+        }
+        Car cars[] = Car.getCars(project);
+        if (cars.length > 0) {
+            return Collections.singleton(cars[0].getMetaInf());
+        } 
+        return super.getBeansTargetFolder(create);
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiProjectOpenHook.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiProjectOpenHook.java
new file mode 100644
index 0000000000..873f6b89d0
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiProjectOpenHook.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.lang.ref.WeakReference;
+
+import org.netbeans.api.project.Project;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.netbeans.spi.project.ui.ProjectOpenedHook;
+
+
+/**
+ * @author ads
+ *
+ */
+@ProjectServiceProvider(service={ProjectOpenedHook.class}, projectType = {
+    "org-netbeans-modules-java-j2seproject",
+    "org-netbeans-modules-j2ee-clientproject",
+    "org-netbeans-modules-j2ee-ejbjarproject",
+    "org-netbeans-modules-web-project",
+    "org-netbeans-modules-maven/jar",
+    "org-netbeans-modules-maven/war",
+    "org-netbeans-modules-maven/ejb",
+    "org-netbeans-modules-maven/app-client"}
+    )
+public class CdiProjectOpenHook extends ProjectOpenedHook {
+    
+    public CdiProjectOpenHook(Project project){
+        myProject = new WeakReference<Project>( project );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.project.ui.ProjectOpenedHook#projectClosed()
+     */
+    @Override
+    protected void projectClosed() {
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.project.ui.ProjectOpenedHook#projectOpened()
+     */
+    @Override
+    protected void projectOpened() {
+        Project project = myProject.get();
+        if ( project == null ){
+            return;
+        }
+        CdiUtil util = project.getLookup().lookup(CdiUtil.class);
+        if ( util!= null && util.isCdiEnabled() ){
+            util.log("USG_CDI_BEANS_OPENED_PROJECT", CdiProjectOpenHook.class, 
+                    new Object[]{project.getClass().getName()});  // NOI18N
+        }
+    }
+    
+    private WeakReference<Project> myProject;
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiUtil.java
new file mode 100644
index 0000000000..e71c949e1c
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/CdiUtil.java
@@ -0,0 +1,330 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import java.util.logging.Logger;
+import org.netbeans.api.annotations.common.CheckForNull;
+import org.netbeans.api.j2ee.core.Profile;
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.project.JavaProjectConstants;
+
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.ProjectUtils;
+import org.netbeans.api.project.SourceGroup;
+import org.netbeans.api.project.SourceGroupModifier;
+import org.netbeans.api.project.Sources;
+import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
+import org.netbeans.modules.j2ee.common.dd.DDHelper;
+import org.netbeans.modules.jakarta.web.beans.xml.BeansAttributes;
+import org.netbeans.modules.jakarta.web.beans.xml.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.xml.WebBeansModelFactory;
+import org.netbeans.modules.xml.retriever.catalog.Utilities;
+import org.netbeans.modules.xml.xam.ModelSource;
+import org.netbeans.modules.xml.xam.locator.CatalogModelException;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.util.Exceptions;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ * beware, non-static methods may behave differently in different projects(by type) if provider is overrided and registred to appropriate project type
+ * known subclasses #WebCdiUtil
+ */
+@ProjectServiceProvider(service=CdiUtil.class, projectType = {
+    "org-netbeans-modules-java-j2seproject", "org-netbeans-modules-maven/jar"})
+public class CdiUtil {
+
+    private static final Logger LOG = Logger.getLogger("org.netbeans.ui.metrics.cdi");   // NOI18N
+    
+    public static final String BEANS = "beans";                          // NOI18N
+    public static final String BEANS_XML = BEANS+".xml";                 // NOI18N
+    private static final String META_INF = "META-INF";                   // NOI18N
+    public static final String WEB_INF = "WEB-INF";                      // NOI18N
+    
+    public CdiUtil(Project project){
+        myProject = new WeakReference<>( project );
+        myMessages = new CopyOnWriteArraySet<>();
+    }
+    
+    public void log(String message , Class<?> clazz, Object[] params){
+        log(message, clazz, params , false );
+    }
+    
+    
+    public void log(String message , Class<?> clazz, Object[] params, boolean once){
+        if (!once) {
+            if (myMessages.contains(message)) {
+                return;
+            }
+            else {
+                myMessages.add(message);
+            }
+        }
+        
+        LogRecord logRecord = new LogRecord(Level.INFO, message);
+        logRecord.setLoggerName(LOG.getName());
+        logRecord.setResourceBundle(NbBundle.getBundle(clazz));
+        logRecord.setResourceBundleName(clazz.getPackage().getName() + ".Bundle"); // NOI18N
+        if (params != null) {
+            logRecord.setParameters(params);
+        }
+        LOG.log(logRecord);
+    }
+    
+    /**
+     * check if cdi is enabled in supplied project, general implementation
+     * @param project
+     * @return 
+     */
+    public static boolean isCdiEnabled(Project project){
+        return (getBeansXmlExists(project)!=null) || isCdi11OrLater(project);
+    }
+    
+    private static FileObject getBeansXmlExists(Project project){
+        Collection<FileObject> beansTargetFolder = getBeansTargetFolder(project, false);
+        for (FileObject fileObject : beansTargetFolder) {
+            if ( fileObject != null && fileObject.getFileObject(BEANS_XML)!=null){
+                return fileObject.getFileObject(BEANS_XML);
+            }
+        }
+        return null;
+    }
+    
+    private  FileObject getBeansXmlExists(){
+        Collection<FileObject> beansTargetFolder = getBeansTargetFolder(false);
+        for (FileObject fileObject : beansTargetFolder) {
+            if ( fileObject != null && fileObject.getFileObject(BEANS_XML)!=null){
+                return fileObject.getFileObject(BEANS_XML);
+            }
+        }
+        return null;
+    }
+    
+    /**
+     *  check if cdi is enabled in the project where CdiUtil is registered as a service
+     * @return ch
+     */
+    public boolean isCdiEnabled(){
+        Project project = getProject();
+        if ( project == null ){
+            return false;
+        }
+        Collection<FileObject> beansTargetFolder = getBeansTargetFolder(false);
+        for (FileObject fileObject : beansTargetFolder) {
+            if ( fileObject != null && fileObject.getFileObject(BEANS_XML)!=null){
+                return true;
+            }
+        }
+        // #229078 - since CDI 1.1 beans.xml is optional in case of 'implicit bean archive'
+        if (isCdi11OrLater()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Avoid static methods usage as much as possible, use isCdi11OrLater() instead
+     * @param p
+     * @return 
+     */
+    public static boolean isCdi11OrLater(Project p) {
+        if(! hasResource(p, "javax/enterprise/inject/spi/AfterTypeDiscovery.class") ) {
+            return false;
+        } else {
+            FileObject beans = getBeansXmlExists(p);
+            if(beans == null) {
+                return true;//no beans.xml and ee7 environment, default cdi 1.1 behavior
+            }
+            WebBeansModel model = WebBeansModelFactory.getInstance().getModel(getModelSource(beans, true));
+            if (model == null) {
+                return false;//???
+            }
+
+            String attribute = model.getRootComponent().getAttribute(BeansAttributes.VERSION);
+            if(attribute == null || attribute.equals("1.0")) {
+                return false;//no version attribute in cdi1.0 or equal to "1.0" in cdi 1.1.
+            }
+            return true;
+        }
+    }
+    
+    public boolean isCdi11OrLater() {
+        if(! hasResource(getProject(), "javax/enterprise/inject/spi/AfterTypeDiscovery.class") ) {
+            return false;
+        } else {
+            FileObject beans = getBeansXmlExists();
+            if(beans == null) {
+                return true;//no beans.xml and ee7 environment, default cdi 1.1 behavior
+            }
+            WebBeansModel model = WebBeansModelFactory.getInstance().getModel(getModelSource(beans, true));
+            if (model == null || model.getRootComponent() == null) {
+                return false;//empty? as in cdi1.0
+            }
+
+            String attribute = model.getRootComponent().getAttribute(BeansAttributes.XMLNS);
+            String version = model.getRootComponent().getAttribute(BeansAttributes.VERSION);
+            if(attribute != null && attribute.startsWith("http://java")) {//NOI18N
+                return false;//only cdi1.0 use java.sun.com namespace, also default for future usage is cdi 1.1 (in case of corrupted beans without namespace)
+            } else if ("1.0".equals(version)){//NOI18N
+                return false;//we can fall back with version attribute if exists.
+            }
+            return true;
+        }
+    }
+    
+    private static ModelSource getModelSource( FileObject fileObject , 
+            boolean isEditable )
+    {
+        try {
+            return Utilities.createModelSource( fileObject,isEditable);
+        } catch (CatalogModelException ex) {
+            Logger.getLogger("global").log(java.util.logging.Level.SEVERE,
+                ex.getMessage(), ex);   // NOI18N
+        }
+        return null;
+    }
+    
+    private static boolean hasResource(Project project, String resource) {
+        SourceGroup[] sgs = ProjectUtils.getSources(project).getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
+        if (sgs.length < 1) {
+            return false;
+        }
+        FileObject sourceRoot = sgs[0].getRootFolder();
+        ClassPath classPath = ClassPath.getClassPath(sourceRoot, ClassPath.COMPILE);
+        if (classPath == null) {
+            return false;
+        }
+        FileObject resourceFile = classPath.findResource(resource);
+        if (resourceFile != null) {
+            return true;
+        }
+        return false;
+    }
+
+    public Collection<FileObject> getBeansTargetFolder(boolean create) 
+    {
+        Project project = getProject();
+        if ( project == null ){
+            return Collections.emptyList();
+        }
+        return getBeansTargetFolder(project, create);
+    }
+    
+    protected Project getProject(){
+        return myProject.get();
+    }
+    
+    /**
+     * Enables CDI in the project and returns reference to the created beans.xml file if any.
+     * @return reference to beans.xml if was created, {@code null} otherwise
+     * @since 2.3
+     */
+    @CheckForNull
+    public FileObject enableCdi() {
+        Collection<FileObject> infs = getBeansTargetFolder(true);
+        for (FileObject inf : infs) {
+            if (inf != null) {
+                FileObject beansXml = inf.getFileObject(CdiUtil.BEANS_XML);
+                if (beansXml != null) {
+                    return null;
+                }
+                try {
+                    EjbJar ejbJar = EjbJar.getEjbJar(myProject.get().getProjectDirectory());
+                    Profile profile = ejbJar != null ? ejbJar.getJ2eeProfile() : Profile.JAVA_EE_6_WEB;
+                    LOG.log(Level.INFO, "Creating beans.xml file for project: {0}", myProject.get().getProjectDirectory());
+                    return DDHelper.createBeansXml(profile, inf, CdiUtil.BEANS);
+                } catch (IOException exception) {
+                    Exceptions.printStackTrace(exception);
+                }
+                return null;
+            }
+        }
+        return null;
+    }
+    
+    public static Collection<FileObject> getBeansTargetFolder(Project project, 
+            boolean create) 
+    {
+        Sources sources = ProjectUtils.getSources(project);
+        Collection<FileObject> result = new ArrayList<>(2);
+        SourceGroup[] sourceGroups = sources.getSourceGroups(
+                    JavaProjectConstants.SOURCES_TYPE_RESOURCES );
+        if (sourceGroups != null && sourceGroups.length > 0) {
+            FileObject fileObject = getDefaultBeansTargetFolder(sourceGroups, false);
+            if (fileObject != null) {
+                result.add(fileObject);
+            }
+        }
+        else {
+            sourceGroups = sources.getSourceGroups(
+                    JavaProjectConstants.SOURCES_TYPE_JAVA);
+            FileObject fileObject = getDefaultBeansTargetFolder(sourceGroups, false);
+            if ( fileObject != null ){
+                result.add(fileObject);
+            }
+        }
+        if ( result.isEmpty() && create ){
+            SourceGroup resourcesSourceGroup = SourceGroupModifier.createSourceGroup(
+                    project, JavaProjectConstants.SOURCES_TYPE_RESOURCES, 
+                    JavaProjectConstants.SOURCES_HINT_MAIN);
+            if ( resourcesSourceGroup != null ){
+                sourceGroups = new SourceGroup[]{resourcesSourceGroup};
+            }
+            FileObject fileObject = getDefaultBeansTargetFolder(sourceGroups, true);
+            result.add(fileObject);
+        }
+        return result;
+    }
+    
+    private static FileObject getDefaultBeansTargetFolder( SourceGroup[] sourceGroups,
+            boolean create )
+    {
+        if ( sourceGroups.length >0 ){
+            FileObject metaInf = sourceGroups[0].getRootFolder().getFileObject( META_INF );
+            if ( metaInf == null && create ){
+                try {
+                    metaInf = FileUtil.createFolder(
+                        sourceGroups[0].getRootFolder(), META_INF);
+                }
+                catch( IOException e ){
+                    Logger.getLogger( CdiUtil.class.getName() ).log( 
+                            Level.WARNING, null, e );
+                }
+            }
+            return metaInf;
+        }
+        return null;
+    }
+    
+    private WeakReference<Project> myProject;
+    private Set<String> myMessages;
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/EjbCdiUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/EjbCdiUtil.java
new file mode 100644
index 0000000000..1c5fe1ba29
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/EjbCdiUtil.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.j2ee.api.ejbjar.EjbJar;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.netbeans.spi.project.ui.ProjectOpenedHook;
+import org.openide.filesystems.FileObject;
+
+
+
+/**
+ * @author ads
+ *
+ */
+@ProjectServiceProvider(service=CdiUtil.class, projectType = {
+    "org-netbeans-modules-j2ee-ejbjarproject", "org-netbeans-modules-maven/ejb"})
+public class EjbCdiUtil extends CdiUtil {
+
+    public EjbCdiUtil( Project project ) {
+        super(project);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.CdiUtil#getBeansTargetFolder(boolean)
+     */
+    @Override
+    public Collection<FileObject> getBeansTargetFolder(boolean create) 
+    {
+        Project project = getProject();
+        if ( project == null ){
+            return Collections.emptyList();
+        }
+        EjbJar ejbs[] = EjbJar.getEjbJars(project);
+        if (ejbs.length > 0) {
+            return Collections.singleton(ejbs[0].getMetaInf());
+        }
+        return super.getBeansTargetFolder(create);
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/MetaModelSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/MetaModelSupport.java
new file mode 100644
index 0000000000..8f70d51370
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/MetaModelSupport.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.WeakHashMap;
+
+import org.netbeans.api.java.classpath.ClassPath;
+import org.netbeans.api.java.project.JavaProjectConstants;
+import org.netbeans.api.project.Project;
+import org.netbeans.api.project.SourceGroup;
+import org.netbeans.api.project.Sources;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
+import org.netbeans.modules.web.api.webmodule.WebProjectConstants;
+import org.netbeans.modules.jakarta.web.beans.api.model.ModelUnit;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModelFactory;
+
+import org.netbeans.spi.java.classpath.ClassPathProvider;
+import org.netbeans.spi.java.classpath.support.ClassPathSupport;
+import org.openide.filesystems.FileObject;
+
+/**
+ * @author ads
+ *
+ */
+public class MetaModelSupport {
+
+    public MetaModelSupport( Project project ){
+        myProject = project;
+    }
+    
+    public MetadataModel<WebBeansModel> getMetaModel(){
+        synchronized (MODELS) {
+            MetadataModel<WebBeansModel> metadataModel = MODELS.get( myProject );
+            if ( metadataModel != null ){
+                return metadataModel;
+            }
+            ClassPath boot = getClassPath(  ClassPath.BOOT);
+            ClassPath compile = getClassPath( ClassPath.COMPILE );
+            ClassPath src = getClassPath( ClassPath.SOURCE);
+            if ( boot == null || compile == null || src == null ){
+                return null;
+            }
+            ModelUnit modelUnit = ModelUnit.create( boot, compile , src, myProject);
+            metadataModel = WebBeansModelFactory.getMetaModel( modelUnit );
+            MODELS.put( myProject, metadataModel );
+            return metadataModel;
+        }
+    }
+    
+    public ClassPath getClassPath( String type ) {
+        ClassPathProvider provider = getProject().getLookup().lookup( 
+                ClassPathProvider.class);
+        if ( provider == null ){
+            return null;
+        }
+        Sources sources = getProject().getLookup().lookup(Sources.class);
+        if ( sources == null ){
+            return null;
+        }
+        SourceGroup[] sourceGroups = sources.getSourceGroups( 
+                JavaProjectConstants.SOURCES_TYPE_JAVA );
+        SourceGroup[] webGroup = sources.getSourceGroups(
+                WebProjectConstants.TYPE_WEB_INF);
+        ClassPath[] paths = new ClassPath[ sourceGroups.length+webGroup.length];
+        int i=0;
+        for (SourceGroup sourceGroup : sourceGroups) {
+            FileObject rootFolder = sourceGroup.getRootFolder();
+            paths[ i ] = provider.findClassPath( rootFolder, type);
+            i++;
+        }
+        for (SourceGroup sourceGroup : webGroup) {
+            FileObject rootFolder = sourceGroup.getRootFolder();
+            paths[ i ] = provider.findClassPath( rootFolder, type);
+            i++;
+        }
+        return ClassPathSupport.createProxyClassPath( paths );
+    }
+    
+    private Project getProject(){
+        return myProject;
+    }
+    
+    private Project myProject; 
+    
+    private static WeakHashMap<Project, MetadataModel<WebBeansModel>>
+        MODELS = new WeakHashMap<Project, MetadataModel<WebBeansModel>>();
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebBeanInjectionTargetQueryImplementation.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebBeanInjectionTargetQueryImplementation.java
new file mode 100644
index 0000000000..761f3b6a66
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebBeanInjectionTargetQueryImplementation.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+import org.openide.util.Parameters;
+
+
+/**
+ * @author ads
+ *
+ */
+@org.openide.util.lookup.ServiceProvider(service=org.netbeans.modules.javaee.injection.spi.InjectionTargetQueryImplementation.class)
+public class WebBeanInjectionTargetQueryImplementation implements 
+    InjectionTargetQueryImplementation
+{
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation#isInjectionTarget(org.netbeans.modules.j2ee.common.queries.spi.CompilationController, javax.lang.model.element.TypeElement)
+     */
+    @Override
+    public boolean isInjectionTarget( CompilationController controller,
+            TypeElement typeElement )
+    {
+        try {
+            Parameters.notNull("controller", controller);
+            Parameters.notNull("typeElement", typeElement);
+            
+            Project project = FileOwnerQuery.getOwner( controller.getFileObject() );
+            if ( project == null ){
+                return false;
+            }
+            MetaModelSupport support = new MetaModelSupport(project);
+            MetadataModel<WebBeansModel> metaModel = support.getMetaModel();
+            final ElementHandle<TypeElement> handle = ElementHandle.create(typeElement);
+            return metaModel.runReadAction(new MetadataModelAction<WebBeansModel, Boolean>() {
+
+                    @Override
+                    public Boolean run( WebBeansModel model ) throws Exception {
+                        TypeElement element = handle.resolve(model.getCompilationController());
+                        if ( element == null ){
+                            return false;
+                        }
+                        List<AnnotationMirror> qualifiers = model.getQualifiers(
+                                element, true);
+                        if ( qualifiers.size() == 0 ){
+                            /* 
+                             * @Named is special case.
+                             * It could be present implicitly : there are 
+                             * stereotype declared for the element which 
+                             * is annotated by @Named.  
+                             */
+                            if ( model.getName( element ) != null ){
+                                return true;
+                            }
+                            return false;
+                        }
+                        else {
+                            /*
+                             *  There are some qualifiers. 
+                             *  So this bean is eligible for injection. But it
+                             *  doesn't mean it is really managed by J2EE container.
+                             */
+                            return true;
+                        }
+                    }
+                });
+        } catch (MetadataModelException ex) {
+            Logger.getLogger( WebBeanInjectionTargetQueryImplementation.class.getName()).
+                log( Level.WARNING, ex.getMessage(), ex);
+        } catch (IOException ex) {
+            Logger.getLogger( WebBeanInjectionTargetQueryImplementation.class.getName()).
+                log( Level.WARNING, ex.getMessage(), ex);
+        }
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.j2ee.common.queries.spi.InjectionTargetQueryImplementation#isStaticReferenceRequired(org.netbeans.modules.j2ee.common.queries.spi.CompilationController, javax.lang.model.element.TypeElement)
+     */
+    @Override
+    public boolean isStaticReferenceRequired( CompilationController controller,
+            TypeElement typeElement )
+    {
+        return false;
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebCdiUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebCdiUtil.java
new file mode 100644
index 0000000000..33607ae0a7
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/WebCdiUtil.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.web.api.webmodule.WebModule;
+import org.netbeans.spi.project.ProjectServiceProvider;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+
+
+/**
+ * @author ads
+ *
+ */
+@ProjectServiceProvider(service={CdiUtil.class}, projectType = {
+    "org-netbeans-modules-web-project", "org-netbeans-modules-maven/war"})
+public class WebCdiUtil extends CdiUtil {
+    
+    public WebCdiUtil( Project project ) {
+        super(project);
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.CdiUtil#getBeansTargetFolder(boolean)
+     */
+    @Override
+    public Collection<FileObject> getBeansTargetFolder( boolean create ) {
+        Project project = getProject();
+        if ( project == null ){
+            return Collections.emptyList();
+        }
+        WebModule wm = WebModule.getWebModule(project.getProjectDirectory());
+        if (wm != null && wm.getDocumentBase() != null) {
+            FileObject webInf = wm.getWebInf();
+            if (webInf == null && create ) {
+                try {
+                    webInf = FileUtil.createFolder(wm.getDocumentBase(), WEB_INF); 
+                } catch (IOException ex) {
+                    Logger.getLogger( WebCdiUtil.class.getName() ).log( 
+                            Level.WARNING, null, ex );
+                }
+            }
+            return Collections.singleton(webInf);
+        } 
+        return super.getBeansTargetFolder(create);
+    }
+    
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/Bundle.properties
similarity index 54%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/Bundle.properties
index cee8b660a7..034e41231a 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/Bundle.properties
@@ -14,20 +14,18 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Contexts and Dependency Injection Support
 
-Templates/CDI=Contexts and Dependency Injection
-Templates/CDI/beans.xml=beans.xml (CDI Configuration File)
-Templates/CDI/Interceptor.java=Interceptor Binding Type
-Templates/CDI/Qualifier.java=Qualifier Type
-Templates/CDI/Scope.java=Scope Type
-Templates/CDI/Stereotype.java=Stereotype
+LBL_GenerateInterceptor=Generate Interceptor...
+LBL_InterceptorName=Choose &Interceptor Name:
+ACSN_InterceptorName=Interceptor name chooser
+ACSD_InterceptorName=Enter interceptor name
 
-DSCR_InjectionPoint=CDI Injection Point
-DSCR_Decorated=CDI Decorated Bean
-DSCR_Delegate=CDI Delegate Injection Point
-DSCR_Event=CDI Event
-DSCR_Observer=CDI Observer
-DSCR_Intercepted=CDI Intercepted Element
+TITLE_Interceptor=Create Interceptor For "{0}" Interceptor Binding
+LBL_InvalidInterceptorName="{0}" is not valid Java type name.
+LBL_FileExists=File "{0}" already exists.
 
-Loaders/text/x-beans+xml/Factories/org-netbeans-modules-web-beans-BeansDataLoader.instance=Persistence Unit Files
+LBL_OK=&OK
+LBL_Cancel=&Cancel
+
+USG_CDI_GENERATE_INTERCEPTOR=Generated interceptor via editor "Insert Code..." \
+context popup menu action for project "{0}". 
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorFactory.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorFactory.java
new file mode 100644
index 0000000000..101acea9d1
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorFactory.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.actions;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.swing.text.JTextComponent;
+
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.api.java.source.JavaSource;
+import org.netbeans.spi.editor.codegen.CodeGenerator;
+import org.netbeans.spi.editor.codegen.CodeGenerator.Factory;
+import org.openide.util.Lookup;
+
+import com.sun.source.util.TreePath;
+
+
+/**
+ * @author ads
+ *
+ */
+public class InterceptorFactory implements Factory {
+
+    static final String INTERCEPTOR_BINDING = "InterceptorBinding";         // NOI18N
+
+    private static final String INTERCEPTOR_BINDING_FQN =
+            "jakarta.interceptor." +INTERCEPTOR_BINDING;                      // NOI18N
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.editor.codegen.CodeGenerator.Factory#create(org.openide.util.Lookup)
+     */
+    @Override
+    public List<? extends CodeGenerator> create( Lookup lookup ) {
+        CompilationController controller = lookup.lookup(CompilationController.class);
+        JTextComponent component = lookup.lookup(JTextComponent.class);
+        List<CodeGenerator> result = new ArrayList<CodeGenerator>(1);
+        if (component != null && controller != null) {
+            try {
+                controller.toPhase(JavaSource.Phase.ELEMENTS_RESOLVED);
+
+                TypeElement interceptorBinding = controller.getElements().
+                    getTypeElement( INTERCEPTOR_BINDING_FQN );
+                if ( interceptorBinding == null ){
+                    return result;
+                }
+                int dot = component.getCaret().getDot();
+                TreePath tp = controller.getTreeUtilities().pathFor(dot);
+                if ( tp == null ){
+                    return result;
+                }
+                Element contextElement = controller.getTrees().getElement(tp );
+                if ( contextElement == null ||
+                        contextElement.getKind() != ElementKind.ANNOTATION_TYPE )
+                {
+                    return result;
+                }
+
+                List<? extends AnnotationMirror> annotations = controller.
+                    getElements().getAllAnnotationMirrors( contextElement );
+                boolean isInterceptorBinding = false;
+                for (AnnotationMirror annotation : annotations) {
+                    Element annotationElement = controller.getTypes().asElement(
+                            annotation.getAnnotationType());
+                    if ( interceptorBinding.equals( annotationElement) ){
+                        isInterceptorBinding = true;
+                        break;
+                    }
+                }
+                if ( isInterceptorBinding ){
+                    result.add( new InterceptorGenerator(
+                            contextElement.getSimpleName().toString(),
+                            controller.getFileObject()) );
+                }
+            } catch (IOException ex) {
+                Logger.getLogger( InterceptorFactory.class.getName()).log(
+                        Level.INFO, null, ex );
+            }
+        }
+        return result;
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorGenerator.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorGenerator.java
new file mode 100644
index 0000000000..7539108adc
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorGenerator.java
@@ -0,0 +1,264 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.actions;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.swing.JButton;
+
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.java.source.ui.ElementOpen;
+import org.netbeans.api.java.source.JavaSource;
+import org.netbeans.api.java.source.ModificationResult;
+import org.netbeans.api.java.source.CancellableTask;
+import org.netbeans.api.java.source.Task;
+import org.netbeans.api.java.source.TreeMaker;
+import org.netbeans.api.java.source.TreeUtilities;
+import org.netbeans.api.java.source.WorkingCopy;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.jakarta.web.beans.CdiUtil;
+import org.netbeans.spi.editor.codegen.CodeGenerator;
+import org.openide.DialogDescriptor;
+import org.openide.DialogDisplayer;
+import org.openide.awt.Mnemonics;
+import org.openide.filesystems.FileObject;
+import org.openide.filesystems.FileUtil;
+import org.openide.loaders.DataFolder;
+import org.openide.loaders.DataObject;
+import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle;
+
+import com.sun.source.tree.AnnotationTree;
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.tree.ExpressionTree;
+import com.sun.source.tree.ModifiersTree;
+import com.sun.source.tree.Tree;
+
+
+/**
+ * @author ads
+ *
+ */
+class InterceptorGenerator implements CodeGenerator {
+    
+    private static final Logger LOG = Logger.getLogger( 
+            InterceptorGenerator.class.getName() );
+    
+    private static final String INTERCEPTOR = "javax.interceptor.Interceptor";  // NOI18N
+
+    InterceptorGenerator( String bindingName, FileObject bindingFileObject ) {
+        myBindingName = bindingName;
+        myBindingFileObject = bindingFileObject;
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.editor.codegen.CodeGenerator#getDisplayName()
+     */
+    @Override
+    public String getDisplayName() {
+        return NbBundle.getMessage( InterceptorGenerator.class, 
+                "LBL_GenerateInterceptor");             // NOI18N
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.editor.codegen.CodeGenerator#invoke()
+     */
+    @Override
+    public void invoke() {
+        JButton ok = new JButton();
+        Mnemonics.setLocalizedText(ok, NbBundle.getMessage(InterceptorGenerator.class, 
+            "LBL_OK") );                                    // NOI18N
+        JButton cancel = new JButton();
+        Mnemonics.setLocalizedText(cancel, NbBundle.getMessage(InterceptorGenerator.class, 
+            "LBL_Cancel"));                                 // NOI18N
+        
+        InterceptorPanel panel = new InterceptorPanel( ok , myBindingName, 
+                myBindingFileObject);
+        
+        DialogDescriptor descriptor = new DialogDescriptor( panel, 
+                NbBundle.getMessage(InterceptorGenerator.class, "TITLE_Interceptor",// NOI18N
+                        myBindingName ),
+                true, new Object[]{ ok, cancel },
+                null, DialogDescriptor.DEFAULT_ALIGN, 
+                new HelpCtx(InterceptorGenerator.class),
+                null);
+        descriptor.setClosingOptions( new Object[] { ok , cancel });
+        Object closedOption = DialogDisplayer.getDefault().notify( descriptor );
+        FileObject targetFolder = myBindingFileObject.getParent();
+        if ( closedOption == ok && targetFolder != null ){
+            createInterceptor(panel, targetFolder);
+        }
+    }
+
+    private void createInterceptor( InterceptorPanel panel,
+            FileObject targetFolder )
+    {
+        FileObject templateFileObject = FileUtil.getConfigFile(
+                "Templates/Classes/Class.java");                    // NOI18N
+        try {
+            DataObject templateDataObject = DataObject
+                    .find(templateFileObject);
+            DataFolder dataFolder = DataFolder.findFolder(targetFolder);
+            DataObject createdDataObject = templateDataObject.createFromTemplate(
+                    dataFolder,panel.getInterceptorName(),
+                    Collections.<String, Object> emptyMap());
+            modifyClass( createdDataObject.getPrimaryFile() , 
+                    getType(myBindingFileObject, ElementKind.ANNOTATION_TYPE));
+            
+            Project project = FileOwnerQuery.getOwner(myBindingFileObject);
+            if ( project != null ){
+                CdiUtil logger = project.getLookup().lookup(CdiUtil.class);
+                if ( logger != null ){
+                    logger.log("USG_CDI_GENERATE_INTERCEPTOR",      // NOI18N
+                            InterceptorGenerator.class, 
+                            new Object[]{project.getClass().getName()});
+                }
+            }
+        }
+        catch (IOException e) {
+            LOG.log(Level.WARNING , null , e );
+        }
+    }
+    
+    private ElementHandle<TypeElement> getType( FileObject fileObject , 
+            final ElementKind kind ) throws IOException
+    {
+        JavaSource javaSource = JavaSource.forFileObject(fileObject);
+        final List<ElementHandle<TypeElement>> result = 
+            new ArrayList<ElementHandle<TypeElement>>(1);
+        javaSource.runUserActionTask( new Task<CompilationController>() {
+            
+            @Override
+            public void run( CompilationController controller ) throws Exception {
+                controller.toPhase(JavaSource.Phase.RESOLVED);
+                
+                String typeName = controller.getFileObject().getName();
+                List<? extends TypeElement> topLevelElements = 
+                    controller.getTopLevelElements();
+                for (TypeElement typeElement : topLevelElements) {
+                    if ( kind == typeElement.getKind() && typeName.contentEquals(
+                            typeElement.getSimpleName()))
+                    {
+                        result.add(ElementHandle.create( typeElement));
+                        return;
+                    }
+                }
+            }
+        },true);
+        return result.get(0);
+    }
+
+    private void modifyClass( FileObject fileObject , 
+            final ElementHandle<TypeElement> handle ) 
+    {
+        JavaSource javaSource = JavaSource.forFileObject(fileObject);
+        try {
+            ModificationResult result = javaSource.runModificationTask(
+                    new CancellableTask<WorkingCopy>() {
+
+                @Override
+                public void run(WorkingCopy copy) throws IOException {
+                    copy.toPhase(JavaSource.Phase.RESOLVED);
+                    
+                    TreeMaker maker = copy.getTreeMaker();
+                    ClassTree tree = getTopLevelClassTree(copy);
+                    if ( tree ==null ){
+                        return;
+                    }
+                    Element element = copy.getTrees().getElement( 
+                            copy.getTrees().getPath(copy.getCompilationUnit(), tree) );
+
+                    ModifiersTree modifiers = tree.getModifiers();
+
+                    modifiers = addAnnotation(INTERCEPTOR, maker, modifiers);
+                    TypeElement annotation = handle.resolve( copy );
+                    if ( annotation != null ){
+                        modifiers = addAnnotation(annotation.getQualifiedName().toString(), 
+                            maker, modifiers);
+                    }
+                    
+                    copy.rewrite(tree.getModifiers(), modifiers);
+                    
+                    ElementOpen.open(copy.getClasspathInfo(), element);
+                }
+
+                private ModifiersTree addAnnotation( String annotationFqn , 
+                        TreeMaker maker,ModifiersTree modifiers )
+                {
+                    AnnotationTree newAnnotation = maker.Annotation(
+                            maker.QualIdent(annotationFqn) , 
+                            Collections.<ExpressionTree>emptyList());
+
+                    if (modifiers != null) {
+                        modifiers = maker.addModifiersAnnotation(modifiers,
+                                newAnnotation);
+                    }
+                    return modifiers;
+                }
+
+                @Override
+                public void cancel() {
+                }
+            });
+            result.commit();
+        }
+        catch (IOException e) {
+            LOG.log(Level.WARNING , null , e );
+        }
+        
+    }
+    
+    public static ClassTree getTopLevelClassTree(CompilationController controller) {
+        String className = controller.getFileObject().getName();
+
+        CompilationUnitTree cu = controller.getCompilationUnit();
+        if (cu != null) {
+            List<? extends Tree> decls = cu.getTypeDecls();
+            for (Tree decl : decls) {
+                if (!TreeUtilities.CLASS_TREE_KINDS.contains(decl.getKind())) {
+                    continue;
+                }
+
+                ClassTree classTree = (ClassTree) decl;
+
+                if (classTree.getSimpleName().contentEquals(className) && 
+                        classTree.getModifiers().getFlags().contains(Modifier.PUBLIC)) {
+                    return classTree;
+                }
+            }
+        }
+        return null;
+    }
+
+
+    private String myBindingName; 
+    private FileObject myBindingFileObject;
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.form b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.form
new file mode 100644
index 0000000000..16680ddd9b
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.form
@@ -0,0 +1,98 @@
+<?xml version="1.1" encoding="UTF-8" ?>
+
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
+<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="myInterceptorNameLbl" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
+                      <Component id="myInterceptorName" pref="244" max="32767" attributes="0"/>
+                  </Group>
+                  <Component id="myStatusLbl" alignment="0" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="myInterceptorNameLbl" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="myInterceptorName" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace pref="20" max="32767" attributes="0"/>
+              <Component id="myStatusLbl" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JLabel" name="myInterceptorNameLbl">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/web/beans/actions/Bundle.properties" key="LBL_InterceptorName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <AccessibilityProperties>
+        <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/web/beans/actions/Bundle.properties" key="ACSN_InterceptorName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/web/beans/actions/Bundle.properties" key="ACSD_InterceptorName" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </AccessibilityProperties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="myInterceptorName">
+      <AccessibilityProperties>
+        <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="myInterceptorNameLbl.getAccessibleContext().getAccessibleName()" type="code"/>
+        </Property>
+        <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
+          <Connection code="getAccessibleContext().getAccessibleDescription()" type="code"/>
+        </Property>
+      </AccessibilityProperties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="myStatusLbl">
+    </Component>
+  </SubComponents>
+</Form>
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.java
new file mode 100644
index 0000000000..9c305c302d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/actions/InterceptorPanel.java
@@ -0,0 +1,218 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * InterceptorPanel.java
+ *
+ * Created on 06.04.2011, 11:10:22
+ */
+package org.netbeans.modules.jakarta.web.beans.actions;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.text.BadLocationException;
+
+import org.openide.filesystems.FileObject;
+import org.openide.util.NbBundle;
+import org.openide.util.Utilities;
+
+/**
+ *
+ * @author den
+ */
+public class InterceptorPanel extends javax.swing.JPanel {
+    
+    private static final long serialVersionUID = 984990919698645497L;
+    
+    private static final String JAVA = "java";              // NOI18N
+
+    
+    public InterceptorPanel( JButton approveButton, String bindingName, 
+            FileObject bindingFileObject ) 
+    {
+        initComponents();
+        myBindingName = bindingName;
+        myBindingFileObject = bindingFileObject;
+        
+        myInterceptorName.getDocument().addDocumentListener( 
+                createValidationListener( approveButton ) );
+        myInterceptorName.setText( getProposedName() );
+        URL errorUrl;
+        try {
+            errorUrl = new URL("nbresloc:/org/netbeans/modules/dialogs/error.gif");
+            myStatusLbl.setIcon( new ImageIcon( errorUrl ));
+        }
+        catch (MalformedURLException e) {
+            assert false;
+        }
+        
+        myStatusLbl.setVisible( false );
+    }
+    
+    String getInterceptorName(){
+        return myInterceptorName.getText();
+    }
+    
+    private DocumentListener createValidationListener(final JButton button ) {
+        DocumentListener listener = new DocumentListener() {
+            
+            @Override
+            public void removeUpdate( DocumentEvent e ) {
+                checkName(e);
+            }
+            
+            @Override
+            public void insertUpdate( DocumentEvent e ) {
+                checkName(e);
+            }
+            
+            @Override
+            public void changedUpdate( DocumentEvent e ) {
+                checkName(e);                
+            }
+            
+            private void checkName(DocumentEvent e){
+                try {
+                    String text = e.getDocument().getText(0, 
+                            e.getDocument().getLength());
+                    if ( text == null || text.trim().length() == 0 ||
+                            !Utilities.isJavaIdentifier( text ))
+                    {
+                        myStatusLbl.setText(NbBundle.getMessage(
+                                InterceptorGenerator.class, 
+                                "LBL_InvalidInterceptorName", text ));
+                        myStatusLbl.setVisible( true );
+                        button.setEnabled( false );
+                        return;
+                    }
+                    FileObject packageFolder = myBindingFileObject.getParent();
+                    if ( packageFolder == null ){
+                        return;
+                    }
+                    FileObject file = packageFolder.getFileObject( text,JAVA);
+                    if ( file != null ){
+                        myStatusLbl.setText(NbBundle.getMessage(
+                                InterceptorGenerator.class, 
+                                "LBL_FileExists", file.getNameExt() ));
+                        myStatusLbl.setVisible( true );
+                        button.setEnabled( false );
+                        return;
+                    }
+                    
+                    myStatusLbl.setText("");
+                    myStatusLbl.setVisible( false );
+                    button.setEnabled( true );
+                }
+                catch (BadLocationException ex ) {
+                    /*
+                     *  should be never appear because text access is done inside
+                     *  event handling
+                     */
+                    assert false;
+                }
+            }
+        };
+        return listener;
+    }
+    
+    private String getProposedName() {
+        StringBuilder result = new StringBuilder();
+        if ( myBindingName.endsWith(InterceptorFactory.INTERCEPTOR_BINDING)){
+            result.append( myBindingName.substring(0, myBindingName.length() -
+                    InterceptorFactory.INTERCEPTOR_BINDING.length() ));
+        }
+        else {
+            result.append( myBindingName );
+        }
+        result.append("Interceptor");               // NOI18N
+        
+        FileObject packageFolder = myBindingFileObject.getParent();
+        if ( packageFolder == null ){
+            return result.toString();
+        }
+        int index = 1;
+        String next = result.toString();
+        while( packageFolder.getFileObject( next, JAVA) != null ){
+            next = result.toString()+index;
+            index++;
+        }
+        return result.toString();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        myInterceptorNameLbl = new javax.swing.JLabel();
+        myInterceptorName = new javax.swing.JTextField();
+        myStatusLbl = new javax.swing.JLabel();
+
+        org.openide.awt.Mnemonics.setLocalizedText(myInterceptorNameLbl, org.openide.util.NbBundle.getMessage(InterceptorPanel.class, "LBL_InterceptorName")); // NOI18N
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(myInterceptorNameLbl)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(myInterceptorName, javax.swing.GroupLayout.DEFAULT_SIZE, 244, Short.MAX_VALUE))
+                    .addComponent(myStatusLbl))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(myInterceptorNameLbl)
+                    .addComponent(myInterceptorName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 20, Short.MAX_VALUE)
+                .addComponent(myStatusLbl)
+                .addContainerGap())
+        );
+
+        myInterceptorNameLbl.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(InterceptorPanel.class, "ACSN_InterceptorName")); // NOI18N
+        myInterceptorNameLbl.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(InterceptorPanel.class, "ACSD_InterceptorName")); // NOI18N
+        myInterceptorName.getAccessibleContext().setAccessibleName(myInterceptorNameLbl.getAccessibleContext().getAccessibleName());
+        myInterceptorName.getAccessibleContext().setAccessibleDescription(getAccessibleContext().getAccessibleDescription());
+    }// </editor-fold>//GEN-END:initComponents
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JTextField myInterceptorName;
+    private javax.swing.JLabel myInterceptorNameLbl;
+    private javax.swing.JLabel myStatusLbl;
+    // End of variables declaration//GEN-END:variables
+    
+    private String myBindingName; 
+    private FileObject myBindingFileObject;
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/AbstractAnalysisTask.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/AbstractAnalysisTask.java
new file mode 100644
index 0000000000..f5c18d134a
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/AbstractAnalysisTask.java
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+
+
+/**
+ * @author ads
+ *
+ */
+abstract class AbstractAnalysisTask {
+    
+    AbstractAnalysisTask(  ){
+        cancel = new AtomicBoolean( false );
+    }
+    
+    protected boolean isCancelled() {
+        return cancel.get();
+    }
+    
+    protected AtomicBoolean getCancel(){
+        return cancel;
+    }
+    
+    protected CdiAnalysisResult getResult(){
+        return myResult;
+    }
+    
+    protected void setResult( CdiAnalysisResult result ){
+        myResult = result;
+    }
+    
+    abstract void run( CompilationInfo compInfo );
+    
+    abstract List<ErrorDescription> getProblems();
+    
+    void stop(){
+        cancel.set( true );
+    }
+
+    private AtomicBoolean cancel;
+    private CdiAnalysisResult myResult;
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/BeansXmlFix.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/BeansXmlFix.java
new file mode 100644
index 0000000000..eea1f406e2
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/BeansXmlFix.java
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.netbeans.api.j2ee.core.Profile;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.j2ee.common.dd.DDHelper;
+import org.netbeans.modules.jakarta.web.beans.CdiUtil;
+import org.netbeans.spi.editor.hints.ChangeInfo;
+import org.netbeans.spi.editor.hints.Fix;
+import org.openide.filesystems.FileObject;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+class BeansXmlFix implements Fix {
+
+    BeansXmlFix( Project project , FileObject fileObject , 
+            CdiEditorAwareJavaSourceTaskFactory factory ) 
+    {
+        myProject = project;
+        myFileObject = fileObject;
+        myFactory = factory;
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.editor.hints.Fix#getText()
+     */
+    @Override
+    public String getText() {   
+        return NbBundle.getMessage( BeansXmlFix.class, "MSG_HintCreateBeansXml");    // NOI18N
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.spi.editor.hints.Fix#implement()
+     */
+    @Override
+    public ChangeInfo implement() throws Exception {
+        CdiUtil util = myProject.getLookup().lookup( CdiUtil.class);
+        Collection<FileObject> infs;
+        if ( util == null ){
+            infs= CdiUtil.getBeansTargetFolder(myProject, true);
+        }
+        else {
+            infs = util.getBeansTargetFolder(true);
+        }
+        for (FileObject inf : infs) {
+            if (inf != null) {
+                FileObject beansXml = inf
+                        .getFileObject(CdiUtil.BEANS_XML);
+                if (beansXml != null) {
+                    return null;
+                }
+                DDHelper.createBeansXml(Profile.JAVA_EE_6_FULL, inf,
+                        CdiUtil.BEANS);
+                CdiUtil logger = myProject.getLookup().lookup(CdiUtil.class);
+                if ( logger!= null ){
+                    logger.log("USG_CDI_BEANS_FIX", BeansXmlFix.class, 
+                            new Object[]{myProject.getClass().getName()}, true );
+                }
+                if (myFactory != null) {
+                    myFactory.restart(myFileObject);
+                }
+                return null;
+            }
+        }
+        return null;
+    }
+    
+    private Project myProject;
+    private CdiEditorAwareJavaSourceTaskFactory myFactory;
+    private FileObject myFileObject;
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/Bundle.properties
similarity index 54%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/Bundle.properties
index cee8b660a7..a7bbcd24d8 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/Bundle.properties
@@ -14,20 +14,8 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Contexts and Dependency Injection Support
 
-Templates/CDI=Contexts and Dependency Injection
-Templates/CDI/beans.xml=beans.xml (CDI Configuration File)
-Templates/CDI/Interceptor.java=Interceptor Binding Type
-Templates/CDI/Qualifier.java=Qualifier Type
-Templates/CDI/Scope.java=Scope Type
-Templates/CDI/Stereotype.java=Stereotype
+ERR_RequireWebBeans=CDI artifact is found but there is no beans.xml file.
+MSG_HintCreateBeansXml=Create beans.xml file
 
-DSCR_InjectionPoint=CDI Injection Point
-DSCR_Decorated=CDI Decorated Bean
-DSCR_Delegate=CDI Delegate Injection Point
-DSCR_Event=CDI Event
-DSCR_Observer=CDI Observer
-DSCR_Intercepted=CDI Intercepted Element
-
-Loaders/text/x-beans+xml/Factories/org-netbeans-modules-web-beans-BeansDataLoader.instance=Persistence Unit Files
+USG_CDI_BEANS_FIX=beans.xml file is created via fix hint for project "{0}".
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CancellableAnalysysTask.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CancellableAnalysysTask.java
new file mode 100644
index 0000000000..6b1e5f15bb
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CancellableAnalysysTask.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.netbeans.api.java.source.CancellableTask;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.navigation.actions.WebBeansActionHelper;
+import org.netbeans.spi.editor.hints.HintsController;
+import org.openide.filesystems.FileObject;
+
+
+/**
+ * @author ads
+ *
+ */
+abstract class CancellableAnalysysTask implements CancellableTask<CompilationInfo>{
+    
+    CancellableAnalysysTask(FileObject javaFile,  
+            CdiEditorAwareJavaSourceTaskFactory factory ) 
+    {
+        myFileObject = javaFile;
+        myTask = new AtomicReference<AbstractAnalysisTask>();
+        myFactory = factory;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.api.java.source.Task#run(java.lang.Object)
+     */
+    @Override
+    public void run( CompilationInfo compInfo ) throws Exception {
+        if ( !WebBeansActionHelper.isEnabled() ){
+            return;
+        }
+        AbstractAnalysisTask task = createTask();
+        myTask.set( task );
+        task.run( compInfo );
+        myTask.compareAndSet( task, null);
+        HintsController.setErrors(myFileObject, getLayerName(), task.getProblems()); 
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.api.java.source.CancellableTask#cancel()
+     */
+    @Override
+    public void cancel() {
+        AbstractAnalysisTask task = myTask.getAndSet(null);
+        if ( task != null ){
+            task.stop();
+        }
+    }
+    
+    protected abstract String getLayerName();
+    
+    protected abstract AbstractAnalysisTask createTask();
+    
+    protected FileObject getFileObject(){
+        return myFileObject;
+    }
+    
+    protected CdiEditorAwareJavaSourceTaskFactory getFactory(){
+        return myFactory;
+    }
+
+    private FileObject myFileObject;
+    private AtomicReference<AbstractAnalysisTask> myTask;
+    private CdiEditorAwareJavaSourceTaskFactory myFactory;
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisResult.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisResult.java
new file mode 100644
index 0000000000..95d2865c1a
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisResult.java
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.lang.model.element.Element;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.jakarta.web.beans.CdiUtil;
+import org.netbeans.modules.jakarta.web.beans.hints.CDIAnnotation;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.openide.filesystems.FileObject;
+import org.openide.util.NbBundle;
+
+
+
+/**
+ * @author ads
+ *
+ */
+public class CdiAnalysisResult {
+    
+    public CdiAnalysisResult( CompilationInfo info, 
+            CdiEditorAwareJavaSourceTaskFactory factory )
+    {
+        myInfo = info;
+        myProblems = new LinkedList<ErrorDescription>();
+        myCollectedAnnotations = new LinkedList<CDIAnnotation>();
+    }
+
+    public void addError( Element subject, String message ) {
+        addNotification( Severity.ERROR, subject, message);
+    }
+    
+    public void addError( Element subject, String message , Fix fix ) {
+        addNotification( Severity.ERROR, subject, message, fix );
+    }
+    
+    public void addNotification( Severity severity,
+            Element element, String message )
+    {
+        addNotification(severity, element, message , null );           
+    }
+    
+    public void addNotification( Severity severity,
+            Element element, String message , Fix fix )
+    {
+        ErrorDescription description = CdiEditorAnalysisFactory.
+            createNotification( severity, element, myInfo , message, fix );
+        if ( description == null ){
+            return;
+        }
+        getProblems().add( description );              
+    }
+
+    public CompilationInfo getInfo() {
+        return myInfo;
+    }
+    
+    public List<ErrorDescription> getProblems(){
+        return myProblems;
+    }
+    
+    public void requireCdiEnabled( Element element ){
+        if ( isCdiRequired ){
+            return;
+        }
+        isCdiRequired = true;
+        FileObject fileObject = getInfo().getFileObject();
+        if ( fileObject ==null ){
+            return;
+        }
+        Project project = FileOwnerQuery.getOwner( fileObject );
+        if ( project == null ){
+            return;
+        }
+        CdiUtil lookup = project.getLookup().lookup( CdiUtil.class );
+        boolean needFix = false;
+        if ( lookup == null ){
+            //in general main use is is when lookup!=null, if lookup == null nly some general hevavior is supported
+            needFix = !CdiUtil.isCdiEnabled(project);
+        }
+        else {
+            needFix = !lookup.isCdiEnabled();
+        }
+        if ( needFix) {
+            Fix fix = new BeansXmlFix( project , fileObject , myFactory );
+            addError(element, NbBundle.getMessage(CdiAnalysisResult.class, 
+                "ERR_RequireWebBeans"), fix );        // NOI18N
+        }
+    }
+    
+    public boolean requireBeansXml(){
+        return isCdiRequired;
+    }
+    
+    public void addAnnotation( CDIAnnotation annotation ) {
+        myCollectedAnnotations.add(annotation);
+    }
+    
+    public List<CDIAnnotation> getAnnotations(){
+        return Collections.unmodifiableList(myCollectedAnnotations);
+    }
+    
+    private CompilationInfo myInfo ;
+    private List<ErrorDescription> myProblems;
+    private boolean isCdiRequired;
+    private List<CDIAnnotation> myCollectedAnnotations;
+    private CdiEditorAnalysisFactory myFactory;
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisTask.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisTask.java
new file mode 100644
index 0000000000..452f9df05d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiAnalysisTask.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.CtorAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+
+
+/**
+ * @author ads
+ *
+ */
+public class CdiAnalysisTask extends AbstractAnalysisTask {
+    
+    public CdiAnalysisTask( CdiEditorAwareJavaSourceTaskFactory factory ){
+        myFactory =factory;
+    }
+    
+    
+    protected CdiAnalysisResult createResult( CompilationInfo info ){
+        return new CdiAnalysisResult(info, myFactory );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.AbstractAnalysisTask#getProblems()
+     */
+    @Override
+    List<ErrorDescription> getProblems() {
+        return getResult().getProblems();
+    }
+    
+    @Override
+    protected void run( CompilationInfo compInfo ) {
+        setResult( createResult( compInfo ) );
+        List<? extends TypeElement> types = compInfo.getTopLevelElements();
+        for (TypeElement typeElement : types) {
+            if ( isCancelled() ){
+                break;
+            }
+            analyzeType(typeElement, null );
+        }
+        EditorAnnotationsHelper helper = EditorAnnotationsHelper.getInstance(getResult());
+        if ( helper == null ){
+            return;
+        }
+        helper.publish( getResult() );
+    }
+    
+    private void analyzeType(TypeElement typeElement , TypeElement parent )
+    {
+        ElementKind kind = typeElement.getKind();
+        ElementAnalyzer analyzer = ANALIZERS.get( kind );
+        if ( analyzer != null ){
+            analyzer.analyze(typeElement, parent, getCancel(), getResult() );
+        }
+        if ( isCancelled() ){
+            return;
+        }
+        List<? extends Element> enclosedElements = typeElement.getEnclosedElements();
+        List<TypeElement> types = ElementFilter.typesIn(enclosedElements);
+        for (TypeElement innerType : types) {
+            analyzeType(innerType, typeElement );
+        }
+        Set<Element> enclosedSet = new HashSet<Element>( enclosedElements );
+        enclosedSet.removeAll( types );
+        for(Element element : enclosedSet ){
+            analyze(typeElement, element);
+        }
+    }
+
+    private void analyze( TypeElement typeElement, Element element )
+    {
+        ElementAnalyzer analyzer;
+        if ( isCancelled() ){
+            return;
+        }
+        analyzer = ANALIZERS.get( element.getKind() );
+        if ( analyzer == null ){
+            return;
+        }
+        analyzer.analyze(element, typeElement, getCancel(), getResult() );
+    }
+
+    private CdiEditorAwareJavaSourceTaskFactory myFactory;
+    private static final Map<ElementKind,ElementAnalyzer> ANALIZERS = 
+        new HashMap<ElementKind, ElementAnalyzer>();
+
+    static {
+        ANALIZERS.put(ElementKind.CLASS, new ClassElementAnalyzer());
+        ANALIZERS.put(ElementKind.FIELD, new FieldElementAnalyzer());
+        ANALIZERS.put(ElementKind.METHOD, new MethodElementAnalyzer());
+        ANALIZERS.put(ElementKind.CONSTRUCTOR, new CtorAnalyzer());
+        ANALIZERS.put(ElementKind.ANNOTATION_TYPE, new AnnotationElementAnalyzer());
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisFactory.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisFactory.java
new file mode 100644
index 0000000000..dac280b9cc
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisFactory.java
@@ -0,0 +1,232 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
+
+import org.netbeans.api.java.lexer.JavaTokenId;
+import org.netbeans.api.java.source.CancellableTask;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.java.source.JavaSource.Phase;
+import org.netbeans.api.java.source.JavaSource.Priority;
+import org.netbeans.api.java.source.JavaSourceTaskFactory;
+import org.netbeans.api.java.source.TreeUtilities;
+import org.netbeans.api.lexer.Token;
+import org.netbeans.api.lexer.TokenSequence;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.ErrorDescriptionFactory;
+import org.netbeans.spi.editor.hints.Fix;
+import org.netbeans.spi.editor.hints.Severity;
+import org.openide.filesystems.FileObject;
+import org.openide.util.lookup.ServiceProvider;
+
+import com.sun.source.tree.ClassTree;
+import com.sun.source.tree.MethodTree;
+import com.sun.source.tree.Tree;
+import com.sun.source.tree.VariableTree;
+import com.sun.source.util.SourcePositions;
+
+
+/**
+ * @author ads
+ *
+ */
+@ServiceProvider(service=JavaSourceTaskFactory.class)
+public class CdiEditorAnalysisFactory extends CdiEditorAwareJavaSourceTaskFactory {
+
+    public CdiEditorAnalysisFactory( ){
+        super(Priority.BELOW_NORMAL);
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.api.java.source.JavaSourceTaskFactory#createTask(org.openide.filesystems.FileObject)
+     */
+    @Override
+    protected CancellableTask<CompilationInfo> createTask( FileObject fileObject ) {
+        return new CdiEditorAnalysisTask( fileObject , this );
+    }
+    
+    public static ErrorDescription createError( Element subject , 
+            CompilationInfo info ,String description)
+    {
+        return createNotification(Severity.ERROR, subject, info, description);
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            Element subject , CompilationInfo info ,String description)
+    {
+        return createNotification(severity, subject, info, description, null);
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            Element subject , CompilationInfo info ,String description, Fix fix )
+    {
+        Tree elementTree = info.getTrees().getTree(subject);
+        return createNotification(severity, elementTree, info, description, fix );
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            Element subject , WebBeansModel model, CompilationInfo info ,
+            String description)
+    {
+        return createNotification(severity, subject, model , info, description, 
+                null);
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            Element subject , WebBeansModel model, CompilationInfo info ,
+            String description, Fix fix )
+    {
+        ElementHandle<Element> handle = ElementHandle.create( subject );
+        Element element = handle.resolve(info);
+        if ( element == null){
+            return null;
+        }
+        Tree elementTree = info.getTrees().getTree(element);
+        return createNotification(severity, elementTree, info, description, fix );
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            VariableElement element, ExecutableElement parent , 
+            WebBeansModel model, CompilationInfo info ,String description, Fix fix)
+    {
+        VariableElement var = resolveParameter(element, parent, info);
+        if ( var == null ){
+            return null;
+        }
+        Tree elementTree = info.getTrees().getTree(var);
+        return createNotification(severity, elementTree, info, description, fix );
+    }
+    
+    public static ErrorDescription createNotification( Severity severity, 
+            VariableElement element, ExecutableElement parent , 
+            WebBeansModel model, CompilationInfo info ,String description)
+    {
+        return createNotification( severity, element, parent, model , info , 
+                description, null );
+    }
+
+    public static VariableElement resolveParameter( VariableElement element, 
+            ExecutableElement parent,CompilationInfo info )
+    {
+        List<? extends VariableElement> parameters = parent.getParameters();
+        int i=0;
+        for (VariableElement param : parameters) {
+            if ( param.equals( element )){
+                break;
+            }
+            i++;
+        }
+        if ( i == parameters.size() ){
+            return null;
+        }
+        ElementHandle<ExecutableElement> handle = ElementHandle.create( parent );
+        ExecutableElement method = handle.resolve(info);
+        if ( method == null){
+            return null;
+        }
+        parameters = method.getParameters();
+        int j=0;
+        VariableElement var = null;
+        for (VariableElement param : parameters) {
+            if ( i==j){
+                var = param;
+            }
+            j++;
+        }
+        return var;
+    }
+
+    private static ErrorDescription createNotification( Severity severity,
+            Tree tree, CompilationInfo info, String description, Fix fix )
+    {
+        
+        List<Fix> fixes;
+        if ( fix != null ){
+            fixes = Collections.singletonList( fix );
+        }
+        else {
+            fixes = Collections.<Fix>emptyList();
+        }
+        if (tree != null){
+            List<Integer> position = getElementPosition(info, tree);
+            if(position.get(1) > position.get(0)) {
+                return ErrorDescriptionFactory.createErrorDescription(
+                        severity, description, fixes, 
+                        info.getFileObject(), position.get(0), position.get(1));
+            }
+        }
+        return null;
+    }
+    
+    public static List<Integer> getElementPosition(CompilationInfo info, Tree tree){
+        SourcePositions srcPos = info.getTrees().getSourcePositions();
+        
+        int startOffset = (int) srcPos.getStartPosition(info.getCompilationUnit(), tree);
+        int endOffset = (int) srcPos.getEndPosition(info.getCompilationUnit(), tree);
+        
+        Tree startTree = null;
+        
+        if (TreeUtilities.CLASS_TREE_KINDS.contains(tree.getKind())){
+            startTree = ((ClassTree)tree).getModifiers();
+            
+        } else if (tree.getKind() == Tree.Kind.METHOD){
+            startTree = ((MethodTree)tree).getReturnType();
+        } else if (tree.getKind() == Tree.Kind.VARIABLE){
+            startTree = ((VariableTree)tree).getType();
+        }
+        
+        if (startTree != null){
+            int searchStart = (int) srcPos.getEndPosition(info.getCompilationUnit(),
+                    startTree);
+            
+            TokenSequence<?> tokenSequence = info.getTreeUtilities().tokensFor(tree);
+            
+            if (tokenSequence != null){
+                boolean eob = false;
+                tokenSequence.move(searchStart);
+                
+                do{
+                    eob = !tokenSequence.moveNext();
+                }
+                while (!eob && tokenSequence.token().id() != JavaTokenId.IDENTIFIER);
+                
+                if (!eob){
+                    Token<?> identifier = tokenSequence.token();
+                    startOffset = identifier.offset(info.getTokenHierarchy());
+                    endOffset = startOffset + identifier.length();
+                }
+            }
+        }
+        
+        List<Integer> result = new ArrayList<Integer>(2);
+        result.add(startOffset);
+        result.add(endOffset );
+        return result;
+    }
+
+}
diff --git a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisTask.java
similarity index 55%
copy from enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisTask.java
index eacb14f446..6a97c968a7 100644
--- a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAnalysisTask.java
@@ -16,35 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.netbeans.modules.jakarta.web.beans.analysis;
 
-package org.netbeans.modules.web.jsfapi.api;
+import org.openide.filesystems.FileObject;
 
-import java.util.Map;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.project.Project;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.openide.util.Lookup;
 
 /**
+ * @author ads
  *
- * @author marekfukala
  */
-public interface JsfSupport {
-
-    public Project getProject();
-
-    public ClassPath getClassPath();
-
-    public WebModule getWebModule();
-
-    public Library getLibrary(String namespace);
+class CdiEditorAnalysisTask extends CancellableAnalysysTask {
     
-    /**
-     * @return Library namespace to Library instance map
-     */
-    public Map<String, ? extends Library> getLibraries();
+    CdiEditorAnalysisTask(FileObject javaFile,  
+            CdiEditorAwareJavaSourceTaskFactory factory ) 
+    {
+        super( javaFile , factory );
+    }
     
-    public Lookup getLookup();
+    @Override
+    protected String getLayerName() {
+        return "CDI Analyser"; //NOI18N
+    }
 
-    public boolean isJsf22Plus();
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.CancellableAnalysysTask#createTask()
+     */
+    @Override
+    protected AbstractAnalysisTask createTask() {
+        return new CdiAnalysisTask( getFactory() );
+    };
+    
+    
 }
diff --git a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAwareJavaSourceTaskFactory.java
similarity index 52%
copy from enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAwareJavaSourceTaskFactory.java
index eacb14f446..61ba37f7e7 100644
--- a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/CdiEditorAwareJavaSourceTaskFactory.java
@@ -16,35 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.netbeans.modules.jakarta.web.beans.analysis;
 
-package org.netbeans.modules.web.jsfapi.api;
+import org.netbeans.api.java.source.JavaSource.Phase;
+import org.netbeans.api.java.source.JavaSource.Priority;
+import org.netbeans.api.java.source.support.EditorAwareJavaSourceTaskFactory;
+import org.netbeans.modules.parsing.spi.TaskIndexingMode;
+import org.openide.filesystems.FileObject;
 
-import java.util.Map;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.project.Project;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.openide.util.Lookup;
 
 /**
+ * @author ads
  *
- * @author marekfukala
  */
-public interface JsfSupport {
-
-    public Project getProject();
-
-    public ClassPath getClassPath();
-
-    public WebModule getWebModule();
-
-    public Library getLibrary(String namespace);
-    
-    /**
-     * @return Library namespace to Library instance map
-     */
-    public Map<String, ? extends Library> getLibraries();
+public abstract class CdiEditorAwareJavaSourceTaskFactory extends
+        EditorAwareJavaSourceTaskFactory
+{
+
+    protected CdiEditorAwareJavaSourceTaskFactory( Priority priority ) {
+        super(Phase.RESOLVED,  priority, /*TaskIndexingMode.ALLOWED_DURING_SCAN ,*/
+                "text/x-java");    // NOI18N
+    }
     
-    public Lookup getLookup();
+    void restart( FileObject fileObject ){
+        reschedule( fileObject );
+    }
 
-    public boolean isJsf22Plus();
 }
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansAnalysisTask.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansAnalysisTask.java
new file mode 100644
index 0000000000..989d74f569
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansAnalysisTask.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.api.project.FileOwnerQuery;
+import org.netbeans.api.project.Project;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModel;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelAction;
+import org.netbeans.modules.j2ee.metadata.model.api.MetadataModelException;
+import org.netbeans.modules.jakarta.web.beans.MetaModelSupport;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+
+
+/**
+ * @author ads
+ *
+ */
+public class WebBeansAnalysisTask extends AbstractAnalysisTask {
+    
+    private static final Logger LOG = Logger.getLogger( 
+            WebBeansAnalysisTask.class.getName());
+    
+    public WebBeansAnalysisTask( CdiEditorAwareJavaSourceTaskFactory factory ){
+        myFactory = factory;
+    }
+    
+    protected Result createResult( CompilationInfo compInfo )
+    {
+        return new Result( compInfo , myFactory );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.AbstractAnalysisTask#getResult()
+     */
+    @Override
+    protected Result getResult() {
+        return (Result)super.getResult();
+    }
+    
+    protected MetadataModel<WebBeansModel> getModel(CompilationInfo compInfo){
+        Project project = FileOwnerQuery.getOwner( compInfo.getFileObject() );
+        if ( project == null ){
+            return null;
+        }
+        MetaModelSupport support = new MetaModelSupport(project);
+        return support.getMetaModel();
+    }
+    
+    @Override
+    List<ErrorDescription> getProblems(){
+        return getResult().getProblems();
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.AbstractAnalysisTask#run(org.netbeans.api.java.source.CompilationInfo)
+     */
+    @Override
+    protected void run( final CompilationInfo compInfo ) {
+        setResult( createResult( compInfo ) );
+        List<? extends TypeElement> types = compInfo.getTopLevelElements();
+        final List<ElementHandle<TypeElement>> handles = 
+            new ArrayList<ElementHandle<TypeElement>>(1);
+        for (TypeElement typeElement : types) {
+            if ( isCancelled() ){
+                break;
+            }
+            handles.add(ElementHandle.create(typeElement));
+        }
+        MetadataModel<WebBeansModel> metaModel = getModel(compInfo);
+        if ( metaModel == null ){
+            return;
+        }
+        try {
+            metaModel.runReadAction( 
+                    new MetadataModelAction<WebBeansModel, Void>() 
+            {
+                @Override
+                public Void run( WebBeansModel model ) throws Exception {
+                    CompilationController controller = model.getCompilationController();
+                    for (ElementHandle<TypeElement> handle : handles) {
+                        if(isCancelled()) {
+                            break;
+                        }
+                        TypeElement type = handle.resolve( controller );
+                        if ( type == null ){
+                            continue;
+                        }
+                        analyzeType( type , null , model , compInfo );
+                    }
+                    return null;
+                }
+            });
+        }
+        catch (MetadataModelException e) {
+            LOG.log( Level.INFO , null , e);
+        }
+        catch (IOException e) {
+            LOG.log( Level.INFO , null , e);
+        }
+        finally {
+            EditorAnnotationsHelper helper = EditorAnnotationsHelper.getInstance(getResult());
+            if ( helper == null ){
+                return;
+            }
+            helper.publish( getResult() );
+        }
+    }
+    
+    private void analyzeType(TypeElement typeElement , TypeElement parent ,
+            WebBeansModel model , CompilationInfo info )
+    {
+        ElementKind kind = typeElement.getKind();
+        ModelAnalyzer analyzer = ANALIZERS.get( kind );
+        if ( analyzer != null ){
+            analyzer.analyze(typeElement, parent, model, getCancel(), getResult());
+        }
+        if ( isCancelled() ){
+            return;
+        }
+        List<? extends Element> enclosedElements = typeElement.getEnclosedElements();
+        List<TypeElement> types = ElementFilter.typesIn(enclosedElements);
+        for (TypeElement innerType : types) {
+            if ( innerType == null ){
+                continue;
+            }
+            analyzeType(innerType, typeElement , model , info );
+        }
+        Set<Element> enclosedSet = new HashSet<Element>( enclosedElements );
+        enclosedSet.removeAll( types );
+        for(Element element : enclosedSet ){
+            if ( element == null ){
+                continue;
+            }
+            analyze(typeElement, model, element, info );
+        }
+    }
+
+    private void analyze( TypeElement typeElement, WebBeansModel model,
+             Element element, CompilationInfo info  )
+    {
+        ModelAnalyzer analyzer;
+        if ( isCancelled() ){
+            return;
+        }
+        analyzer = ANALIZERS.get( element.getKind() );
+        if ( analyzer == null ){
+            return;
+        }
+        analyzer.analyze(element, typeElement, model, getCancel(), getResult());
+    }
+    
+    private CdiEditorAwareJavaSourceTaskFactory myFactory;
+    
+    private static final Map<ElementKind,ModelAnalyzer> ANALIZERS = 
+        new HashMap<ElementKind, ModelAnalyzer>();
+
+    static {
+        ANALIZERS.put(ElementKind.CLASS, new ClassModelAnalyzer());
+        ANALIZERS.put(ElementKind.FIELD, new FieldModelAnalyzer());
+        ANALIZERS.put(ElementKind.METHOD, new MethodModelAnalyzer());
+        ANALIZERS.put(ElementKind.ANNOTATION_TYPE, new AnnotationModelAnalyzer());
+    }
+
+}
diff --git a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansEditorAnalysisTask.java
similarity index 50%
copy from enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansEditorAnalysisTask.java
index eacb14f446..ef7bd0a7ce 100644
--- a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansEditorAnalysisTask.java
@@ -16,35 +16,39 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.netbeans.modules.jakarta.web.beans.analysis;
 
-package org.netbeans.modules.web.jsfapi.api;
+import org.openide.filesystems.FileObject;
 
-import java.util.Map;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.project.Project;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.openide.util.Lookup;
 
 /**
+ * @author ads
  *
- * @author marekfukala
  */
-public interface JsfSupport {
-
-    public Project getProject();
-
-    public ClassPath getClassPath();
-
-    public WebModule getWebModule();
-
-    public Library getLibrary(String namespace);
+class WebBeansEditorAnalysisTask extends CancellableAnalysysTask {
     
-    /**
-     * @return Library namespace to Library instance map
-     */
-    public Map<String, ? extends Library> getLibraries();
     
-    public Lookup getLookup();
+    WebBeansEditorAnalysisTask(FileObject javaFile, 
+            CdiEditorAwareJavaSourceTaskFactory factory ) 
+    {
+        super( javaFile , factory );
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.CancellableAnalysysTask#getLayerName()
+     */
+    @Override
+    protected String getLayerName() {
+        return "Web Beans Model Analyzer";      // NOI18N
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.CancellableAnalysysTask#createTask()
+     */
+    @Override
+    protected AbstractAnalysisTask createTask() {
+        return new WebBeansAnalysisTask( getFactory() );
+    }
+
 
-    public boolean isJsf22Plus();
 }
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansModelAnalysisFactory.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansModelAnalysisFactory.java
new file mode 100644
index 0000000000..a5ed362ecc
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/WebBeansModelAnalysisFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis;
+
+import org.netbeans.api.java.source.CancellableTask;
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.JavaSource.Priority;
+import org.netbeans.api.java.source.JavaSourceTaskFactory;
+import org.openide.filesystems.FileObject;
+import org.openide.util.lookup.ServiceProvider;
+
+
+/**
+ * @author ads
+ *
+ */
+@ServiceProvider(service=JavaSourceTaskFactory.class)
+public class WebBeansModelAnalysisFactory extends
+        CdiEditorAwareJavaSourceTaskFactory
+{
+
+    public WebBeansModelAnalysisFactory( ) {
+        super(Priority.LOW);    
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.api.java.source.JavaSourceTaskFactory#createTask(org.openide.filesystems.FileObject)
+     */
+    @Override
+    protected CancellableTask<CompilationInfo> createTask( FileObject fileObject ) {
+        return new WebBeansEditorAnalysisTask( fileObject, this );
+    }
+    
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java
similarity index 91%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java
index 977671f615..68de8c5c40 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractDecoratorAnalyzer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.web.beans.analysis.analyzer;
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -36,10 +36,10 @@ import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.ElementFilter;
 
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
-import org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result;
-import org.netbeans.modules.web.beans.analysis.analyzer.field.DelegateFieldAnalizer;
-import org.netbeans.modules.web.beans.api.model.DependencyInjectionResult;
-import org.netbeans.modules.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.DelegateFieldAnalizer;
+import org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
 
 
 /**
@@ -49,12 +49,12 @@ import org.netbeans.modules.web.beans.api.model.WebBeansModel;
 public abstract class AbstractDecoratorAnalyzer<T> {
 
     protected void analyzeDecoratedBeans( DependencyInjectionResult res,
-            VariableElement element, T t, TypeElement decorator , 
+            VariableElement element, T t, TypeElement decorator ,
             WebBeansModel model, Result result )
     {
         Set<TypeElement> decoratedBeans = null;
         if ( res instanceof DependencyInjectionResult.ApplicableResult ){
-            DependencyInjectionResult.ApplicableResult appResult = 
+            DependencyInjectionResult.ApplicableResult appResult =
                 (DependencyInjectionResult.ApplicableResult) res;
             decoratedBeans = appResult.getTypeElements();
         }
@@ -79,17 +79,17 @@ public abstract class AbstractDecoratorAnalyzer<T> {
             return;
         }
         /*
-         *  The rule : "If a decorator matches a managed bean with a non-static, 
+         *  The rule : "If a decorator matches a managed bean with a non-static,
          *  non-private, final method, the decorator shouldn't also implement that method."
-         *  is actually nonsense. 
-         *  Each Java class has final wait(). Decorator is also java class 
-         *  so it also has a method wait() . So it always implements 
+         *  is actually nonsense.
+         *  Each Java class has final wait(). Decorator is also java class
+         *  so it also has a method wait() . So it always implements
          *  non-static, non-private final method.
-         *  I believe one need to care about ONLY methods in decorated types : 
+         *  I believe one need to care about ONLY methods in decorated types :
          *  all methods that are defined in interfaces ( decorated types )
          *  and which are implemented in the decorator and decorated bean.
-         *  
-         *  Here is implementation of this requirement. 
+         *
+         *  Here is implementation of this requirement.
          */
         Collection<TypeMirror> decoratedTypes = DelegateFieldAnalizer
                 .getDecoratedTypes(decorator, model.getCompilationController());
@@ -129,7 +129,7 @@ public abstract class AbstractDecoratorAnalyzer<T> {
             }
         }
     }
-    
+
     protected boolean checkBuiltInBeans( VariableElement element,
             TypeMirror elementType, WebBeansModel model, AtomicBoolean cancel )
     {
@@ -138,7 +138,7 @@ public abstract class AbstractDecoratorAnalyzer<T> {
         if ( context != null && context.equals(model.getCompilationController().
                 getTypes().asElement(elementType)))
         {
-            /* This is built-in javax.enterprise.context.spi.Context bean 
+            /* This is built-in jakarta.enterprise.context.spi.Context bean 
              * provided by container for each scope
              */
             return true;
@@ -146,11 +146,11 @@ public abstract class AbstractDecoratorAnalyzer<T> {
         if ( cancel.get()){
             return true;
         }
-        
+
         Element varElement = model.getCompilationController().getTypes().
             asElement(elementType);
         if ( varElement instanceof TypeElement ){
-            if ( !((TypeElement)varElement).getQualifiedName().contentEquals( 
+            if ( !((TypeElement)varElement).getQualifiedName().contentEquals(
                     AnnotationUtil.CONVERSATION))
             {
                 return false;
@@ -159,7 +159,7 @@ public abstract class AbstractDecoratorAnalyzer<T> {
         else {
             return false;
         }
-        
+
         if ( model.hasImplicitDefaultQualifier( element ) ){
             return true;
         }
@@ -176,12 +176,12 @@ public abstract class AbstractDecoratorAnalyzer<T> {
         }
         return hasOnlyDefault;
     }
-    
+
     protected abstract void addMethodError( VariableElement element, T t,
             TypeElement decorated, Element decoratedMethod,
             WebBeansModel model, Result result );
 
-    protected abstract void addClassError( VariableElement element , T t, 
+    protected abstract void addClassError( VariableElement element , T t,
             TypeElement decoratedBean, WebBeansModel model, Result result );
-    
+
 }
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractInterceptedElementAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractInterceptedElementAnalyzer.java
new file mode 100644
index 0000000000..61e733ee64
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractInterceptedElementAnalyzer.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class AbstractInterceptedElementAnalyzer {
+    
+
+    protected Set<AnnotationMirror> getInterceptorBindings(Element element,
+            WebBeansModel model)
+    {
+        Collection<AnnotationMirror> interceptorBindings = model
+                .getInterceptorBindings(element);
+        return new HashSet<AnnotationMirror>( interceptorBindings );
+    }
+    
+    protected boolean hasInterceptorBindings(Element element,
+            WebBeansModel model )
+    {
+        return !getInterceptorBindings(element, model).isEmpty();
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractProducerAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractProducerAnalyzer.java
new file mode 100644
index 0000000000..efde11dc28
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractProducerAnalyzer.java
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.List;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class AbstractProducerAnalyzer {
+    
+    protected abstract void hasTypeVar( Element element, TypeMirror type,
+            CdiAnalysisResult result );
+    
+    protected abstract void hasWildCard(Element element, TypeMirror type,
+            CdiAnalysisResult result);
+    
+    protected void checkType( Element element, TypeMirror type,
+            CdiAnalysisResult result )
+    {
+        if ( type.getKind() == TypeKind.TYPEVAR ){
+            hasTypeVar(element, type, result );
+        }
+        else if (hasWildCard(type)) {
+            hasWildCard( element, type, result );
+            return;
+        }
+    }
+    
+    protected boolean hasType(TypeMirror typeMirror, TypeKind kind ){
+        if ( typeMirror instanceof DeclaredType ){
+            List<? extends TypeMirror> typeArguments = 
+                    ((DeclaredType)typeMirror).getTypeArguments();
+            for (TypeMirror paramType : typeArguments) {
+                if ( paramType.getKind() == kind ){
+                    return true;
+                }
+                else {
+                    if ( hasType(paramType, kind) ){
+                        return true;
+                    }
+                }
+            }
+        }
+        else if ( typeMirror instanceof ArrayType ){
+            return hasType( ((ArrayType)typeMirror).getComponentType(), kind);
+        }
+        return false;
+    }
+
+    private boolean hasWildCard(TypeMirror typeMirror){
+        return hasType(typeMirror, TypeKind.WILDCARD);
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractScopedAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractScopedAnalyzer.java
new file mode 100644
index 0000000000..4ecdf1a8a9
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractScopedAnalyzer.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.ArrayType;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.CdiException;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class AbstractScopedAnalyzer  {
+    
+    public void analyzeScope( Element element, 
+            WebBeansModel model, AtomicBoolean cancel , Result result )
+    {
+        try {
+            String scope = model.getScope( element );
+            if ( cancel.get() ){
+                return;
+            }
+            TypeElement scopeElement = model.getCompilationController().
+                getElements().getTypeElement( scope );
+            if ( scopeElement == null ){
+                return;
+            }
+            checkScope( scopeElement , element , model, cancel, result );
+        }
+        catch (CdiException e) {
+            result.requireCdiEnabled(element, model);
+            informCdiException(e, element, model, result  );
+        }
+    }
+    
+    protected abstract void checkScope( TypeElement scopeElement, Element element, 
+            WebBeansModel model, AtomicBoolean cancel, Result result  );
+    
+    protected boolean hasTypeVarParameter(TypeMirror type ){
+        if ( type.getKind() == TypeKind.TYPEVAR){
+            return true;
+        }
+        if ( type instanceof DeclaredType ){
+            List<? extends TypeMirror> typeArguments = 
+                ((DeclaredType)type).getTypeArguments();
+            for (TypeMirror typeArg : typeArguments) {
+                if ( hasTypeVarParameter(typeArg)){
+                    return true;
+                }
+            }
+        }
+        else if ( type instanceof ArrayType ){
+            return hasTypeVarParameter(((ArrayType)type).getComponentType());
+        }
+        return false;
+    }
+    
+    protected boolean isPassivatingScope( TypeElement scope, WebBeansModel model ) {
+        AnnotationMirror normalScope = AnnotationUtil.getAnnotationMirror(
+                scope, model.getCompilationController(), AnnotationUtil.NORMAL_SCOPE_FQN);
+        if ( normalScope==null){
+            return false;
+        }
+        Map<? extends ExecutableElement, ? extends AnnotationValue> elementValues = 
+            normalScope.getElementValues();
+        boolean isPassivating = false;
+        for (Entry<? extends ExecutableElement, ? extends AnnotationValue> entry: 
+            elementValues.entrySet()) 
+        {
+            ExecutableElement key = entry.getKey();
+            if ( key.getSimpleName().contentEquals(AnnotationUtil.PASSIVATING)){
+                isPassivating = Boolean.TRUE.toString().equals(entry.getValue().toString());
+            }
+        }
+        return isPassivating;
+    }
+    
+    protected boolean isSerializable( Element element, WebBeansModel model ) {
+        TypeMirror elementType = element.asType();
+        if ( elementType == null || elementType.getKind() == TypeKind.ERROR){
+            return true;
+        }
+        return isSerializable(elementType, model);
+    }
+    
+    protected boolean isSerializable( TypeMirror type, WebBeansModel model ) {
+        TypeElement serializable = model.getCompilationController().getElements().
+            getTypeElement(Serializable.class.getCanonicalName());
+        if ( serializable == null ){
+            return true;
+        }
+        TypeMirror serializableType = serializable.asType();
+        if ( serializableType == null || serializableType.getKind() == TypeKind.ERROR){
+            return true;
+        }
+        return model.getCompilationController().getTypes().isSubtype(type, 
+                serializableType);
+    }
+
+    private void informCdiException(CdiException exception , Element element, 
+            WebBeansModel model, Result result )
+    {
+            result.addError( element, model, exception.getMessage());
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractTypedAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractTypedAnalyzer.java
new file mode 100644
index 0000000000..bc05fd57e1
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AbstractTypedAnalyzer.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class AbstractTypedAnalyzer {
+    
+    public void analyze( Element element, TypeMirror elementType, 
+            AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        List<TypeMirror> list = getRestrictedTypes(element, compInfo, cancel);
+        if ( list == null ){
+            return;
+        }
+        result.requireCdiEnabled(element);
+        for (TypeMirror type : list) {
+            if ( cancel.get()){
+                return;
+            }
+            boolean isSubtype = hasBeanType(element, elementType, type, compInfo);
+            if (!isSubtype) {
+                addError(element, result );
+            }
+        }
+        // check @Specializes types restriction conformance
+        if ( cancel.get()){
+            return;
+        }
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.SPECIALIZES, 
+                compInfo))
+        {
+            result.requireCdiEnabled(element);
+            checkSpecializes( element , elementType , list,  cancel , result );
+        }
+    }
+    
+    protected abstract void checkSpecializes( Element element, TypeMirror elementType,
+            List<TypeMirror> restrictedTypes, AtomicBoolean cancel , CdiAnalysisResult result );
+
+    protected boolean hasBeanType( Element subject, TypeMirror elementType, 
+            TypeMirror requiredBeanType,CompilationInfo compInfo )
+    {
+        return compInfo.getTypes().isSubtype(elementType, requiredBeanType);
+    }
+    
+    protected abstract void addError ( Element element , 
+            CdiAnalysisResult result );
+
+    protected void collectAncestors(TypeElement type , Set<TypeElement> ancestors, 
+            CompilationInfo compInfo )
+    {
+        TypeMirror superclass = type.getSuperclass();
+        addAncestor( superclass, ancestors, compInfo);
+        List<? extends TypeMirror> interfaces = type.getInterfaces();
+        for (TypeMirror interfaze : interfaces) {
+            addAncestor(interfaze, ancestors, compInfo);
+        }
+    }
+    
+    private void addAncestor( TypeMirror parent , Set<TypeElement> ancestors,
+            CompilationInfo compInfo)
+    {
+        if ( parent == null ){
+            return;
+        }
+        Element parentElement = compInfo.getTypes().asElement( parent );
+        if ( parentElement instanceof TypeElement ){
+            if ( ancestors.contains( (TypeElement)parentElement))
+            {
+                return;
+            }
+            ancestors.add( (TypeElement)parentElement);
+            collectAncestors((TypeElement)parentElement, ancestors, compInfo);
+        }
+    }
+    
+    protected List<TypeMirror> getRestrictedTypes(Element element, 
+            CompilationInfo compInfo , AtomicBoolean cancel)
+    {
+        AnnotationMirror typedMirror = AnnotationUtil.getAnnotationMirror(element, 
+                AnnotationUtil.TYPED, compInfo);
+        if ( typedMirror == null ){
+            return null;
+        }
+        Map<? extends ExecutableElement, ? extends AnnotationValue> values = 
+            typedMirror.getElementValues();
+        AnnotationValue restrictedTypes = null;
+        for (Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : 
+            values.entrySet() ) 
+        {
+            ExecutableElement key = entry.getKey();
+            AnnotationValue value = entry.getValue();
+            if ( AnnotationUtil.VALUE.contentEquals(key.getSimpleName())){ 
+                restrictedTypes = value;
+                break;
+            }
+        }
+        if ( restrictedTypes == null ){
+            return Collections.emptyList();
+        }
+        if ( cancel.get() ){
+            return Collections.emptyList();
+        }
+        Object value = restrictedTypes.getValue();
+        if ( value instanceof List<?> ){
+            List<TypeMirror> result = new ArrayList<TypeMirror>(((List<?>)value).size());
+            for( Object type : (List<?>)value){
+                AnnotationValue annotationValue = (AnnotationValue)type;
+                type = annotationValue.getValue();
+                if (type instanceof TypeMirror){
+                    result.add( (TypeMirror)type);
+                }
+            }
+            return result;
+        }
+        return Collections.emptyList();
+    }
+    
+    protected Set<TypeElement> getUnrestrictedBeanTypes( TypeElement element,
+            CompilationInfo compInfo)
+    {
+        Set<TypeElement> set = new HashSet<TypeElement>();
+        set.add( element );
+        collectAncestors(element, set, compInfo);
+        return set;
+    }
+    
+    protected Set<TypeElement> getElements( Collection<TypeMirror> types ,
+            CompilationInfo info  )
+    {
+        Set<TypeElement> result = new HashSet<TypeElement>();
+        for (TypeMirror typeMirror : types) {
+            Element element = info.getTypes().asElement(typeMirror);
+            if ( element instanceof TypeElement  ){
+                result.add( (TypeElement)element);
+            }
+        }
+        return result;
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationElementAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationElementAnalyzer.java
new file mode 100644
index 0000000000..f80dccb6a8
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationElementAnalyzer.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.InterceptorBindingMembersAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.QualifierAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.ScopeAnalyzer;
+
+
+/**
+ * @author ads
+ *
+ */
+public class AnnotationElementAnalyzer implements ElementAnalyzer {
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.ElementAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        TypeElement subject = (TypeElement) element;
+        for( AnnotationAnalyzer analyzer : ANALYZERS ){
+            if ( cancel.get() ){
+                return;
+            }
+            analyzer.analyze( subject, cancel , result );
+        }
+    }
+
+    public interface AnnotationAnalyzer {
+        public static final String INCORRECT_RUNTIME = "ERR_IncorrectRuntimeRetention"; //NOI18N
+        
+        void analyze( TypeElement element , AtomicBoolean cancel,
+                CdiAnalysisResult result );
+    }
+
+    private static final List<AnnotationAnalyzer> ANALYZERS = 
+        new LinkedList<AnnotationAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new ScopeAnalyzer() );
+        ANALYZERS.add( new QualifierAnalyzer() );
+        ANALYZERS.add( new InterceptorBindingMembersAnalyzer() );
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationModelAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationModelAnalyzer.java
new file mode 100644
index 0000000000..f5518d8cb1
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationModelAnalyzer.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.InterceptorBindingAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.StereotypeAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public class AnnotationModelAnalyzer implements ModelAnalyzer {
+
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            WebBeansModel model, AtomicBoolean cancel, 
+            Result result )
+    {
+        TypeElement subject = (TypeElement) element;
+        for( AnnotationAnalyzer analyzer : ANALYZERS ){
+            if ( cancel.get() ){
+                return;
+            }
+            analyzer.analyze( subject, model, cancel, result );
+        }
+    }
+    
+    public interface AnnotationAnalyzer {
+        public static final String INCORRECT_RUNTIME = "ERR_IncorrectRuntimeRetention"; //NOI18N
+        
+        void analyze( TypeElement element , WebBeansModel model,
+                AtomicBoolean cancel, 
+                Result result );
+    }
+
+    private static final List<AnnotationAnalyzer> ANALYZERS = 
+        new LinkedList<AnnotationAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new StereotypeAnalyzer());
+        ANALYZERS.add( new InterceptorBindingAnalyzer() );
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationUtil.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationUtil.java
new file mode 100644
index 0000000000..c8436b029f
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/AnnotationUtil.java
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public final class AnnotationUtil {
+
+    public static final String ANY = "jakarta.enterprise.inject.Any";                 // NOI18N
+
+    public static final String VALUE = "value";                                     // NOI18N
+
+    public static final String INJECT = "Inject";                                   // NOI18N
+
+    public static final String INJECT_FQN = "jakarta.inject."+INJECT;                 // NOI18N
+
+    public static final String DECORATOR = "jakarta.decorator.Decorator";             // NOI18N
+
+    public static final String PRODUCES = "Produces";
+
+    public static final String PRODUCES_FQN = "jakarta.enterprise.inject."+           // NOI18N
+        PRODUCES;
+
+    public static final String INTERCEPTOR_BINDING = "InterceptorBinding";          // NOI18N
+
+    public static final String INTERCEPTOR_BINDING_FQN
+                = "jakarta.interceptor."+INTERCEPTOR_BINDING;                         // NOI18N
+
+    public static final String INTERCEPTOR = "jakarta.interceptor.Interceptor";       // NOI18N
+
+    public static final String NORMAL_SCOPE = "NormalScope";                        // NOI18N
+
+    public static final String NORMAL_SCOPE_FQN
+                                          = "jakarta.enterprise.context."+NORMAL_SCOPE;// NOI18N
+
+    public static final String SCOPE =    "Scope";                                  // NOI18N
+
+    public static final String SCOPE_FQN = "jakarta.inject."+SCOPE;                   // NOI18N
+
+    public static final String REQUEST_SCOPE_FQN = "jakarta.enterprise.context.RequestScoped";// NOI18N
+    public static final String SESSION_SCOPE_FQN = "jakarta.enterprise.context.SessionScoped";// NOI18N
+    public static final String APPLICATION_SCOPE_FQN = "jakarta.enterprise.context.ApplicationScoped";// NOI18N
+    public static final String CONVERSATION_SCOPE_FQN = "jakarta.enterprise.context.ConversationScoped";// NOI18N
+    public static final String DEPENDENT_SCOPE_FQN = "jakarta.enterprise.context.Dependent";// NOI18N
+
+
+    public static final String DISPOSES = "Disposes";                               // NOI18N
+
+    public static final String DISPOSES_FQN  = "jakarta.enterprise.inject."+          // NOI18N
+                                        DISPOSES;
+
+    public static final String OBSERVES = "Observes";                               // NOI18N
+
+    public static final String OBSERVES_FQN = "jakarta.enterprise.event."+            // NOI18N
+                                            OBSERVES;
+
+    public static final String STATELESS = "jakarta.ejb.Stateless";                   // NOI18N
+
+    public static final String STATEFUL = "jakarta.ejb.Stateful";                     // NOI18N
+
+    public static final String  SINGLETON   = "jakarta.ejb.Singleton";                // NOI18N
+    public static final String  CDISINGLETON   = "jakarta.inject.Singleton";                // NOI18N
+
+    public static final String APPLICATION_SCOPED
+                    = "jakarta.enterprise.context.ApplicationScoped";                 // NOI18N
+
+    public static final String DEPENDENT
+                            = "jakarta.enterprise.context.Dependent";                 // NOI18N
+
+    public static final String STEREOTYPE = "Stereotype";                           // NOI18N
+
+    public static final String STEREOTYPE_FQN =
+                    "jakarta.enterprise.inject."+STEREOTYPE;                          // NOI18N
+
+    public static final String NAMED = "jakarta.inject.Named";                        // NOI18N
+
+    public static final String QUALIFIER = "Qualifier";                             // NOI18N
+
+    public static final String QUALIFIER_FQN=
+                            "jakarta.inject."+QUALIFIER;                              // NOI18N
+
+    public static final String DELEGATE_FQN =
+                                        "jakarta.decorator.Delegate";                 // NOI18N
+
+    public static final String SPECIALIZES = "jakarta.enterprise.inject.Specializes"; // NOI18N
+
+    public static final String INJECTION_POINT =
+                            "jakarta.enterprise.inject.spi.InjectionPoint";           // NOI18N
+
+    public static final String DEFAULT_FQN = "jakarta.enterprise.inject.Default";     // NOI18N
+
+    public static final String POST_CONSTRUCT = "jakarta.annotation.PostConstruct";   // NOI18N
+
+    public static final String PRE_DESTROY = "jakarta.annotation.PreDestroy";         // NOI18N
+
+    public static final String POST_ACTIVATE = "jakarta.ejb.PostActivate";            // NOI18N
+
+    public static final String PRE_PASSIVATE = "jakarta.ejb.PrePassivate";            // NOI18N
+
+    public static final String CONTEXT = "jakarta.enterprise.context.spi.Context";    // NOI18N
+
+    public static final String CONVERSATION = "jakarta.enterprise.context.Conversation";// NOI18N
+
+    public static final String ALTERNATVE = "jakarta.enterprise.inject.Alternative";   // NOI18N
+
+    public static final String TYPED = "jakarta.enterprise.inject.Typed";              // NOI18N
+
+    public static final String NON_BINDING = "jakarta.enterprise.util.Nonbinding";    // NOI18N
+
+    public static final String PASSIVATING = "passivating";                         // NOI18N
+
+    public static final String PROVIDER = "jakarta.inject.Provider";// NOI18N
+
+    private AnnotationUtil(){
+    }
+
+    public static boolean hasAnnotation(Element element, String annotation,
+            CompilationInfo info )
+    {
+        return getAnnotationMirror(element, annotation, info)!=null;
+    }
+
+    public static AnnotationMirror getAnnotationMirror(Element element,
+            String annotation,CompilationInfo info )
+    {
+        return getAnnotationMirror(element, info, annotation);
+    }
+
+    /**
+     * return AnnotationMirror for first found annotation from annotationFqns
+     * @param element
+     * @param info
+     * @param annotationFqns
+     * @return
+     */
+    public static AnnotationMirror getAnnotationMirror(Element element,
+            CompilationInfo info , String... annotationFqns)
+    {
+        Set<TypeElement> set = new HashSet<TypeElement>();
+        Elements els = info.getElements();
+        for( String annotation : annotationFqns){
+            TypeElement annotationElement = els.getTypeElement(
+                    annotation);
+            if ( annotationElement != null ){
+                set.add( annotationElement );
+            }
+        }
+
+        List<? extends AnnotationMirror> annotations =
+            els.getAllAnnotationMirrors( element );
+        for (AnnotationMirror annotationMirror : annotations) {
+            Element declaredAnnotation = info.getTypes().asElement(
+                    annotationMirror.getAnnotationType());
+            if ( set.contains( declaredAnnotation ) ){
+                return annotationMirror;
+            }
+        }
+        return null;
+    }
+
+    public static boolean isSessionBean(Element element ,
+            CompilationInfo compInfo )
+    {
+        return getAnnotationMirror(element, compInfo, STATEFUL, STATELESS,
+                SINGLETON)!= null;
+    }
+
+    public static boolean isDelegate(Element element, TypeElement parent,
+            WebBeansModel model )
+    {
+        return AnnotationUtil.hasAnnotation(element,
+                AnnotationUtil.DELEGATE_FQN, model.getCompilationController())
+                && AnnotationUtil.hasAnnotation( parent,
+                        AnnotationUtil.DECORATOR, model.getCompilationController());
+    }
+
+    public static boolean isLifecycleCallback( ExecutableElement element ,
+            CompilationInfo info )
+    {
+        AnnotationMirror annotationMirror = getAnnotationMirror(element, info,
+                POST_ACTIVATE, POST_CONSTRUCT , PRE_DESTROY, PRE_PASSIVATE);
+        return annotationMirror != null;
+    }
+
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/Bundle.properties
similarity index 54%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/Bundle.properties
index cee8b660a7..2fcfd0daeb 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/resources/Bundle.properties
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/Bundle.properties
@@ -14,20 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-OpenIDE-Module-Name=Contexts and Dependency Injection Support
 
-Templates/CDI=Contexts and Dependency Injection
-Templates/CDI/beans.xml=beans.xml (CDI Configuration File)
-Templates/CDI/Interceptor.java=Interceptor Binding Type
-Templates/CDI/Qualifier.java=Qualifier Type
-Templates/CDI/Scope.java=Scope Type
-Templates/CDI/Stereotype.java=Stereotype
-
-DSCR_InjectionPoint=CDI Injection Point
-DSCR_Decorated=CDI Decorated Bean
-DSCR_Delegate=CDI Delegate Injection Point
-DSCR_Event=CDI Event
-DSCR_Observer=CDI Observer
-DSCR_Intercepted=CDI Intercepted Element
-
-Loaders/text/x-beans+xml/Factories/org-netbeans-modules-web-beans-BeansDataLoader.instance=Persistence Unit Files
+ERR_BadAnnotationParamCtor=A bean constructor should not have a parameter annotated @{0}.
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassElementAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassElementAnalyzer.java
new file mode 100644
index 0000000000..d054c4b975
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassElementAnalyzer.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.AnnotationsAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.CtorsAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.TypedClassAnalizer;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ClassElementAnalyzer implements ElementAnalyzer {
+
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.ElementAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        TypeElement subject = (TypeElement) element;
+        for( ClassAnalyzer analyzer : ANALYZERS ){
+            if ( cancel.get() ){
+                return;
+            }
+            analyzer.analyze( subject, parent,  cancel, result );
+        }
+    }
+
+    public interface ClassAnalyzer {
+        void analyze( TypeElement element , TypeElement parent, AtomicBoolean cancel,
+                CdiAnalysisResult result );
+    }
+
+    private static final List<ClassAnalyzer> ANALYZERS= new LinkedList<ClassAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new TypedClassAnalizer() );
+        ANALYZERS.add( new AnnotationsAnalyzer());
+        ANALYZERS.add( new CtorsAnalyzer() );
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassModelAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassModelAnalyzer.java
new file mode 100644
index 0000000000..5619878d45
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ClassModelAnalyzer.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.DeclaredIBindingsAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.InterceptedBeanAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.ManagedBeansAnalizer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.NamedModelAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.ScopedBeanAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type.SessionBeanAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ClassModelAnalyzer implements ModelAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            WebBeansModel model, AtomicBoolean cancel,
+            Result result )
+    {
+        TypeElement subject = (TypeElement) element;
+        for( ClassAnalyzer analyzer : ANALYZERS ){
+            if ( cancel.get() ){
+                return;
+            }
+            analyzer.analyze( subject, parent, model, cancel, result);
+        }
+    }
+
+    public interface ClassAnalyzer {
+        void analyze( TypeElement element , TypeElement parent,
+                WebBeansModel model,AtomicBoolean cancel,
+                Result result );
+    }
+
+    private static final List<ClassAnalyzer> ANALYZERS= new LinkedList<ClassAnalyzer>();
+
+    static {
+        ANALYZERS.add( new ManagedBeansAnalizer());
+        ANALYZERS.add( new ScopedBeanAnalyzer());
+        ANALYZERS.add( new SessionBeanAnalyzer());
+        ANALYZERS.add( new InterceptedBeanAnalyzer() );
+        ANALYZERS.add( new NamedModelAnalyzer() );
+        ANALYZERS.add( new DeclaredIBindingsAnalyzer());
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/CtorAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/CtorAnalyzer.java
new file mode 100644
index 0000000000..2be7b4474e
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/CtorAnalyzer.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class CtorAnalyzer implements ElementAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.ElementAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        ExecutableElement ctor = (ExecutableElement)element;
+        List<? extends VariableElement> parameters = ctor.getParameters();
+        for (VariableElement param : parameters) {
+            if ( cancel.get() ){
+                return;
+            }
+            boolean isDisposer = AnnotationUtil.hasAnnotation(param, 
+                    AnnotationUtil.DISPOSES_FQN, result.getInfo());
+            boolean isObserver = AnnotationUtil.hasAnnotation(param, 
+                    AnnotationUtil.OBSERVES_FQN, result.getInfo());
+            if ( isDisposer || isObserver ){
+                result.requireCdiEnabled(element);
+                String annotation = isDisposer ? AnnotationUtil.DISPOSES : 
+                    AnnotationUtil.OBSERVES;
+                result.addError( element, NbBundle.getMessage(
+                    CtorAnalyzer.class, "ERR_BadAnnotationParamCtor", annotation)); // NOI18N 
+                break;
+            }
+        }
+    }
+
+}
diff --git a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ElementAnalyzer.java
similarity index 55%
copy from enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ElementAnalyzer.java
index eacb14f446..05f042d51d 100644
--- a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ElementAnalyzer.java
@@ -16,35 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
 
-package org.netbeans.modules.web.jsfapi.api;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
 
-import java.util.Map;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.project.Project;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.openide.util.Lookup;
 
 /**
+ * @author ads
  *
- * @author marekfukala
  */
-public interface JsfSupport {
-
-    public Project getProject();
-
-    public ClassPath getClassPath();
+public interface ElementAnalyzer {
 
-    public WebModule getWebModule();
-
-    public Library getLibrary(String namespace);
-    
-    /**
-     * @return Library namespace to Library instance map
-     */
-    public Map<String, ? extends Library> getLibraries();
+    void analyze( Element element , TypeElement parent, AtomicBoolean cancel,
+            CdiAnalysisResult result );
     
-    public Lookup getLookup();
-
-    public boolean isJsf22Plus();
 }
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldElementAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldElementAnalyzer.java
new file mode 100644
index 0000000000..406509e67b
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldElementAnalyzer.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.DelegateFieldAnalizer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.ProducerFieldAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.TypedFieldAnalyzer;
+
+
+/**
+ * @author ads
+ *
+ */
+public class FieldElementAnalyzer implements ElementAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        VariableElement var = (VariableElement) element;
+        TypeMirror varType = result.getInfo().getTypes().asMemberOf( 
+                (DeclaredType)parent.asType(),  var );
+        for (FieldAnalyzer analyzer : ANALYZERS) {
+            if ( cancel.get()){
+                return;
+            }
+            analyzer.analyze(var, varType, parent, cancel, result );
+        }
+    }
+    
+    public interface FieldAnalyzer {
+        void analyze( VariableElement element , TypeMirror elementType,
+                TypeElement parent, AtomicBoolean cancel,
+                CdiAnalysisResult result );
+    }
+    
+    private static final List<FieldAnalyzer> ANALYZERS= new LinkedList<FieldAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new TypedFieldAnalyzer() );
+        ANALYZERS.add( new DelegateFieldAnalizer());
+        ANALYZERS.add( new ProducerFieldAnalyzer());
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldModelAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldModelAnalyzer.java
new file mode 100644
index 0000000000..e8f5ca6a8a
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/FieldModelAnalyzer.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.InjectionPointAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.ScopedFieldAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public class FieldModelAnalyzer implements ModelAnalyzer {
+
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            WebBeansModel model, AtomicBoolean cancel, 
+            Result result )
+    {
+        VariableElement var = (VariableElement) element;
+        if ( cancel.get()){
+            return;
+        }
+        TypeMirror varType = model.getCompilationController().getTypes().asMemberOf( 
+                (DeclaredType)parent.asType(),  var );
+        for (FieldAnalyzer analyzer : ANALYZERS) {
+            if ( cancel.get()){
+                return;
+            }
+            analyzer.analyze(var, varType, parent, model, cancel, result );
+        }
+    }
+    
+    public interface FieldAnalyzer {
+        void analyze( VariableElement element , TypeMirror elementType,
+                TypeElement parent, WebBeansModel model,
+                AtomicBoolean cancel, Result result );
+    }
+    
+    private static final List<FieldAnalyzer> ANALYZERS= new LinkedList<FieldAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new ScopedFieldAnalyzer() );
+        ANALYZERS.add( new InjectionPointAnalyzer());
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodElementAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodElementAnalyzer.java
new file mode 100644
index 0000000000..fd7e08f9cc
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodElementAnalyzer.java
@@ -0,0 +1,84 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.AnnotationsAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.DelegateMethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.ProducerMethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.TypedMethodAnalyzer;
+
+
+/**
+ * @author ads
+ *
+ */
+public class MethodElementAnalyzer implements ElementAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer#analyze(javax.lang.model.element.Element, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        ExecutableElement method = (ExecutableElement) element;
+        TypeMirror methodType = result.getInfo().getTypes().asMemberOf( 
+                (DeclaredType)parent.asType(),  method );
+        if ( methodType instanceof ExecutableType ){
+            if ( cancel.get()){
+                return;
+            }
+            TypeMirror returnType = ((ExecutableType) methodType).getReturnType();
+            for (MethodAnalyzer analyzer : ANALYZERS) {
+                if ( cancel.get() ){
+                    return;
+                }
+                analyzer.analyze(method, returnType, parent, cancel, 
+                        result );
+            }
+        }
+    }
+    
+    public interface MethodAnalyzer {
+        void analyze( ExecutableElement element , TypeMirror returnType,
+                TypeElement parent, AtomicBoolean cancel , CdiAnalysisResult result );
+    }
+    
+    private static final List<MethodAnalyzer> ANALYZERS= new LinkedList<MethodAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new TypedMethodAnalyzer() );
+        ANALYZERS.add( new AnnotationsAnalyzer() );
+        ANALYZERS.add( new DelegateMethodAnalyzer() );
+        ANALYZERS.add( new ProducerMethodAnalyzer() );
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodModelAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodModelAnalyzer.java
new file mode 100644
index 0000000000..d8e96fe62d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/MethodModelAnalyzer.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.InjectionPointParameterAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.InterceptedMethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method.ScopedMethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+
+
+/**
+ * @author ads
+ *
+ */
+public class MethodModelAnalyzer implements ModelAnalyzer {
+
+    @Override
+    public void analyze( Element element, TypeElement parent,
+            WebBeansModel model, AtomicBoolean cancel, 
+            Result result )
+    {
+        ExecutableElement method = (ExecutableElement) element;
+        TypeMirror methodType = model.getCompilationController().getTypes().
+            asMemberOf( (DeclaredType)parent.asType(),  method );
+        if ( methodType instanceof ExecutableType ){
+            if ( cancel.get()){
+                return;
+            }
+            TypeMirror returnType = ((ExecutableType) methodType).getReturnType();
+            for (MethodAnalyzer analyzer : ANALYZERS) {
+                if ( cancel.get() ){
+                    return;
+                }
+                analyzer.analyze(method, returnType, parent, model, 
+                        cancel, result );
+            }
+        }
+    }
+    
+    public interface MethodAnalyzer {
+        void analyze( ExecutableElement element , TypeMirror returnType,
+                TypeElement parent, WebBeansModel model, 
+                AtomicBoolean cancel , Result result);
+    }
+    
+    private static final List<MethodAnalyzer> ANALYZERS= new LinkedList<MethodAnalyzer>(); 
+    
+    static {
+        ANALYZERS.add( new ScopedMethodAnalyzer() );
+        ANALYZERS.add( new InjectionPointParameterAnalyzer() );
+        ANALYZERS.add( new InterceptedMethodAnalyzer() );
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ModelAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ModelAnalyzer.java
new file mode 100644
index 0000000000..dda42f8759
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/ModelAnalyzer.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiEditorAnalysisFactory;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiEditorAwareJavaSourceTaskFactory;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.spi.editor.hints.ErrorDescription;
+import org.netbeans.spi.editor.hints.Severity;
+
+
+/**
+ * @author ads
+ *
+ */
+public interface ModelAnalyzer {
+    
+    void analyze( Element element , TypeElement parent, WebBeansModel model,
+            AtomicBoolean cancel, Result result );
+    
+    public class Result extends CdiAnalysisResult {
+        
+        public Result( CompilationInfo info , 
+                CdiEditorAwareJavaSourceTaskFactory factory )
+        {
+            super(info, factory);
+        }
+        
+        public void addNotification( Severity severity, Element element,
+                WebBeansModel model, String message )
+        {
+            ErrorDescription description = CdiEditorAnalysisFactory.
+                createNotification( severity, element, model, getInfo() , 
+                    message);
+            if ( description == null ){
+                return;
+            }
+            getProblems().add( description );            
+        }
+        
+        public void addNotification( Severity severity,
+                VariableElement element, ExecutableElement method,
+                WebBeansModel model, String message )
+        {
+            ErrorDescription description = CdiEditorAnalysisFactory.
+                createNotification( severity, element,method, model, getInfo() , 
+                message);
+            if ( description == null ){
+                return;
+            }
+            getProblems().add( description );              
+        }
+        
+        public void addError( Element element,
+                WebBeansModel model, String message )
+        {
+            addNotification(Severity.ERROR, element, model, message);          
+        }
+        
+        public void addError( VariableElement var, ExecutableElement element,
+                WebBeansModel model, String message )
+        {
+            addNotification(Severity.ERROR, var, element, model, message);                    
+        }
+        
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult#addError(javax.lang.model.element.Element, java.lang.String)
+         */
+        @Override
+        public void addError( Element subject, String message ) {
+            ErrorDescription description = CdiEditorAnalysisFactory.
+                createNotification( Severity.ERROR, subject, getInfo() , 
+                message);
+            if ( description == null ){
+                return;
+            }
+            getProblems().add( description );                
+        }
+        
+        public void requireCdiEnabled( Element element , WebBeansModel model){
+            ElementHandle<Element> handle = ElementHandle.create(element);
+            Element resolved = handle.resolve( getInfo() );
+            if ( resolved == null ){
+                return;
+            }
+            requireCdiEnabled( resolved );
+        }
+        
+        public void requireCdiEnabled( VariableElement element , 
+                ExecutableElement method ,WebBeansModel model)
+        {
+            VariableElement resolved = CdiEditorAnalysisFactory.
+                resolveParameter(element, method, getInfo());
+            if ( resolved == null ){
+                return;
+            }
+            requireCdiEnabled( resolved );
+        }
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/Bundle.properties
new file mode 100644
index 0000000000..d1b1b91098
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/Bundle.properties
@@ -0,0 +1,46 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ERR_NonEmptyNamedStereotype=A stereotype should not declare a non-empty @Named annotation. 
+ERR_IncorrectRuntimeRetention=The CDI annotation should be defined with @Retention(RUNTIME).
+ERR_NoTarget=The CDI annotation is defined with @{0} but has no @Target.
+ERR_NoRetention=The CDI annotation is defined with @{0} but has no @Retention.
+ERR_IncorrectScopeTarget=The CDI annotation is declared as Scope but has wrong target \
+value. Correct target values is '{METHOD, FIELD, TYPE'}.
+ERR_IncorrectInterceptorBindingTarget=The CDI Annotation is declared as Interceptor \
+Binding but it has wrong target values. Correct target values are '{METHOD, TYPE'} or TYPE. 
+ERR_IncorrectStereotypeTarget=The CDI Annotation is declared as Stereotype but it has \
+wrong target values. Correct target values are are '{METHOD, FIELD, TYPE'} or \
+'{METHOD, FIELD'} or TYPE or METHOD or FIELD.
+ERR_IncorrectQualifierTarget=The CDI Annotation is declared as Qualifier but it \
+has wrong target values. Correct target values are \
+'{METHOD, FIELD, PARAMETER, TYPE'} or '{FIELD, PARAMETER'}.
+ERR_IncorrectTargetWithInterceptorBindings=A stereotype with interceptor binding \
+declared must be defined as @Target(TYPE). 
+ERR_IncorrectTransitiveInterceptorBinding=Interceptor binding is defined as \
+@Target('{TYPE, METHOD'}) and declares interceptor binding {0} which is defined as \
+@Target(TYPE).
+ERR_IncorrectTransitiveTarget=Stereotypes @{0} declared @Target('{TYPE'}) and may not \
+be applied to stereotypes declared @Target('{TYPE, METHOD, FIELD'}), @Target('{METHOD'}), \
+@Target('{FIELD'}) or @Target('{METHOD, FIELD'}). 
+WARN_QualifiedStereotype=A stereotype should not declare any qualifier annotation \
+other than @Named. Otherwise non-portable behavior results.
+WARN_TypedStereotype=A stereotype should not be annotated @Typed. Otherwise non-portable behavior results.
+WARN_ArrayAnnotationValuedQualifierMember=Array-valued or annotation-valued members \
+of a qualifier type should be annotated @Nonbinding. Otherwise non-portable behavior results.
+WARN_ArrayAnnotationValuedIBindingMember=Array-valued or annotation-valued members of \
+an interceptor binding type should be annotated @Nonbinding. Otherwise non-portable behavior results.
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/CdiAnnotationAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/CdiAnnotationAnalyzer.java
new file mode 100644
index 0000000000..3f014c2274
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/CdiAnnotationAnalyzer.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+abstract class CdiAnnotationAnalyzer extends TargetAnalyzer {
+    
+    CdiAnnotationAnalyzer(TypeElement element, CdiAnalysisResult result ) 
+    {
+        init( element , result.getInfo() );
+        myResult =result;
+    }
+    
+    CdiAnnotationAnalyzer(TypeElement element, WebBeansModel model, 
+            CdiAnalysisResult result ) 
+    {
+        init( element , model.getCompilationController() );
+        myModel = model;
+        myResult =result;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.TargetAnalyzer#handleNoTarget()
+     */
+    @Override
+    protected void handleNoTarget() {
+        if ( myResult== null){
+            return;
+        }
+        Element subject = getElement();
+        if ( myModel != null ){
+            ElementHandle<Element> handle = ElementHandle.create( getElement());
+            subject = handle.resolve(getResult().getInfo());
+        }
+        if ( subject == null ){
+            return;
+        }
+        myResult.addError( subject, NbBundle.getMessage(ScopeAnalyzer.class, 
+                "ERR_NoTarget" ,   // NOI18N
+                            getCdiMetaAnnotation()));      
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.RuntimeRetentionAnalyzer#handleNoRetention()
+     */
+    @Override
+    protected void handleNoRetention() {
+        if ( myResult== null){
+            return;
+        }
+        Element subject = getElement();
+        if ( myModel != null ){
+            ElementHandle<Element> handle = ElementHandle.create( getElement());
+            subject = handle.resolve(getResult().getInfo());
+        }
+        if ( subject == null ){
+            return;
+        }
+        myResult.addError( subject, NbBundle.getMessage(ScopeAnalyzer.class, 
+                "ERR_NoRetention", // NOI18N
+                            getCdiMetaAnnotation()));      
+    }
+    
+    protected abstract String getCdiMetaAnnotation();
+    
+    protected CdiAnalysisResult getResult(){
+        return myResult;
+    }
+    
+    private WebBeansModel myModel;
+    private CdiAnalysisResult myResult;
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingAnalyzer.java
new file mode 100644
index 0000000000..acb4181c2b
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingAnalyzer.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationModelAnalyzer.AnnotationAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class InterceptorBindingAnalyzer implements AnnotationAnalyzer {
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationModelAnalyzer.AnnotationAnalyzer#analyze(javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.List, org.netbeans.api.java.source.CompilationInfo, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( TypeElement element, WebBeansModel model,
+            AtomicBoolean cancel ,
+            Result result )
+    {
+        if ( !AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.INTERCEPTOR_BINDING_FQN , model.getCompilationController()))
+        {
+            return;
+        }
+        result.requireCdiEnabled(element, model);
+        InterceptorTargetAnalyzer analyzer = new InterceptorTargetAnalyzer(
+                element, model, result );
+        if ( cancel.get() ){
+            return;
+        }
+        if (!analyzer.hasRuntimeRetention()) {
+            result.addError(element, model,   
+                            NbBundle.getMessage(InterceptorBindingAnalyzer.class,
+                                    INCORRECT_RUNTIME));
+        }
+        if ( cancel.get() ){
+            return;
+        }
+        if (!analyzer.hasTarget()) {
+            result.addError(element, model,   
+                            NbBundle.getMessage(InterceptorBindingAnalyzer.class,
+                            "ERR_IncorrectInterceptorBindingTarget")); // NOI18N
+        }
+        else {
+            if ( cancel.get() ){
+                return;
+            }
+            Set<ElementType> declaredTargetTypes = analyzer.getDeclaredTargetTypes();
+            if ( cancel.get() ){
+                return;
+            }
+            checkTransitiveInterceptorBindings( element, declaredTargetTypes, 
+                    model , result );
+        }
+    }
+    
+    private void checkTransitiveInterceptorBindings( TypeElement element,
+            Set<ElementType> declaredTargetTypes, WebBeansModel model,
+            Result result )
+    {
+        if (declaredTargetTypes == null || declaredTargetTypes.size() == 1) {
+            return;
+        }
+        Collection<AnnotationMirror> interceptorBindings = model
+                .getInterceptorBindings(element);
+        for (AnnotationMirror iBinding : interceptorBindings) {
+            Element binding = iBinding.getAnnotationType().asElement();
+            if (!(binding instanceof TypeElement)) {
+                continue;
+            }
+            Set<ElementType> bindingTargetTypes = TargetAnalyzer
+                    .getDeclaredTargetTypes(
+                            new AnnotationHelper(model
+                                    .getCompilationController()),
+                            (TypeElement) binding);
+            if (bindingTargetTypes.size() == 1
+                    && bindingTargetTypes.contains(ElementType.TYPE))
+            {
+                result.addError(element, model ,  
+                                NbBundle.getMessage(InterceptorBindingAnalyzer.class,
+                                        "ERR_IncorrectTransitiveInterceptorBinding", // NOI18N
+                                        ((TypeElement) binding).getQualifiedName().toString()));
+            }
+
+        }
+    }
+
+    private static class InterceptorTargetAnalyzer extends CdiAnnotationAnalyzer {
+        
+        InterceptorTargetAnalyzer( TypeElement element , WebBeansModel model ,
+                Result result)
+        {
+            super( element, model , result );
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.CdiAnnotationAnalyzer#getCdiMetaAnnotation()
+         */
+        @Override
+        protected String getCdiMetaAnnotation() {
+            return AnnotationUtil.INTERCEPTOR_BINDING;
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.TargetAnalyzer#getTargetVerifier()
+         */
+        @Override
+        protected TargetVerifier getTargetVerifier() {
+            return InterceptorBindingVerifier.getInstance();
+        }
+        
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingMembersAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingMembersAnalyzer.java
new file mode 100644
index 0000000000..30bb55d24b
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingMembersAnalyzer.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer;
+import org.openide.util.NbBundle;
+import org.netbeans.spi.editor.hints.Severity;
+
+
+
+/**
+ * @author ads
+ *
+ */
+public class InterceptorBindingMembersAnalyzer implements AnnotationAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer#analyze(javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult)
+     */
+    @Override
+    public void analyze( TypeElement element, AtomicBoolean cancel,
+            CdiAnalysisResult result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.INTERCEPTOR_BINDING_FQN, 
+                result.getInfo()))
+        {
+            checkMembers(element, result, NbBundle.getMessage(
+                    QualifierAnalyzer.class,  
+                    "WARN_ArrayAnnotationValuedIBindingMember"));      // NOI18N
+        }
+    }
+    
+    protected void checkMembers( TypeElement element, CdiAnalysisResult result , 
+            String localizedWarning ) 
+    {
+        List<ExecutableElement> methods = ElementFilter.methodsIn(
+                element.getEnclosedElements());
+        for (ExecutableElement executableElement : methods) {
+            TypeMirror returnType = executableElement.getReturnType();
+            boolean warning = false;
+            if ( returnType.getKind() == TypeKind.ARRAY ){
+                warning = true;
+            }
+            else if ( returnType.getKind() == TypeKind.DECLARED){
+                Element returnElement = result.getInfo().getTypes().asElement( 
+                        returnType );
+                warning = returnElement.getKind() == ElementKind.ANNOTATION_TYPE;
+            }
+            if ( !warning ){
+                continue;
+            }
+            if (AnnotationUtil.hasAnnotation(executableElement, 
+                    AnnotationUtil.NON_BINDING,  result.getInfo()) )
+            {
+                continue;
+            }
+            result.addNotification(Severity.WARNING, element, localizedWarning); 
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingVerifier.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingVerifier.java
new file mode 100644
index 0000000000..3cd27b778d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/InterceptorBindingVerifier.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+
+
+/**
+ * @author ads
+ *
+ */
+public class InterceptorBindingVerifier implements TargetVerifier {
+    
+    private InterceptorBindingVerifier(){
+    }
+    
+    private static final InterceptorBindingVerifier INSTANCE = 
+        new InterceptorBindingVerifier();
+    
+    public static InterceptorBindingVerifier getInstance(){
+        return INSTANCE;
+    }
+    
+    @Override
+    public boolean hasReqiredTarget( AnnotationMirror target , Set<ElementType>
+        targetTypes ) 
+    {
+        int sz = 1;
+        if(targetTypes.size()>0){
+            sz = targetTypes.size();
+            if(targetTypes.contains( ElementType.TYPE)){
+                sz--;
+            }
+            if ( targetTypes.contains( ElementType.METHOD)) {
+                sz--;
+            }
+            if (targetTypes.contains( ElementType.CONSTRUCTOR) )
+            {
+                sz--;
+            }
+        }
+        return sz==0;
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierAnalyzer.java
new file mode 100644
index 0000000000..169c61e35c
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierAnalyzer.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.openide.util.NbBundle;
+import org.netbeans.spi.editor.hints.Severity;
+
+
+/**
+ * @author ads
+ *
+ */
+public class QualifierAnalyzer extends InterceptorBindingMembersAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer#analyze(javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( TypeElement element, AtomicBoolean cancel,
+            CdiAnalysisResult result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.QUALIFIER_FQN, 
+                result.getInfo()))
+        {
+            result.requireCdiEnabled(element);
+            QualifierTargetAnalyzer analyzer = new QualifierTargetAnalyzer(element, 
+                    result );
+            if ( !analyzer.hasRuntimeRetention() ){
+                result.addError( element, 
+                        NbBundle.getMessage(QualifierTargetAnalyzer.class, 
+                                INCORRECT_RUNTIME));
+            }
+            if ( !analyzer.hasTarget()){
+                result.addError( element, 
+                            NbBundle.getMessage(QualifierTargetAnalyzer.class, 
+                                    "ERR_IncorrectQualifierTarget"));  // NOI18N
+            }
+            if ( cancel.get() ){
+                return;
+            }
+            checkMembers( element, result , NbBundle.getMessage(
+                    QualifierAnalyzer.class,  
+                        "WARN_ArrayAnnotationValuedQualifierMember"));  // NOI18N
+        }
+    }
+    
+    private static class QualifierTargetAnalyzer extends CdiAnnotationAnalyzer{
+
+        QualifierTargetAnalyzer( TypeElement element, CdiAnalysisResult result)
+        {
+            super(element, result);
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.CdiAnnotationAnalyzer#getCdiMetaAnnotation()
+         */
+        @Override
+        protected String getCdiMetaAnnotation() {
+            return AnnotationUtil.QUALIFIER;
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.TargetAnalyzer#getTargetVerifier()
+         */
+        @Override
+        protected TargetVerifier getTargetVerifier() {
+            return QualifierVerifier.getInstance( true );
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierVerifier.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierVerifier.java
new file mode 100644
index 0000000000..459977029d
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/QualifierVerifier.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+
+
+/**
+ * @author ads
+ *
+ */
+public class QualifierVerifier implements TargetVerifier {
+    
+    
+    private static final QualifierVerifier INSTANCE = new QualifierVerifier( false );
+    
+    private static final QualifierVerifier EVENT_INSTANCE = 
+            new QualifierVerifier( true );
+    
+    private QualifierVerifier(boolean event){
+        isEvent = event;
+    }
+    
+    public static QualifierVerifier getInstance( boolean event ){
+        if ( event ){
+            return EVENT_INSTANCE;
+        }
+        else {
+            return INSTANCE;
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.TargetVerifier#hasReqiredTarget(javax.lang.model.element.AnnotationMirror, java.util.Set)
+     */
+    @Override
+    public boolean hasReqiredTarget( AnnotationMirror target,
+            Set<ElementType> targetTypes )
+    {
+        boolean hasRequiredTarget = false;
+//        if ( isEvent() ){ TODO: any reason why it was different, ins specification event qualifier is just the same as usual, and example have 4 targets but it's just example? see #225556
+        //especially it was updated for evvents before but specification is new for all qualifiers. keep for now commented
+            boolean hasFieldParameterTarget = targetTypes.contains(
+                    ElementType.FIELD) &&
+                        targetTypes.contains(ElementType.PARAMETER);
+            if ( !hasFieldParameterTarget){
+                hasRequiredTarget = (targetTypes.size() == 1 && 
+                                        (targetTypes.contains(ElementType.TYPE) || 
+                                         targetTypes.contains(ElementType.METHOD) ||
+                                         targetTypes.contains(ElementType.FIELD))) ||
+                                    (targetTypes.size() == 2 && 
+                                         targetTypes.contains(ElementType.METHOD) &&
+                                         targetTypes.contains(ElementType.FIELD));//see #244059
+            }
+            else {
+                if ( targetTypes.size() == 2 ){
+                    hasRequiredTarget = true;
+                }
+                else {
+                    hasRequiredTarget = 
+                            (targetTypes.size() == 4 && 
+                                targetTypes.contains( ElementType.METHOD) &&
+                                targetTypes.contains( ElementType.TYPE)) || 
+                            (targetTypes.size() == 3 && 
+                                targetTypes.contains( ElementType.METHOD));
+                }
+            }
+//        }
+//        else {
+//            hasRequiredTarget = targetTypes.size() == 4 && 
+//                targetTypes.contains( ElementType.METHOD) &&
+//                        targetTypes.contains(ElementType.FIELD) &&
+//                            targetTypes.contains(ElementType.PARAMETER)&&
+//                                targetTypes.contains( ElementType.TYPE);
+//        }
+        
+        return hasRequiredTarget;
+    }
+    
+    private boolean isEvent(){
+        return isEvent;
+    }
+    
+    private boolean isEvent;
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/RuntimeRetentionAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/RuntimeRetentionAnalyzer.java
new file mode 100644
index 0000000000..8d297fab7f
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/RuntimeRetentionAnalyzer.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Map;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.parser.AnnotationParser;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class RuntimeRetentionAnalyzer {
+    
+    public void init( Element element, AnnotationHelper helper ) {
+        myHelper = helper;
+        myElement = element;
+    }
+    
+    public void init( Element element, CompilationInfo info  ) {
+        init( element , new AnnotationHelper(info));
+    }
+    
+    public boolean hasRuntimeRetention() {
+        Map<String, ? extends AnnotationMirror> types = getHelper()
+            .getAnnotationsByType(getElement().getAnnotationMirrors());
+        AnnotationMirror retention = types.get(Retention.class.getCanonicalName()); 
+        if ( retention == null ) {
+            handleNoRetention();
+            return false;
+        }
+
+        AnnotationParser parser = AnnotationParser.create(getHelper());
+        parser.expectEnumConstant(AnnotationUtil.VALUE, getHelper().resolveType(
+                RetentionPolicy.class.getCanonicalName()), null);
+        
+        String retentionPolicy = parser.parse(retention).get(AnnotationUtil.VALUE,
+                String.class);
+        return RetentionPolicy.RUNTIME.toString().equals(retentionPolicy);
+    }
+    
+    protected abstract void handleNoRetention();
+
+    protected Element getElement(){
+        return myElement;
+    }
+    
+    protected AnnotationHelper getHelper(){
+        return myHelper;
+    }
+    
+    private AnnotationHelper myHelper;
+    private Element myElement;
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeAnalyzer.java
new file mode 100644
index 0000000000..616fc5f8d7
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeAnalyzer.java
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ScopeAnalyzer implements AnnotationAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationElementAnalyzer.AnnotationAnalyzer#analyze(javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( TypeElement element, AtomicBoolean cancel,
+            CdiAnalysisResult result)
+    {
+        CompilationInfo compInfo = result.getInfo();
+        boolean isScope = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.SCOPE_FQN , compInfo);
+        boolean isNormalScope = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.NORMAL_SCOPE_FQN, compInfo);
+        if ( isScope || isNormalScope ){
+            result.requireCdiEnabled(element);
+            ScopeTargetAnalyzer analyzer = new ScopeTargetAnalyzer(element, 
+                    result, isNormalScope);
+            if ( cancel.get() ){
+                return;
+            }
+            if ( !analyzer.hasRuntimeRetention() ){
+                result.addError( element, 
+                            NbBundle.getMessage(ScopeAnalyzer.class, 
+                                    INCORRECT_RUNTIME));
+            }
+            if ( cancel.get() ){
+                return;
+            }
+            if ( !analyzer.hasTarget()){
+                result.addError( element, 
+                            NbBundle.getMessage(ScopeAnalyzer.class, 
+                                    "ERR_IncorrectScopeTarget"));                // NOI18N
+            }
+        }
+    }
+    
+    private static class ScopeTargetAnalyzer extends CdiAnnotationAnalyzer {
+        
+        ScopeTargetAnalyzer(TypeElement element, CdiAnalysisResult result, 
+                boolean normalScope )
+        {
+            super( element , result );
+            isNormalScope = normalScope;
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.TargetAnalyzer#getTargetVerifier()
+         */
+        @Override
+        protected TargetVerifier getTargetVerifier() {
+            return ScopeVerifier.getInstance();
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.CdiAnnotationAnalyzer#getCdiMetaAnnotation()
+         */
+        @Override
+        protected String getCdiMetaAnnotation() {
+            if ( isNormalScope ){
+                return AnnotationUtil.NORMAL_SCOPE;
+            }
+            else {
+                return AnnotationUtil.SCOPE;
+            }
+        }
+
+        private boolean isNormalScope; 
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeVerifier.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeVerifier.java
new file mode 100644
index 0000000000..a816832c59
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/ScopeVerifier.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ScopeVerifier implements TargetVerifier {
+    
+    private static final ScopeVerifier INSTANCE = new ScopeVerifier();
+    
+    private ScopeVerifier(  ){
+    }
+    
+    public static ScopeVerifier getInstance(){
+        return INSTANCE;
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.TargetVerifier#hasReqiredTarget(javax.lang.model.element.AnnotationMirror, java.util.Set)
+     */
+    @Override
+    public boolean hasReqiredTarget( AnnotationMirror target,
+            Set<ElementType> targetTypes )
+    {
+        boolean hasRequiredTarget = targetTypes.contains( 
+                ElementType.METHOD) &&
+                targetTypes.contains(ElementType.FIELD) &&
+                targetTypes.contains( ElementType.TYPE);
+        return hasRequiredTarget;
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeAnalyzer.java
new file mode 100644
index 0000000000..7135d923c8
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeAnalyzer.java
@@ -0,0 +1,262 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationModelAnalyzer.AnnotationAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.impl.model.WebBeansModelProviderImpl;
+import org.openide.util.NbBundle;
+import org.netbeans.spi.editor.hints.Severity;
+
+
+/**
+ * @author ads
+ *
+ */
+public class StereotypeAnalyzer extends AbstractScopedAnalyzer implements AnnotationAnalyzer {
+    
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationModelAnalyzer.AnnotationAnalyzer#analyze(javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.List, org.netbeans.api.java.source.CompilationInfo, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( TypeElement element, WebBeansModel model ,
+            AtomicBoolean cancel , 
+            Result result)
+    {
+        boolean isStereotype = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.STEREOTYPE_FQN, model.getCompilationController());
+        if ( !isStereotype ){
+            return;
+        }
+        result.requireCdiEnabled(element, model);
+        if ( cancel.get() ){
+            return;
+        }
+        analyzeScope((Element)element, model, cancel, result );
+        if (cancel.get() ){
+            return;
+        }
+        checkName( element, model, result );
+        if ( cancel.get() ){
+            return;
+        }
+        Set<ElementType> targets = checkDefinition( element , model, result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkInterceptorBindings( element , targets, model , result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkTransitiveStereotypes( element , targets, model , result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkTyped( element , model , result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkQualifers( element , model, result );
+    }
+
+    private void checkQualifers( TypeElement element, WebBeansModel model,
+            Result result )
+    {
+        List<AnnotationMirror> qualifiers = model.getQualifiers(element, true);
+        for (AnnotationMirror annotationMirror : qualifiers) {
+            Element annotation = annotationMirror.getAnnotationType().asElement();
+            if ( annotation instanceof TypeElement && 
+                    ((TypeElement)annotation).getQualifiedName().contentEquals( 
+                            AnnotationUtil.NAMED))
+            {
+                continue;
+            }
+            else {
+                result.addNotification( Severity.WARNING , element, model,  
+                        NbBundle.getMessage(StereotypeAnalyzer.class, 
+                                "WARN_QualifiedStereotype"));            // NOI18N
+                break;
+            }
+        }        
+    }
+
+    private void checkTyped( TypeElement element, WebBeansModel model,
+            Result result )
+    {
+        AnnotationMirror typed = AnnotationUtil.getAnnotationMirror(element, 
+                model.getCompilationController(), AnnotationUtil.TYPED);
+        if ( typed != null ){
+            result.addNotification( Severity.WARNING , element, model,  
+                    NbBundle.getMessage(StereotypeAnalyzer.class, 
+                            "WARN_TypedStereotype"));            // NOI18N
+        }
+    }
+
+    private void checkTransitiveStereotypes( TypeElement element,
+            final Set<ElementType> targets, WebBeansModel model,
+            Result result )
+    {
+        AnnotationHelper helper = new AnnotationHelper(
+                model.getCompilationController());
+        List<AnnotationMirror> stereotypes = WebBeansModelProviderImpl
+                .getAllStereotypes(element, helper);
+        for (AnnotationMirror stereotypeAnnotation : stereotypes) {
+            Element annotationElement = stereotypeAnnotation
+                    .getAnnotationType().asElement();
+            if (annotationElement instanceof TypeElement) {
+                TypeElement stereotype = (TypeElement) annotationElement;
+                Set<ElementType> declaredTargetTypes = TargetAnalyzer
+                        .getDeclaredTargetTypes(helper, stereotype);
+                if (declaredTargetTypes != null
+                        && declaredTargetTypes.size() == 1
+                        && declaredTargetTypes.contains(ElementType.TYPE))
+                {
+                    if (targets.size() == 1
+                            && targets.contains(ElementType.TYPE))
+                    {
+                        continue;
+                    }
+                    else {
+                        String fqn = stereotype.getQualifiedName().toString();
+                        result.addError(element, model,  
+                                        NbBundle.getMessage(
+                                                StereotypeAnalyzer.class,
+                                                "ERR_IncorrectTransitiveTarget",    // NOI18N
+                                                fqn));
+                    }
+                }
+            }
+        }
+    }
+
+    private void checkInterceptorBindings( TypeElement element,
+            Set<ElementType> targets, WebBeansModel model,
+            Result result )
+    {
+        if (targets == null) {
+            return;
+        }
+        if (targets.size() == 1 && targets.contains(ElementType.TYPE)) {
+            return;
+        }
+        int interceptorsCount = model.getInterceptorBindings(element).size();
+        if (interceptorsCount != 0) {
+            result.addError(element,model,  
+                            NbBundle.getMessage(StereotypeAnalyzer.class,
+                                    "ERR_IncorrectTargetWithInterceptorBindings")); // NOI18N
+        }
+    }
+
+    private Set<ElementType> checkDefinition( TypeElement element,
+            WebBeansModel model , Result result )
+    {
+        StereotypeTargetAnalyzer analyzer = new StereotypeTargetAnalyzer(element, 
+                model, result );
+        if ( !analyzer.hasRuntimeRetention()){
+            result.addError( element, model,   
+                    NbBundle.getMessage(StereotypeAnalyzer.class, 
+                            INCORRECT_RUNTIME));
+        }
+        if ( !analyzer.hasTarget()){
+            result.addError( element, model,   
+                        NbBundle.getMessage(StereotypeAnalyzer.class, 
+                                "ERR_IncorrectStereotypeTarget"));                // NOI18N
+            return null;
+        }
+        else {
+            return analyzer.getDeclaredTargetTypes();
+        }
+    }
+
+    private void checkName( TypeElement element, WebBeansModel model,
+            Result result  )
+    {
+        AnnotationMirror named = AnnotationUtil.getAnnotationMirror(element, 
+                AnnotationUtil.NAMED , model.getCompilationController());
+        if ( named == null ){
+            return;
+        }
+        Map<? extends ExecutableElement, ? extends AnnotationValue> members = 
+            named.getElementValues();
+        for (Entry<? extends ExecutableElement, ? extends AnnotationValue> entry: 
+            members.entrySet()) 
+        {
+            ExecutableElement member = entry.getKey();
+            if ( member.getSimpleName().contentEquals(AnnotationUtil.VALUE)){ 
+                result.addError( element, model,  
+                    NbBundle.getMessage(StereotypeAnalyzer.class, 
+                            "ERR_NonEmptyNamedStereotype"));            // NOI18N
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer#checkScope(javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     */
+    @Override
+    protected void checkScope( TypeElement scopeElement, Element element,
+            WebBeansModel model, AtomicBoolean cancel , Result result )
+    {
+    }
+
+    private static class StereotypeTargetAnalyzer extends CdiAnnotationAnalyzer{
+
+        StereotypeTargetAnalyzer( TypeElement element, WebBeansModel model,
+                Result result )
+        {
+            super(element, model, result );
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.CdiAnnotationAnalyzer#getCdiMetaAnnotation()
+         */
+        @Override
+        protected String getCdiMetaAnnotation() {
+            return AnnotationUtil.STEREOTYPE;
+        }
+
+        /* (non-Javadoc)
+         * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.annotation.TargetAnalyzer#getTargetVerifier()
+         */
+        @Override
+        protected TargetVerifier getTargetVerifier() {
+            return StereotypeVerifier.getInstance();
+        }
+        
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeVerifier.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeVerifier.java
new file mode 100644
index 0000000000..f017ff6d47
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/StereotypeVerifier.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+
+
+/**
+ * @author ads
+ *
+ */
+public class StereotypeVerifier implements TargetVerifier {
+    
+    private static final StereotypeVerifier INSTANCE = new StereotypeVerifier();
+    
+    private StereotypeVerifier(){
+    }
+    
+    public static StereotypeVerifier getInstance(){
+        return INSTANCE;
+    }
+    
+    @Override
+    public boolean hasReqiredTarget( AnnotationMirror target,
+            Set<ElementType> targetTypes ) 
+    {
+        boolean hasRequiredTarget = false;
+        if ( targetTypes.contains( ElementType.METHOD) &&
+                targetTypes.contains(ElementType.FIELD) &&
+                targetTypes.contains( ElementType.TYPE)
+                        && targetTypes.size() == 3)
+        {
+            hasRequiredTarget = true;
+        }
+        else if ( targetTypes.size() == 2 && 
+                targetTypes.contains( ElementType.METHOD) &&
+                targetTypes.contains(ElementType.FIELD))
+        {
+            hasRequiredTarget = true;
+        }
+        else if ( targetTypes.size() == 1 ){
+            hasRequiredTarget = targetTypes.contains( ElementType.METHOD) ||
+            targetTypes.contains( ElementType.FIELD) ||
+            targetTypes.contains( ElementType.TYPE);
+        }
+        return hasRequiredTarget;
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetAnalyzer.java
new file mode 100644
index 0000000000..91add8f988
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetAnalyzer.java
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.TypeElement;
+
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.parser.AnnotationParser;
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.parser.ArrayValueHandler;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+
+
+/**
+ * @author ads
+ *
+ */
+public abstract class TargetAnalyzer extends RuntimeRetentionAnalyzer 
+    implements TargetVerifier 
+{
+
+    public boolean hasTarget() {
+        Map<String, ? extends AnnotationMirror> types = getHelper()
+                .getAnnotationsByType(getElement().getAnnotationMirrors());
+        AnnotationMirror target = types.get(Target.class.getCanonicalName());
+        if (target == null) {
+            handleNoTarget();
+        }
+        return hasReqiredTarget( target , getDeclaredTargetTypes( getHelper(), 
+                target ));
+    }
+    
+    public Set<ElementType> getDeclaredTargetTypes() {
+        Map<String, ? extends AnnotationMirror> types = getHelper()
+                .getAnnotationsByType(getElement().getAnnotationMirrors());
+        AnnotationMirror target = types.get(Target.class.getCanonicalName());
+        if (target == null) {
+            return Collections.emptySet();
+        }
+        return getDeclaredTargetTypes( getHelper(), target );
+    }
+    
+    public static Set<ElementType> getDeclaredTargetTypes( 
+            AnnotationHelper helper, TypeElement element ) 
+    {
+        Map<String, ? extends AnnotationMirror> types = helper
+                .getAnnotationsByType(element.getAnnotationMirrors());
+        AnnotationMirror target = types.get(Target.class.getCanonicalName());
+        if (target == null) {
+            return Collections.emptySet();
+        }
+        return getDeclaredTargetTypes( helper, target );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.TargetVerifier#hasReqiredTarget(javax.lang.model.element.AnnotationMirror, java.util.Set)
+     */
+    @Override
+    public boolean hasReqiredTarget( AnnotationMirror target, 
+            Set<ElementType> set ) 
+    {
+        return getTargetVerifier().hasReqiredTarget(target, set );
+    }
+    
+    protected abstract TargetVerifier getTargetVerifier();
+
+    protected abstract void handleNoTarget();
+    
+    private static Set<ElementType> getDeclaredTargetTypes(
+            AnnotationHelper helper, AnnotationMirror target)
+    {
+        AnnotationParser parser = AnnotationParser.create(helper);
+        final Set<String> elementTypes = new HashSet<String>();
+        parser.expectEnumConstantArray( AnnotationUtil.VALUE, 
+                helper.resolveType(
+                ElementType.class.getCanonicalName()), 
+                new ArrayValueHandler() {
+                    
+                    @Override
+                    public Object handleArray( List<AnnotationValue> arrayMembers ) {
+                        for (AnnotationValue arrayMember : arrayMembers) {
+                            String value = arrayMember.getValue().toString();
+                            elementTypes.add(value);
+                        }
+                        return null;
+                    }
+                } , null);
+        
+        parser.parse( target );
+        Set<ElementType> result = new HashSet<ElementType>();
+        for (String type : elementTypes) {
+            ElementType elementType = ElementType.valueOf(ElementType.class, type);
+            result.add( elementType );
+        }
+        return result;
+    }
+
+}
diff --git a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetVerifier.java
similarity index 56%
copy from enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetVerifier.java
index eacb14f446..00ad26e90f 100644
--- a/enterprise/web.jsfapi/src/org/netbeans/modules/web/jsfapi/api/JsfSupport.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/annotation/TargetVerifier.java
@@ -16,35 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation;
 
-package org.netbeans.modules.web.jsfapi.api;
+import java.lang.annotation.ElementType;
+import java.util.Set;
+
+import javax.lang.model.element.AnnotationMirror;
 
-import java.util.Map;
-import org.netbeans.api.java.classpath.ClassPath;
-import org.netbeans.api.project.Project;
-import org.netbeans.modules.web.api.webmodule.WebModule;
-import org.openide.util.Lookup;
 
 /**
+ * @author ads
  *
- * @author marekfukala
  */
-public interface JsfSupport {
-
-    public Project getProject();
-
-    public ClassPath getClassPath();
-
-    public WebModule getWebModule();
-
-    public Library getLibrary(String namespace);
+public interface TargetVerifier {
     
-    /**
-     * @return Library namespace to Library instance map
-     */
-    public Map<String, ? extends Library> getLibraries();
+    boolean hasReqiredTarget(AnnotationMirror target, Set<ElementType> targetTypes);
     
-    public Lookup getLookup();
-
-    public boolean isJsf22Plus();
 }
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/Bundle.properties
new file mode 100644
index 0000000000..60bbef26f1
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/Bundle.properties
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ERR_BadRestritedFieldType=Field\'s bean class specifies @Typed annotation, \
+and the value member specifies a class which does not correspond to a type in \
+the unrestricted set of bean types of a bean. 
+ERR_DelegateHasNoInject=Field is declared as @Delegate but it is not an injection point. 
+ERR_DelegateIsNotInDecorator=Field is declared as @Delegate but its enclosing \
+type element is not a decorator. 
+ERR_NonStaticProducerSessionBean=A producer field must be a static field of the \
+session bean class. 
+
+ERR_ProducerHasTypeVar=A producer field type should not be a type variable.
+ERR_ProducerHasWildcard=A producer field type should not contain a wildcard type parameter.
+
+ERR_WrongScopeParameterizedProducer=The producer field has parameterized type \
+with a type variable and has scope {0} (should be @Dependent). 
+
+ERR_WrongQualifierInjectionPointMeta=An injection point has type InjectionPoint \
+and qualifier @Default but bean declares not @Dependent scope. 
+
+ERR_DelegateTypeHasNoDecoratedType=The delegate type of a decorator must implement \
+or extend every decorated type of decorator. 
+
+ERR_FinalDecoratedBean=Delegate injection point matches a managed bean {0} \
+which class is declared final.
+
+ERR_FinalMethodDecoratedBean=Delegate injection point matches a managed bean {0} \
+with final method {1} which is implemented by decorator.
+
+WARN_NamedInjectionPoint=The use of @Named as an injection point qualifier is not recommended.
+
+ERR_NotPassivationProducer=Producer field has a passivating scope {0} and should be \
+passivation capable. But its type is declared final and does not implement Serializable. 
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/DelegateFieldAnalizer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/DelegateFieldAnalizer.java
new file mode 100644
index 0000000000..a3169a7de8
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/DelegateFieldAnalizer.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class DelegateFieldAnalizer implements FieldAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer#analyze(javax.lang.model.element.VariableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( VariableElement element, TypeMirror elementType,
+            TypeElement parent, AtomicBoolean cancel,
+            CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        if (!AnnotationUtil.hasAnnotation(element, AnnotationUtil.DELEGATE_FQN, 
+                compInfo))
+        {
+            return;
+        }
+        result.requireCdiEnabled(element);
+        if (!AnnotationUtil.hasAnnotation(element, AnnotationUtil.INJECT_FQN,
+                compInfo))
+        {
+            result.addError(element,  NbBundle.getMessage(
+                            DelegateFieldAnalizer.class,
+                            "ERR_DelegateHasNoInject"));        // NOI18N
+        }
+        Element clazz = element.getEnclosingElement();
+        if (!AnnotationUtil.hasAnnotation(clazz, AnnotationUtil.DECORATOR,
+                compInfo))
+        {
+            result.addError(element,  NbBundle.getMessage(
+                            DelegateFieldAnalizer.class,
+                            "ERR_DelegateIsNotInDecorator"));   // NOI18N
+        }
+        EditorAnnotationsHelper helper = EditorAnnotationsHelper.getInstance(
+                result);
+        if ( helper != null ){
+            helper.addDelegate(result, element );
+        }
+        if ( cancel.get()){
+            return;
+        }
+        checkDelegateType(element, elementType, parent, result );
+    }
+
+    private void checkDelegateType( VariableElement element,
+            TypeMirror elementType, TypeElement parent,
+            CdiAnalysisResult result  )
+    {
+        Collection<TypeMirror> decoratedTypes = getDecoratedTypes( parent , 
+                result.getInfo() );
+        for (TypeMirror decoratedType : decoratedTypes) {
+            if ( !result.getInfo().getTypes().isSubtype( elementType,decoratedType )){
+                result.addError(element, NbBundle.getMessage(
+                        DelegateFieldAnalizer.class,
+                        "ERR_DelegateTypeHasNoDecoratedType"));   // NOI18N
+                return;
+            }
+        }
+    }
+
+    public static Collection<TypeMirror> getDecoratedTypes( TypeElement element , 
+            CompilationInfo info ) 
+    {
+        TypeElement serializable = info.getElements().getTypeElement(
+                Serializable.class.getCanonicalName());
+        Collection<TypeMirror> result = new LinkedList<TypeMirror>();
+        collectDecoratedTypes( element.asType() , result , serializable, info );
+        return result;
+    }
+
+    private static void collectDecoratedTypes( TypeMirror type,
+            Collection<TypeMirror> result, TypeElement serializable, 
+            CompilationInfo info)
+    {
+        List<? extends TypeMirror> directSupertypes = info.getTypes().
+            directSupertypes(type);
+        for (TypeMirror superType : directSupertypes) {
+            Element element = info.getTypes().asElement(superType);
+            if( element == null || element.equals( serializable)  )
+            {
+                continue;
+            }
+            if ( element.getKind() == ElementKind.INTERFACE ){
+                result.add( superType );
+            }
+            collectDecoratedTypes(superType, result, serializable, info);
+        }
+    }
+
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java
similarity index 80%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java
index ddd0a97c6d..bb3a48bde1 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/InjectionPointAnalyzer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.web.beans.analysis.analyzer.field;
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field;
 
 import java.io.IOException;
 import java.util.List;
@@ -32,16 +32,16 @@ import javax.swing.text.Document;
 
 import org.netbeans.api.java.source.ElementHandle;
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
-import org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer;
-import org.netbeans.modules.web.beans.analysis.analyzer.AnnotationUtil;
-import org.netbeans.modules.web.beans.analysis.analyzer.FieldModelAnalyzer.FieldAnalyzer;
-import org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result;
-import org.netbeans.modules.web.beans.api.model.CdiException;
-import org.netbeans.modules.web.beans.api.model.DependencyInjectionResult;
-import org.netbeans.modules.web.beans.api.model.DependencyInjectionResult.ResultKind;
-import org.netbeans.modules.web.beans.api.model.InjectionPointDefinitionError;
-import org.netbeans.modules.web.beans.api.model.WebBeansModel;
-import org.netbeans.modules.web.beans.hints.EditorAnnotationsHelper;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldModelAnalyzer.FieldAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.CdiException;
+import org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult;
+import org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult.ResultKind;
+import org.netbeans.modules.jakarta.web.beans.api.model.InjectionPointDefinitionError;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
 import org.netbeans.spi.editor.hints.Severity;
 import org.openide.util.NbBundle;
 
@@ -53,7 +53,7 @@ import org.openide.util.NbBundle;
 public class InjectionPointAnalyzer extends AbstractDecoratorAnalyzer<Void> implements FieldAnalyzer {
     
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.FieldModelAnalyzer.FieldAnalyzer#analyze(javax.lang.model.element.VariableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.web.beans.api.model.WebBeansModel, java.util.List, org.netbeans.api.java.source.CompilationInfo, java.util.concurrent.atomic.AtomicBoolean)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldModelAnalyzer.FieldAnalyzer#analyze(javax.lang.model.element.VariableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.List, org.netbeans.api.java.source.CompilationInfo, java.util.concurrent.atomic.AtomicBoolean)
      */
     @Override
     public void analyze( final VariableElement element, TypeMirror elementType,
@@ -132,7 +132,7 @@ public class InjectionPointAnalyzer extends AbstractDecoratorAnalyzer<Void> impl
     }
 
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addClassError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, org.netbeans.modules.web.beans.api.model.WebBeansModel, org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addClassError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
      */
     @Override
     protected void addClassError( VariableElement element, Void fake, 
@@ -145,7 +145,7 @@ public class InjectionPointAnalyzer extends AbstractDecoratorAnalyzer<Void> impl
     }
     
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addMethodError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.web.beans.api.model.WebBeansModel, org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addMethodError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
      */
     @Override
     protected void addMethodError( VariableElement element, Void fake,
@@ -182,7 +182,7 @@ public class InjectionPointAnalyzer extends AbstractDecoratorAnalyzer<Void> impl
         Map<String, ? extends AnnotationMirror> qualifiersFqns = helper.
             getAnnotationsByType(qualifiers);
         boolean hasDefault = model.hasImplicitDefaultQualifier( element );
-        if ( !hasDefault && qualifiersFqns.containsKey(AnnotationUtil.DEFAULT_FQN)){
+        if ( !hasDefault && qualifiersFqns.keySet().contains(AnnotationUtil.DEFAULT_FQN)){
             hasDefault = true;
         }
         if ( !hasDefault || cancel.get() ){
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ProducerFieldAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ProducerFieldAnalyzer.java
new file mode 100644
index 0000000000..f2d3cbcd32
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ProducerFieldAnalyzer.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field;
+
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractProducerAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ProducerFieldAnalyzer extends AbstractProducerAnalyzer 
+    implements FieldAnalyzer 
+{
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer#analyze(javax.lang.model.element.VariableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( VariableElement element, TypeMirror elementType,
+            TypeElement parent, AtomicBoolean cancel,
+            CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        if  ( !AnnotationUtil.hasAnnotation(element, AnnotationUtil.PRODUCES_FQN, 
+                compInfo ))
+        {
+            return;
+        }
+        result.requireCdiEnabled(element);
+        if ( cancel.get() ){
+            return;
+        }
+        checkSessionBean( element , parent , result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkType( element, elementType, result );
+    }
+
+    @Override
+    protected void hasTypeVar( Element element, TypeMirror type,
+            CdiAnalysisResult result  )
+    {
+        result.addError( element, NbBundle.getMessage(
+                            ProducerFieldAnalyzer.class, "ERR_ProducerHasTypeVar"));    // NOI18N
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractProducerAnalyzer#hasWildCard(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, org.netbeans.api.java.source.CompilationInfo, java.util.List)
+     */
+    @Override
+    protected void hasWildCard( Element element, TypeMirror type,
+            CdiAnalysisResult result )
+    {
+        result.addError(element,  NbBundle.getMessage(
+                    ProducerFieldAnalyzer.class,"ERR_ProducerHasWildcard")); // NOI18N
+    }
+
+    private void checkSessionBean( VariableElement element, TypeElement parent,
+            CdiAnalysisResult result  )
+    {
+        if ( !AnnotationUtil.isSessionBean( parent , result.getInfo())) {
+            return;
+        }
+        Set<Modifier> modifiers = element.getModifiers();
+        if ( !modifiers.contains(Modifier.STATIC)){
+            result.addError( element,  NbBundle.getMessage(
+                    ProducerFieldAnalyzer.class, 
+                    "ERR_NonStaticProducerSessionBean"));    // NOI18N
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ScopedFieldAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ScopedFieldAnalyzer.java
new file mode 100644
index 0000000000..e59eb61823
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/ScopedFieldAnalyzer.java
@@ -0,0 +1,110 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldModelAnalyzer.FieldAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ScopedFieldAnalyzer extends AbstractScopedAnalyzer implements
+        FieldAnalyzer
+{
+
+    @Override
+    public void analyze( VariableElement element, TypeMirror elementType,
+            TypeElement parent, WebBeansModel model,
+            AtomicBoolean cancel, Result result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.PRODUCES_FQN, 
+                model.getCompilationController()))
+        {
+            result.requireCdiEnabled(element, model);
+            analyzeScope(element, model, cancel , result );
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer#checkScope(javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     */
+    @Override
+    protected void checkScope( TypeElement scopeElement, Element element,
+            WebBeansModel model, AtomicBoolean cancel, Result result  )
+    {
+        if ( scopeElement.getQualifiedName().contentEquals( AnnotationUtil.DEPENDENT)){
+            return;
+        }
+        if ( cancel.get() ){
+            return;
+        }
+        if (hasTypeVarParameter(element.asType())) {
+            result.addError(element, model, 
+                            NbBundle.getMessage(
+                            ScopedFieldAnalyzer.class,
+                            "ERR_WrongScopeParameterizedProducer", // NOI18N
+                            scopeElement.getQualifiedName().toString()));
+        }
+        if ( cancel.get() ){
+            return;
+        }
+        checkPassivationCapable(scopeElement, element, model, result);
+    }
+    
+    private void checkPassivationCapable( TypeElement scopeElement,
+            Element element, WebBeansModel model, Result result )
+    {
+        if ( !isPassivatingScope(scopeElement, model) ){
+            return;
+        }
+        TypeMirror type = element.asType();
+        if ( type.getKind().isPrimitive() ){
+            return;
+        }
+        if ( isSerializable(type, model)){
+            return;
+        }
+        Element typeElement = model.getCompilationController().getTypes().
+            asElement( type );
+        if ( typeElement == null ){
+            return;
+        }
+        if ( typeElement.getModifiers().contains( Modifier.FINAL )){
+            result.addError( element, model,   
+                    NbBundle.getMessage(ScopedFieldAnalyzer.class, 
+                            "ERR_NotPassivationProducer",    // NOI18N
+                            scopeElement.getQualifiedName().toString()));
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/TypedFieldAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/TypedFieldAnalyzer.java
new file mode 100644
index 0000000000..4a1f3d8025
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/field/TypedFieldAnalyzer.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class TypedFieldAnalyzer extends AbstractTypedAnalyzer implements FieldAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.FieldElementAnalyzer.FieldAnalyzer#analyze(javax.lang.model.element.VariableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( VariableElement element, TypeMirror elementType,
+            TypeElement parent, AtomicBoolean cancel,
+            CdiAnalysisResult result  )
+    {
+        analyze(element, elementType, cancel , result );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer#addError(javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void addError( Element element, CdiAnalysisResult result  )
+    {
+        result.addError( element, NbBundle.getMessage(
+                TypedFieldAnalyzer.class, "ERR_BadRestritedFieldType"));        // NOI18N
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer#checkSpecializes(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, java.util.List, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void checkSpecializes( Element element, TypeMirror elementType,
+            List<TypeMirror> restrictedTypes, AtomicBoolean cancel , CdiAnalysisResult result)
+    {
+        // production fields cannot be specialized
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/AnnotationsAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/AnnotationsAnalyzer.java
new file mode 100644
index 0000000000..d5ad97284c
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/AnnotationsAnalyzer.java
@@ -0,0 +1,242 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.TypeVariable;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class AnnotationsAnalyzer implements MethodAnalyzer {
+    
+    private static final String EJB = "ejb";            // NOI18N
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent, AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        checkProductionObserverDisposerInject( element , parent , 
+                cancel , result );
+        if ( cancel.get()){
+            return;
+        }
+    }
+
+    private void checkProductionObserverDisposerInject(
+            ExecutableElement element, TypeElement parent, AtomicBoolean cancel ,
+            CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        boolean isProducer = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.PRODUCES_FQN, compInfo);
+        boolean isInitializer = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.INJECT_FQN, compInfo);
+        int observesCount = 0;
+        int disposesCount = 0;
+        List<? extends VariableElement> parameters = element.getParameters();
+        for (VariableElement param : parameters) {
+            if ( cancel.get() ){
+                return;
+            }
+            if ( AnnotationUtil.hasAnnotation( param, AnnotationUtil.OBSERVES_FQN, 
+                    compInfo))
+            {
+                observesCount++;
+            }
+            if ( AnnotationUtil.hasAnnotation( param, AnnotationUtil.DISPOSES_FQN, 
+                    compInfo))
+            {
+                disposesCount++;
+            }
+        }
+        if ( observesCount >0 ){
+            EditorAnnotationsHelper helper = EditorAnnotationsHelper.getInstance(result);
+            if ( helper != null ){
+                helper.addObserver( result , element );
+            }
+        }
+        String firstAnnotation = null;
+        String secondAnnotation = null;
+        if ( isProducer ){
+            firstAnnotation = AnnotationUtil.PRODUCES;
+            if ( isInitializer ){
+                secondAnnotation = AnnotationUtil.INJECT;
+            }
+            else if ( observesCount >0 ){
+                secondAnnotation = AnnotationUtil.OBSERVES;
+            }
+            else if ( disposesCount >0 ){
+                secondAnnotation = AnnotationUtil.DISPOSES;
+            }
+        }
+        else if ( isInitializer ){
+            firstAnnotation = AnnotationUtil.INJECT;
+            if ( observesCount >0 ){
+                secondAnnotation = AnnotationUtil.OBSERVES;
+            }
+            else if ( disposesCount >0 ){
+                secondAnnotation = AnnotationUtil.DISPOSES;
+            }
+        }
+        else if ( observesCount >0 ){
+            firstAnnotation = AnnotationUtil.OBSERVES;
+            if ( disposesCount >0 ){
+                secondAnnotation = AnnotationUtil.DISPOSES;
+            }
+        }
+        if ( firstAnnotation != null && secondAnnotation != null  ){
+            result.addError( element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class, "ERR_BothAnnotationsMethod", // NOI18N
+                    firstAnnotation, secondAnnotation ));
+        }
+        
+        // Test quantity of observer parameters
+        if ( observesCount > 1){
+            result.addError( element, NbBundle.getMessage(
+                AnnotationsAnalyzer.class, "ERR_ManyObservesParameter" ));   // NOI18N
+        }
+        // Test quantity of disposes parameters
+        else if ( disposesCount >1 ){
+            result.addError( element, NbBundle.getMessage(
+                AnnotationsAnalyzer.class, "ERR_ManyDisposesParameter"));    // NOI18N
+        }
+        
+        // A producer/disposer method must be a non-abstract method . 
+        checkAbstractMethod(element, result, isProducer,
+                disposesCount>0);
+        
+        checkBusinessMethod( element , result, isProducer, 
+                disposesCount >0 , observesCount > 0);
+        
+        if ( isInitializer ){
+            checkInitializerMethod(element, parent , result );
+        }
+    }
+
+    /**
+     *  A producer/disposer/observer non-static method of a session bean class 
+     *  should be a business method of the session bean.
+     */
+    private void checkBusinessMethod( ExecutableElement element,
+            CdiAnalysisResult result ,boolean isProducer, boolean isDisposer, boolean isObserver )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        if ( !isProducer && !isDisposer && !isObserver ){
+            return;
+        }
+        Set<Modifier> modifiers = element.getModifiers();
+        if ( modifiers.contains(Modifier.STATIC) ){
+            return;
+        }
+        TypeElement containingClass = compInfo.getElementUtilities().
+            enclosingTypeElement(element);
+        if ( !AnnotationUtil.isSessionBean( containingClass, compInfo) ){
+            return;
+        }
+        String methodName = element.getSimpleName().toString();
+        boolean isBusinessMethod = true;
+        if ( methodName.startsWith(EJB)){
+            isBusinessMethod = false;
+        }
+        if (AnnotationUtil.isLifecycleCallback(element, compInfo)){
+            isBusinessMethod = false;
+        }
+        if ( modifiers.contains(Modifier.FINAL) ||
+                !modifiers.contains( Modifier.PUBLIC) )
+        {
+            isBusinessMethod = false;
+        }
+        if ( !isBusinessMethod ){
+            String key = null;
+            if ( isProducer ){
+                key = "ERR_ProducerNotBusiness";         // NOI18N
+            }
+            else if ( isDisposer ){
+                key = "ERR_DisposerNotBusiness";         // NOI18N
+            }
+            else if ( isObserver ){
+                key = "ERR_ObserverNotBusiness";         // NOI18N
+            }
+            result.addError( element, NbBundle.getMessage(
+                AnnotationsAnalyzer.class, key)); 
+        }
+    }
+
+    private void checkInitializerMethod( ExecutableElement element, 
+            TypeElement parent, CdiAnalysisResult result )
+    {
+        Set<Modifier> modifiers = element.getModifiers();
+        boolean isAbstract = modifiers.contains( Modifier.ABSTRACT );
+        boolean isStatic = modifiers.contains( Modifier.STATIC );
+        if (  isAbstract || isStatic ){
+            String key = isAbstract? "ERR_AbstractInitMethod":
+                "ERR_StaticInitMethod";           // NOI18N
+            result.addError( element, NbBundle.getMessage(
+                AnnotationsAnalyzer.class, key ));
+        }    
+        TypeMirror method = result.getInfo().getTypes().asMemberOf(
+                (DeclaredType)parent.asType() , element);
+        if ( method instanceof ExecutableType ){
+            List<? extends TypeVariable> typeVariables = 
+                ((ExecutableType)method).getTypeVariables();
+            if ( typeVariables != null && typeVariables.size() > 0 ){
+                result.addError( element, NbBundle.getMessage(
+                            AnnotationsAnalyzer.class, "ERR_GenericInitMethod" ));// NOI18N
+            }
+        }
+    }
+
+    private void checkAbstractMethod( ExecutableElement element,
+            CdiAnalysisResult result ,boolean isProducer, boolean isDisposer )
+    {
+        if ( isProducer || isDisposer ){
+            String key = isProducer? "ERR_AbstractProducerMethod":
+                "ERR_AbstractDisposerMethod";           // NOI18N
+            Set<Modifier> modifiers = element.getModifiers();
+            if ( modifiers.contains( Modifier.ABSTRACT )){
+                result.addError( element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class, key ));
+            }
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/Bundle.properties
new file mode 100644
index 0000000000..aee689a71b
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/Bundle.properties
@@ -0,0 +1,87 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ERR_BadRestritedMethodType=Bean class of method return type specifies @Typed \
+annotation, and the value member specifies a class which does not correspond \
+to a type in the unrestricted set of bean types of a bean. 
+ERR_BothAnnotationsMethod=The method has both {0} and {1} annotations.
+ERR_ManyObservesParameter=An observer method should have only one parameter \
+annotated by @Observes.
+ERR_ManyDisposesParameter=A disposer method should have only one parameter \
+annotated by @Disposes.
+ERR_AbstractProducerMethod=A producer method must be a non-abstract method of a \
+managed bean class or session bean class. 
+ERR_AbstractDisposerMethod=A disposer method must be a non-abstract method of a \
+managed bean class or session bean class.
+ERR_WrongDelegateMethod=A delegate injection point must be initializer method \
+parameter or bean constructor method parameter. 
+ERR_DelegateIsNotInDecorator=Parameter is declared as @Delegate but its enclosing \
+type element is not a decorator. 
+ERR_FinalInterceptedMethod=The non-static, non-private method of a bean class of a \
+managed bean is final and declares a method level interceptor binding.
+ERR_FinalInterceptedClass=The non-static, non-private method of a final bean class of a \
+managed bean declares a method level interceptor binding.
+
+ERR_ProducerReturnIsTypeVar=A producer method return type should not be a type variable. 
+ERR_ProducerReturnHasWildcard=A producer method return type should not contain a wildcard type parameter.
+
+ERR_WrongScopeParameterizedProducerReturn=The producer method return type is a \
+parameterized type with a type variable and has scope {0} (should be @Dependent).
+ERR_StaticSpecializesProducer=A producer method annotated with @Specializes must be non-static.
+ERR_NoDirectSpecializedProducer=A producer method annotated with @Specializes must \
+directly override another producer method.
+
+ERR_AbstractInitMethod=An initializer method should be a non-abstract.
+ERR_StaticInitMethod=An initializer method should be a non-static.
+ERR_GenericInitMethod=An initializer method should not be a generic.
+
+ERR_ParameterNamedInjectionPoint=An injection point has a @Named annotation \
+without value member specified.
+
+ERR_WrongQualifierInjectionPointMeta=An injection point has type InjectionPoint \
+and qualifier @Default but bean declares not @Dependent scope. 
+
+ERR_BadSpecializesMethod=Method specializes another method but its bean type does \
+not have all bean types of specialized method. 
+
+ERR_FinalDecoratedBean=Delegate injection point matches a managed bean {0} which \
+class is declared final.
+ERR_FinalMethodDecoratedBean=Delegate injection point matches a managed bean {0} \
+with final method {1} which is implemented by decorator.
+ERR_DelegateTypeHasNoDecoratedType=The delegate type of a decorator must implement \
+or extend every decorated type of decorator.
+
+WARN_CallbackInterceptorBinding=Interceptor bindings for lifecycle callback methods \
+includes only the interceptor bindings declared or inherited by the bean at the class \
+level.
+ERR_LifecycleInterceptorTarget=An interceptor for lifecycle callbacks may only \
+declare interceptor binding types that are defined as @Target(TYPE). Interceptor {0} \
+declares mismatch interceptor binding {1}.  
+
+ERR_ProducerNotBusiness=A producer non-static method of a session bean class \
+should be a business method of the session bean. 
+
+ERR_DisposerNotBusiness=A disposer non-static method of a session bean class \
+should be a business method of the session bean. 
+
+ERR_ObserverNotBusiness=An observer non-static method of a session bean class \
+should be a business method of the session bean. 
+
+WARN_NamedInjectionPoint=The use of @Named as an injection point qualifier is not recommended.
+
+ERR_NotPassivationProducerReturn=Producer method has a passivating scope {0} and should be \
+passivation capable. But its return type is declared final and does not implement Serializable. 
\ No newline at end of file
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/DelegateMethodAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/DelegateMethodAnalyzer.java
new file mode 100644
index 0000000000..32b766b0a1
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/DelegateMethodAnalyzer.java
@@ -0,0 +1,138 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiEditorAnalysisFactory;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.DelegateFieldAnalizer;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class DelegateMethodAnalyzer implements MethodAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent, AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        List<? extends VariableElement> parameters = element.getParameters();
+        int i=0;
+        for (VariableElement param : parameters) {
+            if (cancel.get()) {
+                return;
+            }
+            if (AnnotationUtil.hasAnnotation(param,
+                    AnnotationUtil.DELEGATE_FQN, result.getInfo()))
+            {
+                result.requireCdiEnabled(element);
+                if (cancel.get()) {
+                    return;
+                }
+                checkMethodDefinition(element, param, result );
+                if (cancel.get()) {
+                    return;
+                }
+                checkClassDefinition(parent, element, param, result );
+                if (cancel.get()) {
+                    return;
+                }
+                checkDelegateType(param, i, element, parent, result );
+                VariableElement var = CdiEditorAnalysisFactory.resolveParameter(
+                        param, element, result.getInfo());
+                EditorAnnotationsHelper helper = EditorAnnotationsHelper.
+                    getInstance(result);
+                if ( helper != null ){
+                    helper.addInjectionPoint(result, var);
+                }
+            }
+            i++;
+        }
+    }
+
+    private void checkClassDefinition( TypeElement parent,
+            ExecutableElement element, VariableElement param,
+            CdiAnalysisResult result)
+    {
+        if ( !AnnotationUtil.hasAnnotation(parent, AnnotationUtil.DECORATOR, 
+                result.getInfo()))
+        {
+            result.addError( param, 
+                NbBundle.getMessage(DelegateFieldAnalizer.class, 
+                        "ERR_DelegateIsNotInDecorator")); // NOI18N
+        }        
+    }
+
+    private void checkDelegateType( VariableElement element, int i,
+            ExecutableElement method, TypeElement parent,
+            CdiAnalysisResult result  )
+    {
+        ExecutableType methodType = (ExecutableType) result.getInfo().getTypes()
+                .asMemberOf((DeclaredType) parent.asType(), method);
+        List<? extends TypeMirror> parameterTypes = methodType
+                .getParameterTypes();
+        TypeMirror parameterType = parameterTypes.get(i);
+        Collection<TypeMirror> decoratedTypes = DelegateFieldAnalizer
+                .getDecoratedTypes(parent, result.getInfo());
+        for (TypeMirror decoratedType : decoratedTypes) {
+            if (!result.getInfo().getTypes().isSubtype(parameterType, decoratedType)) {
+                result.addError(element,  NbBundle.getMessage(
+                                DelegateMethodAnalyzer.class,
+                                "ERR_DelegateTypeHasNoDecoratedType")); // NOI18N
+                return;
+            }
+        }
+    }
+
+    private void checkMethodDefinition( ExecutableElement element, 
+            VariableElement param,  CdiAnalysisResult result  )
+    {
+        if ( element.getKind() == ElementKind.CONSTRUCTOR ){
+            return;
+        }
+        if ( !AnnotationUtil.hasAnnotation(element, AnnotationUtil.INJECT_FQN, 
+                result.getInfo()))
+        {
+            result.addError( param, 
+                NbBundle.getMessage(DelegateMethodAnalyzer.class, 
+                        "ERR_WrongDelegateMethod"));                        // NOI18N
+        }
+    }
+
+}
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java
similarity index 81%
copy from enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java
copy to enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java
index 33d40c472e..9723ca5f4f 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InjectionPointParameterAnalyzer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.netbeans.modules.web.beans.analysis.analyzer.method;
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
 
 import java.util.List;
 import java.util.Map;
@@ -34,18 +34,18 @@ import javax.lang.model.type.TypeMirror;
 import org.netbeans.api.java.source.CompilationController;
 import org.netbeans.api.java.source.ElementHandle;
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
-import org.netbeans.modules.web.beans.analysis.CdiEditorAnalysisFactory;
-import org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer;
-import org.netbeans.modules.web.beans.analysis.analyzer.AnnotationUtil;
-import org.netbeans.modules.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer;
-import org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result;
-import org.netbeans.modules.web.beans.analysis.analyzer.field.InjectionPointAnalyzer;
-import org.netbeans.modules.web.beans.api.model.CdiException;
-import org.netbeans.modules.web.beans.api.model.DependencyInjectionResult;
-import org.netbeans.modules.web.beans.api.model.DependencyInjectionResult.ResultKind;
-import org.netbeans.modules.web.beans.api.model.InjectionPointDefinitionError;
-import org.netbeans.modules.web.beans.api.model.WebBeansModel;
-import org.netbeans.modules.web.beans.hints.EditorAnnotationsHelper;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiEditorAnalysisFactory;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.field.InjectionPointAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.CdiException;
+import org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult;
+import org.netbeans.modules.jakarta.web.beans.api.model.DependencyInjectionResult.ResultKind;
+import org.netbeans.modules.jakarta.web.beans.api.model.InjectionPointDefinitionError;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
 import org.netbeans.spi.editor.hints.Severity;
 import org.openide.util.NbBundle;
 
@@ -59,7 +59,7 @@ public class InjectionPointParameterAnalyzer
 {
 
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
      */
     @Override
     public void analyze( ExecutableElement element, TypeMirror returnType,
@@ -128,7 +128,7 @@ public class InjectionPointParameterAnalyzer
     }
     
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addClassError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, org.netbeans.modules.web.beans.api.model.WebBeansModel, org.netbeans.api.java.source.CompilationInfo, java.util.List)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addClassError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, org.netbeans.api.java.source.CompilationInfo, java.util.List)
      */
     @Override
     protected void addClassError( VariableElement element, ExecutableElement method,
@@ -142,7 +142,7 @@ public class InjectionPointParameterAnalyzer
     }
     
     /* (non-Javadoc)
-     * @see org.netbeans.modules.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addMethodError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.web.beans.api.model.WebBeansModel, org.netbeans.modules.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractDecoratorAnalyzer#addMethodError(javax.lang.model.element.VariableElement, java.lang.Object, javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
      */
     @Override
     protected void addMethodError( VariableElement element,
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InterceptedMethodAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InterceptedMethodAnalyzer.java
new file mode 100644
index 0000000000..27eb796874
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/InterceptedMethodAnalyzer.java
@@ -0,0 +1,188 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.lang.annotation.ElementType;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+import javax.lang.model.util.Types;
+import org.netbeans.api.java.source.CompilationController;
+
+import org.netbeans.api.java.source.ElementHandle;
+import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationHelper;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractInterceptedElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.annotation.TargetAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.api.model.InterceptorsResult;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.netbeans.modules.jakarta.web.beans.hints.EditorAnnotationsHelper;
+import org.netbeans.spi.editor.hints.Severity;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class InterceptedMethodAnalyzer extends AbstractInterceptedElementAnalyzer 
+    implements MethodAnalyzer
+{
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.List, org.netbeans.api.java.source.CompilationInfo, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent, WebBeansModel model,
+            AtomicBoolean cancel , Result result )
+    {
+        boolean hasInterceptorBindings = hasInterceptorBindings(element, model);
+        if ( hasInterceptorBindings ){
+            result.requireCdiEnabled(element, model);
+            EditorAnnotationsHelper helper = EditorAnnotationsHelper.getInstance(result);
+            ElementHandle<ExecutableElement> handle = ElementHandle.create(element);
+            if ( helper != null ){
+                helper.addInterceptedMethod(result, handle.resolve( result.getInfo()));
+            }
+        }
+        if (AnnotationUtil.isLifecycleCallback(element, model.getCompilationController() )) {
+            if (hasInterceptorBindings) {
+                result.addNotification( Severity.WARNING, element, model,  
+                        NbBundle.getMessage(InterceptedMethodAnalyzer.class,
+                            "WARN_CallbackInterceptorBinding")); // NOI18N
+            }
+            if (cancel.get()) {
+                return;
+            }
+            InterceptorsResult interceptorResult = model
+                    .getInterceptors(element);
+            List<TypeElement> interceptors = interceptorResult
+                    .getResolvedInterceptors();
+            AnnotationHelper helper = null;
+            if ( interceptors.size() >0 ){
+                helper = new AnnotationHelper(model.getCompilationController());
+            }
+            for (TypeElement interceptor : interceptors) {
+                if (isLifecycleCallbackInterceptor(interceptor, model.getCompilationController())) {
+                    Collection<AnnotationMirror> interceptorBindings = model
+                        .getInterceptorBindings(interceptor);
+                    for (AnnotationMirror annotationMirror : interceptorBindings) {
+                        Element iBinding = model.getCompilationController().getTypes().
+                            asElement( annotationMirror.getAnnotationType() );
+                        if ( !( iBinding instanceof TypeElement )) {
+                            continue;
+                        }
+                        Set<ElementType> declaredTargetTypes = TargetAnalyzer.
+                            getDeclaredTargetTypes(helper, (TypeElement)iBinding);
+                        if ( declaredTargetTypes.size() != 1 ||
+                                !declaredTargetTypes.contains(ElementType.TYPE))
+                        {
+                            result.addError(element, model,
+                                        NbBundle.getMessage(InterceptedMethodAnalyzer.class,
+                                        "ERR_LifecycleInterceptorTarget" ,      // NOI18N
+                                        interceptor.getQualifiedName().toString(),
+                                        ((TypeElement)iBinding).getQualifiedName().toString()));
+                        }
+                    }
+                }
+            }
+        }
+        if (cancel.get()) {
+            return;
+        }
+                
+        Set<Modifier> modifiers = element.getModifiers();
+        if ( modifiers.contains( Modifier.STATIC ) || 
+                modifiers.contains( Modifier.PRIVATE))
+        {
+            return;
+        }
+        boolean finalMethod = modifiers.contains( Modifier.FINAL );
+        boolean finalClass = parent.getModifiers().contains( Modifier.FINAL);
+        if ( !finalMethod && !finalClass ){
+            return;
+        }
+        if ( cancel.get() ){
+            return;
+        }
+        if ( hasInterceptorBindings){
+            if ( finalMethod ){
+                result.addError(element, model,  
+                            NbBundle.getMessage(
+                            InterceptedMethodAnalyzer.class,
+                        "ERR_FinalInterceptedMethod")); // NOI18N
+            }
+            if ( finalClass && !AnnotationUtil.hasAnnotation(parent, 
+                    AnnotationUtil.INTERCEPTOR, model.getCompilationController()))
+            {
+                result.addError(element, model,   
+                            NbBundle.getMessage(
+                            InterceptedMethodAnalyzer.class,
+                        "ERR_FinalInterceptedClass")); // NOI18N
+            }
+        }
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractInterceptedElementAnalyzer#getInterceptorBindings(javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel)
+     */
+    @Override
+    protected Set<AnnotationMirror> getInterceptorBindings( Element element,
+            WebBeansModel model )
+    {
+        Set<AnnotationMirror> iBindings = super.getInterceptorBindings(element, model);
+        List<? extends AnnotationMirror> annotations = model
+                .getCompilationController().getElements()
+                .getAllAnnotationMirrors(element);
+        iBindings.retainAll(annotations);
+        return iBindings;
+    }
+
+    private static boolean isLifecycleCallbackInterceptor(TypeElement interceptor, CompilationController info) {
+        for (Element e : interceptor.getEnclosedElements()) {
+            if (e.getKind() == ElementKind.METHOD && e instanceof ExecutableElement) {
+                if (AnnotationUtil.isLifecycleCallback((ExecutableElement) e, info)) {
+                    return true;
+                }
+            }
+        }
+        TypeMirror tm = interceptor.getSuperclass();
+        if (tm.getKind() == TypeKind.DECLARED) {
+            Element e = info.getTypes().asElement(tm);
+            if (e instanceof TypeElement) {
+                return isLifecycleCallbackInterceptor((TypeElement) e, info);
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ProducerMethodAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ProducerMethodAnalyzer.java
new file mode 100644
index 0000000000..3c288e3ce0
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ProducerMethodAnalyzer.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractProducerAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ProducerMethodAnalyzer extends AbstractProducerAnalyzer 
+    implements MethodAnalyzer 
+{
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent,  AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        if  ( !AnnotationUtil.hasAnnotation(element, AnnotationUtil.PRODUCES_FQN, 
+                result.getInfo() ))
+        {
+            return;
+        }
+        result.requireCdiEnabled(element);
+        if ( cancel.get() ){
+            return;
+        }
+        checkType( element, returnType,  result );
+        if ( cancel.get() ){
+            return;
+        }
+        checkSpecializes( element , result  );
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractProducerAnalyzer#hasTypeVar(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void hasTypeVar( Element element, TypeMirror type,
+            CdiAnalysisResult result)
+    {
+        result.addError( element, NbBundle.getMessage(
+                            ProducerMethodAnalyzer.class, "ERR_ProducerReturnIsTypeVar"));    // NOI18N
+    }
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractProducerAnalyzer#hasWildCard(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void hasWildCard( Element element, TypeMirror type,
+            CdiAnalysisResult result )
+    {
+        result.addError(element, NbBundle.getMessage(
+                    ProducerMethodAnalyzer.class,"ERR_ProducerReturnHasWildcard")); // NOI18N
+    }
+    
+    private void checkSpecializes(ExecutableElement element, CdiAnalysisResult result )
+    {
+        if ( !AnnotationUtil.hasAnnotation(element, AnnotationUtil.SPECIALIZES, 
+                result.getInfo() ))
+        {
+            return;
+        }
+        Set<Modifier> modifiers = element.getModifiers();
+        if ( modifiers.contains( Modifier.STATIC )){
+            result.addError( element,  NbBundle.getMessage(
+                        ProducerMethodAnalyzer.class, 
+                        "ERR_StaticSpecializesProducer"));    // NOI18N
+        }
+        CompilationInfo compInfo = result.getInfo();
+        ExecutableElement overridenMethod = compInfo.getElementUtilities().
+            getOverriddenMethod( element );
+        if ( overridenMethod == null ){
+            return;
+        }
+        TypeElement superClass = compInfo.getElementUtilities().
+            enclosingTypeElement( overridenMethod );
+        TypeElement containingClass = compInfo.getElementUtilities().
+            enclosingTypeElement( element );
+        TypeMirror typeDirectSuper = containingClass.getSuperclass();
+        if ( !superClass.equals(compInfo.getTypes().asElement(typeDirectSuper)) || 
+                !AnnotationUtil.hasAnnotation(overridenMethod, 
+                        AnnotationUtil.PRODUCES_FQN, compInfo))
+        {
+            result.addError( element, NbBundle.getMessage(
+                        ProducerMethodAnalyzer.class, 
+                        "ERR_NoDirectSpecializedProducer"));    // NOI18N
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ScopedMethodAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ScopedMethodAnalyzer.java
new file mode 100644
index 0000000000..dc84c12c45
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/ScopedMethodAnalyzer.java
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.Modifier;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class ScopedMethodAnalyzer extends AbstractScopedAnalyzer implements
+        MethodAnalyzer
+{
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodModelAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent, WebBeansModel model,
+            AtomicBoolean cancel,  Result result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.PRODUCES_FQN, 
+                model.getCompilationController()))
+        {
+            result.requireCdiEnabled(element,model);
+            analyzeScope(element, model, cancel,  result );
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractScopedAnalyzer#checkScope(javax.lang.model.element.TypeElement, javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result)
+     */
+    @Override
+    protected void checkScope( TypeElement scopeElement, Element element,
+            WebBeansModel model, AtomicBoolean cancel, Result result )
+    {
+        if ( scopeElement.getQualifiedName().contentEquals( AnnotationUtil.DEPENDENT)){
+            return;
+        }
+        TypeMirror methodType = element.asType();
+        if ( methodType instanceof ExecutableType ){
+            TypeMirror returnType = ((ExecutableType)methodType).getReturnType();
+            if ( cancel.get() ){
+                return;
+            }
+            if ( hasTypeVarParameter( returnType )){
+                result.addError( element, model,   
+                            NbBundle.getMessage(ScopedMethodAnalyzer.class, 
+                                    "ERR_WrongScopeParameterizedProducerReturn",    // NOI18N
+                                    scopeElement.getQualifiedName().toString()));
+            }
+        }
+        if ( cancel.get() ){
+            return;
+        }
+        checkPassivationCapable( scopeElement , element , model , result );
+    }
+
+    private void checkPassivationCapable( TypeElement scopeElement,
+            Element element, WebBeansModel model, Result result )
+    {
+        if ( !isPassivatingScope(scopeElement, model) ){
+            return;
+        }
+        TypeMirror returnType = ((ExecutableElement)element).getReturnType();
+        if ( returnType == null ){
+            return;
+        }
+        if ( returnType.getKind().isPrimitive() ){
+            return;
+        }
+        if ( isSerializable(returnType, model)){
+            return;
+        }
+        Element returnTypeElement = model.getCompilationController().getTypes().
+            asElement( returnType );
+        if ( returnTypeElement == null ){
+            return;
+        }
+        if ( returnTypeElement.getModifiers().contains( Modifier.FINAL )){
+            result.addError( element, model,   
+                    NbBundle.getMessage(ScopedMethodAnalyzer.class, 
+                            "ERR_NotPassivationProducerReturn",    // NOI18N
+                            scopeElement.getQualifiedName().toString()));
+        }
+    }
+    
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/TypedMethodAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/TypedMethodAnalyzer.java
new file mode 100644
index 0000000000..dd98332aa4
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/method/TypedMethodAnalyzer.java
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.method;
+
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.DeclaredType;
+import javax.lang.model.type.ExecutableType;
+import javax.lang.model.type.PrimitiveType;
+import javax.lang.model.type.TypeKind;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class TypedMethodAnalyzer extends AbstractTypedAnalyzer implements
+        MethodAnalyzer
+{
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.MethodElementAnalyzer.MethodAnalyzer#analyze(javax.lang.model.element.ExecutableElement, javax.lang.model.type.TypeMirror, javax.lang.model.element.TypeElement, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    public void analyze( ExecutableElement element, TypeMirror returnType,
+            TypeElement parent, AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        analyze(element, returnType, cancel , result );
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer#addError(javax.lang.model.element.Element, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void addError( Element element, CdiAnalysisResult result )
+    {
+        result.addError( element, NbBundle.getMessage(
+                TypedMethodAnalyzer.class, "ERR_BadRestritedMethodType"));  // NOI18N
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analizer.AbstractTypedAnalyzer#hasBeanType(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, javax.lang.model.type.TypeMirror, org.netbeans.api.java.source.CompilationInfo)
+     */
+    @Override
+    protected boolean hasBeanType( Element subject, TypeMirror returnType,
+            TypeMirror requiredBeanType, CompilationInfo compInfo )
+    {
+        return compInfo.getTypes().isSubtype(returnType, requiredBeanType);
+    }
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractTypedAnalyzer#checkSpecializes(javax.lang.model.element.Element, javax.lang.model.type.TypeMirror, java.util.List, java.util.concurrent.atomic.AtomicBoolean, org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ElementAnalyzer.Result)
+     */
+    @Override
+    protected void checkSpecializes( Element element, TypeMirror elementType,
+            List<TypeMirror> restrictedTypes, AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        if (!AnnotationUtil.hasAnnotation(element, AnnotationUtil.PRODUCES_FQN, 
+                compInfo))
+        {
+            return;
+        }
+        ExecutableElement method = (ExecutableElement)element;
+        ExecutableElement overriddenMethod = compInfo.getElementUtilities().
+            getOverriddenMethod(method);
+        if ( overriddenMethod == null ){
+            return;
+        }
+        TypeElement clazz = compInfo.getElementUtilities().
+            enclosingTypeElement(method);
+        TypeMirror superType = clazz.getSuperclass();
+        TypeElement superClass = compInfo.getElementUtilities().
+            enclosingTypeElement(overriddenMethod);
+        if ( !superClass.equals( compInfo.getTypes().asElement( superType))){
+            return;
+        }
+        if ( cancel.get()){
+            return;
+        }
+        List<TypeMirror> restrictedSuper = getRestrictedTypes(overriddenMethod, 
+                compInfo, cancel);
+        if ( cancel.get()){
+            return;
+        }
+        if ( restrictedSuper == null ) {
+            if (!hasUnrestrictedOverridenType(elementType, 
+                    restrictedTypes, compInfo,overriddenMethod, superClass) )
+            {
+                result.addError( element, NbBundle.getMessage(
+                            TypedMethodAnalyzer.class, "ERR_BadSpecializesMethod"));  // NOI18N 
+            }
+        }
+        else { 
+            if (!hasRestrictedType(elementType, restrictedTypes, compInfo,
+                    restrictedSuper))
+            {
+                result.addError( element,  NbBundle.getMessage(
+                            TypedMethodAnalyzer.class, "ERR_BadSpecializesMethod"));  // NOI18N 
+            }
+        }
+    }
+
+    private boolean hasRestrictedType( TypeMirror elementType,
+            List<TypeMirror> restrictedTypes, CompilationInfo compInfo,
+            List<TypeMirror> restrictedSuper )
+    {
+        if ( elementType.getKind() == TypeKind.ARRAY ){
+            for( TypeMirror mirror : restrictedSuper ){
+                boolean found = false;
+                for( TypeMirror restrictedType : restrictedTypes ){
+                    if ( compInfo.getTypes().isSameType( restrictedType, mirror)){
+                        found = true;
+                        break;
+                    }
+                }
+                if ( !found ){
+                    return false;
+                }
+            }
+            return true;
+        }
+        else {
+            Set<TypeElement> specializedBeanTypes = getElements( 
+                    restrictedSuper, compInfo);
+            Set<TypeElement> restrictedElements = getElements(restrictedTypes, 
+                    compInfo);
+            restrictedElements.add( compInfo.getElements().getTypeElement( 
+                    Object.class.getCanonicalName()));
+            return restrictedElements.containsAll( specializedBeanTypes );
+        }
+    }
+
+    private boolean hasUnrestrictedOverridenType( TypeMirror elementType,
+            List<TypeMirror> restrictedTypes, CompilationInfo compInfo,
+            ExecutableElement overriddenMethod, TypeElement superClass )
+    {
+        TypeMirror methodType = compInfo.getTypes().asMemberOf(
+                (DeclaredType)superClass.asType(), overriddenMethod);
+        TypeMirror returnOverriden = ((ExecutableType)methodType).getReturnType();
+        if ( elementType.getKind() == TypeKind.ARRAY ){
+            for( TypeMirror mirror : restrictedTypes ){
+                if ( compInfo.getTypes().isSameType( mirror, returnOverriden)){
+                    return true;
+                }
+            }
+            return false;
+        }
+        else if ( returnOverriden.getKind().isPrimitive() ) {
+            TypeElement boxed = compInfo.getTypes().boxedClass(
+                    (PrimitiveType)returnOverriden);
+            return hasUnrestrictedType(boxed, restrictedTypes, compInfo);
+        }
+        else if ( returnOverriden instanceof DeclaredType ){
+            Element returnElement = compInfo.getTypes().asElement( returnOverriden);
+            if ( returnElement instanceof TypeElement ){
+                return hasUnrestrictedType((TypeElement)returnElement, 
+                        restrictedTypes, compInfo);
+            }
+        }
+        return true;
+    }
+
+    private boolean hasUnrestrictedType( TypeElement overriden,
+            List<TypeMirror> restrictedTypes,CompilationInfo compInfo )
+    {
+        Set<TypeElement> specializedBeanTypes = getUnrestrictedBeanTypes(
+                    overriden, compInfo);
+        Set<TypeElement> restrictedElements = getElements(restrictedTypes, 
+                compInfo);
+        restrictedElements.add( compInfo.getElements().getTypeElement( 
+                Object.class.getCanonicalName()));
+        return restrictedElements.containsAll(specializedBeanTypes);
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/AnnotationsAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/AnnotationsAnalyzer.java
new file mode 100644
index 0000000000..323460b971
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/AnnotationsAnalyzer.java
@@ -0,0 +1,275 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ElementKind;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.api.java.source.CompilationInfo;
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassElementAnalyzer.ClassAnalyzer;
+import org.openide.util.NbBundle;
+import org.netbeans.spi.editor.hints.Severity;
+
+
+/**
+ * @author ads
+ *
+ */
+public class AnnotationsAnalyzer implements ClassAnalyzer {
+    
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassElementAnalyzer.ClassAnalyzer#analyze(javax.lang.model.element.TypeElement, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( TypeElement element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        checkDecoratorInterceptor( element , cancel, result );
+    }
+
+    private void checkDecoratorInterceptor( TypeElement element, 
+            AtomicBoolean cancel , CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        boolean isDecorator = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.DECORATOR, compInfo);
+        boolean isInterceptor = AnnotationUtil.hasAnnotation(element, 
+                AnnotationUtil.INTERCEPTOR, compInfo);
+        if ( isDecorator && isInterceptor ){
+            result.addError( element, NbBundle.getMessage(
+                        AnnotationsAnalyzer.class, "ERR_DecoratorInterceptor"));// NOI18N
+        }
+        if ( isDecorator || isInterceptor ){
+            result.requireCdiEnabled(element);
+            if ( cancel.get() ){
+                return;
+            }
+            checkProducerFields( element , isDecorator , result);
+            if ( cancel.get() ){
+                return;
+            }
+            checkMethods( element , isDecorator , result);
+            if ( cancel.get() ){
+                return;
+            }
+            checkSession( element , result);
+            if ( cancel.get() ){
+                return;
+            }
+            checkNamed( element , result );
+            if ( cancel.get() ){
+                return;
+            }
+            checkAlternatives(element , result );
+            if ( cancel.get() ){
+                return;
+            }
+            checkSpecializes( element , result );
+        }
+        if ( isDecorator ){
+            if ( cancel.get() ){
+                return;
+            }
+            checkDelegateInjectionPoint(element , result);
+        }
+    }
+
+    private void checkSpecializes( TypeElement element, CdiAnalysisResult result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.SPECIALIZES, 
+                result.getInfo()) )
+        {
+            result.addNotification(Severity.WARNING, element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class,  
+                    "WARN_SpecializesInterceptorDecorator")); // NOI18N
+        }
+    }
+
+    private void checkAlternatives( TypeElement element,
+            CdiAnalysisResult result )
+    {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.ALTERNATVE, 
+                result.getInfo()))
+        {
+            result.addNotification(Severity.WARNING, element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class,  
+                    "WARN_AlternativeInterceptorDecorator")); // NOI18N
+        }        
+    }
+
+    private void checkNamed( TypeElement element, CdiAnalysisResult result ) {
+        if ( AnnotationUtil.hasAnnotation(element, AnnotationUtil.NAMED, 
+                result.getInfo()))
+        {
+            result.addNotification(Severity.WARNING, element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class,  "WARN_NamedInterceptorDecorator")); // NOI18N
+        }
+    }
+
+    private void checkDelegateInjectionPoint( TypeElement element,
+            CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        List<? extends Element> enclosedElements = element.getEnclosedElements();
+        int count = 0;
+        for (Element child : enclosedElements) {
+            if ( child.getKind() == ElementKind.CONSTRUCTOR )
+            {
+                count +=delegateInjectionPointCount(child, compInfo);
+            }
+            else if ( ! AnnotationUtil.hasAnnotation(child, AnnotationUtil.INJECT_FQN, 
+                    compInfo ))
+            {
+                continue;
+            }
+            if ( child.getKind() == ElementKind.FIELD && AnnotationUtil.
+                    hasAnnotation(child, AnnotationUtil.DELEGATE_FQN, compInfo ))
+            {
+                count++;
+            }
+            else if (  child.getKind() ==ElementKind.METHOD )
+            {
+                count+=delegateInjectionPointCount(child, compInfo);
+            }
+        }
+        if ( count != 1){
+            result.addError( element, NbBundle.getMessage(
+                AnnotationsAnalyzer.class,  "ERR_IncorrectDelegateCount")); // NOI18N
+        }
+    }
+    
+    private int delegateInjectionPointCount(Element element , 
+            CompilationInfo compInfo)
+    {
+        int result=0;
+        ExecutableElement method = (ExecutableElement)element;
+        List<? extends VariableElement> parameters = method.getParameters();
+        for (VariableElement par : parameters) {
+            if ( AnnotationUtil.hasAnnotation(par, AnnotationUtil.DELEGATE_FQN, 
+                    compInfo))
+            {
+                result++;
+            }
+        }
+        return result;
+    }
+
+    private void checkSession( TypeElement element,
+            CdiAnalysisResult result )
+    {
+        if ( AnnotationUtil.isSessionBean(element, result.getInfo()) )
+        {
+            result.addError( element,  NbBundle.getMessage(
+                        AnnotationsAnalyzer.class,  "ERR_SesssionBeanID")); // NOI18N
+        }
+    }
+
+    private void checkMethods( TypeElement element, boolean isDecorator,
+            CdiAnalysisResult result )
+    {
+        CompilationInfo compInfo = result.getInfo();
+        List<ExecutableElement> methods = ElementFilter.methodsIn( 
+                element.getEnclosedElements());
+        for (ExecutableElement method : methods) {
+            boolean isProducer = AnnotationUtil.hasAnnotation(method, 
+                    AnnotationUtil.PRODUCES_FQN, compInfo);     
+            boolean isDisposer = false;
+            boolean isObserver = false;
+            List<? extends VariableElement> parameters = method.getParameters();
+            for (VariableElement param : parameters) {
+                if ( AnnotationUtil.hasAnnotation( param , AnnotationUtil.DISPOSES_FQN, 
+                        compInfo))
+                {
+                    isDisposer = true;
+                    break;
+                }
+                if ( AnnotationUtil.hasAnnotation( param , AnnotationUtil.OBSERVES_FQN, 
+                        compInfo))
+                {
+                    isObserver = true;
+                    break;
+                }
+            }
+            if ( isProducer || isDisposer || isObserver ){
+                result.addError( element, NbBundle.getMessage(
+                    AnnotationsAnalyzer.class, getMethodErrorKey(isDecorator, 
+                            isProducer, isDisposer) , 
+                            method.getSimpleName().toString()));
+                break;
+            }
+        }
+    }
+    
+    private String getMethodErrorKey(boolean isDecorator, boolean isProducer,
+            boolean isDisposer )
+    {
+        String key= null;
+        if ( isDecorator ){
+            if ( isProducer ){
+                key = "ERR_DecoratorHasProducerMethod";             //  NOI18N
+            }
+            else if ( isDisposer ){
+                key = "ERR_DecoratorHasDisposerMethod";             //  NOI18N
+            }
+            else {
+                key = "ERR_DecoratorHasObserverMethod";             //  NOI18N
+            }
+        }
+        else {
+            if ( isProducer ){
+                key = "ERR_InterceptorHasProducerMethod";             //  NOI18N
+            }
+            else if ( isDisposer ){
+                key = "ERR_InterceptorHasDisposerMethod";             //  NOI18N
+            }
+            else {
+                key = "ERR_InterceptorHasObserverMethod";             //  NOI18N
+            }
+        }
+        return key;
+    }
+
+    private void checkProducerFields( TypeElement element, boolean isDecorator,
+            CdiAnalysisResult result )
+    {
+        List<VariableElement> fields = ElementFilter.fieldsIn( 
+                element.getEnclosedElements() );
+        for (VariableElement field : fields) {
+            if ( AnnotationUtil.hasAnnotation(field, AnnotationUtil.PRODUCES_FQN, 
+                    result.getInfo()))
+            {
+                String key= isDecorator ? "ERR_DecoratorHasProducerField":
+                    "ERR_IntrerceptorHasProducerField";                 // NOI18N
+                result.addError( element, NbBundle.getMessage(
+                        AnnotationsAnalyzer.class, key , field.getSimpleName().toString()));
+                break;
+            }
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/Bundle.properties b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/Bundle.properties
new file mode 100644
index 0000000000..bc718fc650
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/Bundle.properties
@@ -0,0 +1,93 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+ERR_BadRestritedType=Bean class specifies @Typed annotation, and the value member \
+specifies a class which does not correspond to a type in \
+the unrestricted set of bean types of a bean. 
+ERR_NonStaticInnerType=Non-static inner class cannot be managed bean or \
+superclass of managed bean.
+WARN_QualifiedElementExtension=The element is not managed bean: it has \
+qualifiers but implements javax.enterprise.inject.spi.Extension.
+WARN_QualifierAbstractClass=The element is not managed bean: it has \
+qualifiers but has abstract modifier.
+WARN_QualifierNoCtorClass=The element is not managed bean: it has \
+qualifiers but does not have non-private constructor with no parameters or \
+annotated with @Inject .
+ERR_FinalScopedClass=Class is unproxyable: it has normal scope and declared final.
+WARN_FinalScopedClassMethod=Final method is declared in class with normal scope.
+ERR_DecoratorInterceptor=A managed bean cannot be annotated with both \
+@Interceptor and @Decorator stereotypes.
+ 
+ERR_DecoratorHasProducerField=A decorator may not declare producer field "{0}".
+ERR_IntrerceptorHasProducerField=An interceptor may not declare producer field "{0}".
+ERR_DecoratorHasProducerMethod=A decorator may not declare producer method "{0}".
+ERR_DecoratorHasDisposerMethod=A decorator may not declare disposer method "{0}".
+ERR_DecoratorHasObserverMethod=A decorator may not declare observer method "{0}".
+ERR_InterceptorHasProducerMethod=An interceptor may not declare producer method "{0}".
+ERR_InterceptorHasDisposerMethod=An interceptor may not declare disposer method "{0}".
+ERR_InterceptorHasObserverMethod=An interceptor may not declare observer method "{0}".
+
+ERR_InjectedCtor=A bean class should not have more than one constructor annotated @Inject.
+
+ERR_SesssionBeanID=A bean class of a session bean should not be annotated \
+@Interceptor or @Decorator.
+
+ERR_InvalidSingletonBeanScope=A singleton bean must belong to either the \
+@ApplicationScoped scope or to the @Dependent pseudo-scope. 
+
+ERR_InvalidStatelessBeanScope=A stateless session bean must belong to the @Dependent pseudo-scope.
+
+ERR_IncorrectDelegateCount=A decorator must have exactly one delegate injection point.
+
+ERR_IcorrectScopeWithPublicField=A managed bean with a public field ("{0}") \
+should not declares any scope other than @Dependent.  
+
+ERR_IncorrectScopeForParameterizedBean=A managed bean with a parameterized bean \
+class should not declares any scope other than @Dependent. 
+
+ERR_FinalInterceptedBean=The bean class of a managed bean is final and declares \
+or inherits a class level interceptor binding or a stereotype with interceptor bindings.
+
+ERR_InterceptedBeanHasFinalMethod=The bean class of a managed bean has non-static, \
+non-private, final method "{0}" and declares or inherits a class level interceptor \
+binding or a stereotype with interceptor bindings.
+
+ERR_NamedSpecializes=Bean declares name explicitly using @Named but it \
+specializes another bean with name. 
+
+ERR_BadSpecializesBeanType=Bean specializes another bean but it does not \
+have all bean types of specialized bean. 
+
+ERR_InvalidDuplicateIBindings=The set of interceptor bindings has two instances of {0} \
+interceptor binding type and the instances have different values of some annotation member.
+
+WARN_ScopedDecoratorInterceptor=The @Dependent scope is the only scope which \
+interceptor or decorator could have. The non-portable behavior result otherwise.  
+
+WARN_NamedInterceptorDecorator=An interceptor or decorator should not have a name. \
+Otherwise non-portable behavior results. 
+
+WARN_AlternativeInterceptorDecorator=An interceptor or decorator should not be alternative. \
+Otherwise non-portable behavior results. 
+
+WARN_SpecializesInterceptorDecorator=An interceptor or decorator should not \
+have @Specializes annotation. Otherwise non-portable behavior results. 
+
+ERR_NotPassivationSessionBean=Session bean has a passivating scope {0} and should be \
+passivation capable. Stateless and singleton session beans are not passivation capable.
+ERR_NotPassivationManagedBean=Bean has a passivating scope {0} and should be \
+passivation capable. Passivation capable bean should be serializable.
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/CtorsAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/CtorsAnalyzer.java
new file mode 100644
index 0000000000..946ea48ada
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/CtorsAnalyzer.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type;
+
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.ElementFilter;
+
+import org.netbeans.modules.jakarta.web.beans.analysis.CdiAnalysisResult;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AnnotationUtil;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassElementAnalyzer.ClassAnalyzer;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class CtorsAnalyzer implements ClassAnalyzer {
+
+    /* (non-Javadoc)
+     * @see org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassElementAnalyzer.ClassAnalyzer#analyze(javax.lang.model.element.TypeElement, javax.lang.model.element.TypeElement, org.netbeans.api.java.source.CompilationInfo, java.util.List, java.util.concurrent.atomic.AtomicBoolean)
+     */
+    @Override
+    public void analyze( TypeElement element, TypeElement parent,
+            AtomicBoolean cancel, CdiAnalysisResult result )
+    {
+        List<ExecutableElement> constructors = ElementFilter.constructorsIn(
+                element.getEnclosedElements());
+        int injectCtorCount = 0;
+        for (ExecutableElement ctor : constructors) {
+            if ( cancel.get() ){
+                return;
+            }
+            if ( AnnotationUtil.hasAnnotation( ctor , AnnotationUtil.INJECT_FQN, 
+                    result.getInfo()))
+            {
+                result.requireCdiEnabled( ctor );
+                injectCtorCount++;
+            }
+        }
+        if ( injectCtorCount > 1){
+            result.addError( element,  NbBundle.getMessage(
+                CtorsAnalyzer.class, "ERR_InjectedCtor"));
+        }
+    }
+
+}
diff --git a/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/DeclaredIBindingsAnalyzer.java b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/DeclaredIBindingsAnalyzer.java
new file mode 100644
index 0000000000..009aa64130
--- /dev/null
+++ b/enterprise/jakarta.web.beans/src/org/netbeans/modules/jakarta/web/beans/analysis/analyzer/type/DeclaredIBindingsAnalyzer.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.jakarta.web.beans.analysis.analyzer.type;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.type.TypeMirror;
+
+import org.netbeans.api.java.source.CompilationController;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.AbstractInterceptedElementAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ClassModelAnalyzer.ClassAnalyzer;
+import org.netbeans.modules.jakarta.web.beans.analysis.analyzer.ModelAnalyzer.Result;
+import org.netbeans.modules.jakarta.web.beans.api.model.WebBeansModel;
+import org.openide.util.NbBundle;
+
+
+/**
+ * @author ads
+ *
+ */
+public class DeclaredIBindingsAnalyzer extends
+        AbstractInterceptedElementAnalyzer implements ClassAnalyzer
+{
+
... 44508 lines suppressed ...


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists