Migrate <managed-bean> to @nAmed -- pass1

Noticed a bunch of ManagedPropertyBean related tests which should either be removed or be reworked to use @ManagedProperty instead
jakartaee · Mar 2, 2022 · 22abd19 · 22abd19
1 parent a241487
commit 22abd19
Show file tree

Hide file tree

Showing 96 changed files with 56 additions and 700 deletions.
diff --git a/src/com/sun/ts/tests/jsf/common/beans/AlbumBean.java b/src/com/sun/ts/tests/jsf/common/beans/AlbumBean.java
@@ -26,6 +26,7 @@
 
 import jakarta.faces.event.ActionEvent;
 
+@jakarta.inject.Named("album") @jakarta.enterprise.context.RequestScoped
 public class AlbumBean implements Serializable {
 
   private String artist;

diff --git a/src/com/sun/ts/tests/jsf/spec/ajax/common/AjaxTagValuesBean.java b/src/com/sun/ts/tests/jsf/spec/ajax/common/AjaxTagValuesBean.java
@@ -25,6 +25,7 @@
 
 import jakarta.faces.event.ActionEvent;
 
+@jakarta.inject.Named("ajaxtag") @jakarta.enterprise.context.SessionScoped
 public class AjaxTagValuesBean {
 
   private Integer count = 0;

diff --git a/src/com/sun/ts/tests/jsf/spec/ajax/common/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/ajax/common/faces-config.xml
@@ -22,12 +22,4 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>ajaxtag</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.ajax.common.AjaxTagValuesBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
-
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/absolute_ordering/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/absolute_ordering/faces-config.xml
@@ -21,11 +21,6 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
               version="3.0">
-    <managed-bean>
-        <managed-bean-name>orderingBean</managed-bean-name>
-        <managed-bean-class>com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.OrderingBean</managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 
     <name>D</name>
 

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/AnswerNoBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/AnswerNoBean.java
@@ -20,6 +20,7 @@
 
 package com.sun.ts.tests.jsf.spec.appconfigresources.common.beans;
 
+@jakarta.inject.Named("Question") @jakarta.enterprise.context.SessionScoped
 public class AnswerNoBean {
 
   private String answer;

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/AnswerYesBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/AnswerYesBean.java
@@ -19,6 +19,7 @@
  */
 package com.sun.ts.tests.jsf.spec.appconfigresources.common.beans;
 
+@jakarta.inject.Named("Answer") @jakarta.enterprise.context.SessionScoped
 public class AnswerYesBean {
 
   private String answer;

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/ColorBlueBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/ColorBlueBean.java
@@ -19,6 +19,7 @@
  */
 package com.sun.ts.tests.jsf.spec.appconfigresources.common.beans;
 
+@jakarta.inject.Named("Ball") @jakarta.enterprise.context.SessionScoped
 public class ColorBlueBean {
 
   private String color;

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/ColorRedBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/ColorRedBean.java
@@ -19,6 +19,7 @@
  */
 package com.sun.ts.tests.jsf.spec.appconfigresources.common.beans;
 
+@jakarta.inject.Named("Color") @jakarta.enterprise.context.SessionScoped
 public class ColorRedBean {
 
   private String color;

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/OrderingBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/OrderingBean.java
@@ -28,6 +28,7 @@
 import jakarta.faces.lifecycle.Lifecycle;
 import jakarta.faces.lifecycle.LifecycleFactory;
 
+@jakarta.inject.Named("orderingBean") @jakarta.enterprise.context.SessionScoped
 public class OrderingBean {
 
   private String[] suffixes;

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/StatBean.java b/src/com/sun/ts/tests/jsf/spec/appconfigresources/common/beans/StatBean.java
@@ -20,6 +20,7 @@
 
 package com.sun.ts.tests.jsf.spec.appconfigresources.common.beans;
 
+@jakarta.inject.Named("Status") @jakarta.enterprise.context.SessionScoped
 public class StatBean {
   private String testString;
 

diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/relative_ordering/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/relative_ordering/faces-config.xml
@@ -21,11 +21,5 @@
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
               version="3.0">
-    <managed-bean>
-        <managed-bean-name>orderingBean</managed-bean-name>
-        <managed-bean-class>com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.OrderingBean</managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
-
 
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/colorBean.faces-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/colorBean.faces-config.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>Color</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.ColorRedBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/faces-config.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>Answer</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.AnswerYesBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/statBean.faces-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/statBean.faces-config.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>Status</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.StatBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/testCase2-config.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/testCase2-config.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>Ball</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.ColorBlueBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/testCase2-config_1.xml b/src/com/sun/ts/tests/jsf/spec/appconfigresources/startupbehavior/testCase2-config_1.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>Question</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.AnswerNoBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/composite/actionsource/BeanOne.java b/src/com/sun/ts/tests/jsf/spec/composite/actionsource/BeanOne.java
@@ -23,6 +23,7 @@
 import jakarta.faces.event.ActionEvent;
 import jakarta.faces.event.ActionListener;
 
+@jakarta.inject.Named("beanOne") @jakarta.enterprise.context.RequestScoped
 public class BeanOne implements ActionListener {
 
   public ActionListener getTestOneEventListener() {

diff --git a/src/com/sun/ts/tests/jsf/spec/composite/actionsource/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/composite/actionsource/faces-config.xml
@@ -21,11 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-    <managed-bean>
-        <managed-bean-name>beanOne</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.composite.actionsource.BeanOne
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/composite/attribute/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/composite/attribute/faces-config.xml
@@ -21,12 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-
-    <managed-bean>
-        <managed-bean-name>album</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.common.beans.AlbumBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/FirstNameBean.java b/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/FirstNameBean.java
@@ -24,6 +24,7 @@
 import jakarta.faces.event.ValueChangeEvent;
 import jakarta.faces.event.ValueChangeListener;
 
+@jakarta.inject.Named("firstname") @jakarta.enterprise.context.SessionScoped
 public class FirstNameBean implements ValueChangeListener {
 
   public ValueChangeListener getValueChangeListener() {

diff --git a/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/LastNameBean.java b/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/LastNameBean.java
@@ -24,6 +24,7 @@
 import jakarta.faces.event.ValueChangeEvent;
 import jakarta.faces.event.ValueChangeListener;
 
+@jakarta.inject.Named("lastname") @jakarta.enterprise.context.SessionScoped
 public class LastNameBean implements ValueChangeListener {
 
   public ValueChangeListener getValueChangeListener() {

diff --git a/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/composite/editablevalueholder/faces-config.xml
@@ -22,19 +22,4 @@
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
 
-    <managed-bean>
-        <managed-bean-name>firstname</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.composite.editablevalueholder.FirstNameBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
-
-    <managed-bean>
-        <managed-bean-name>lastname</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.composite.editablevalueholder.LastNameBean
-        </managed-bean-class>
-        <managed-bean-scope>session</managed-bean-scope>
-    </managed-bean>
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/coretags/common/BookBean.java b/src/com/sun/ts/tests/jsf/spec/coretags/common/BookBean.java
@@ -19,9 +19,8 @@
 import java.io.Serializable;
 
 import jakarta.annotation.PostConstruct;
-import jakarta.enterprise.context.RequestScoped;
 
-@RequestScoped
+@jakarta.inject.Named("book") @jakarta.enterprise.context.RequestScoped
 public class BookBean implements Serializable {
 
   private String authorName;

diff --git a/src/com/sun/ts/tests/jsf/spec/coretags/common/SelectItemsBean.java b/src/com/sun/ts/tests/jsf/spec/coretags/common/SelectItemsBean.java
@@ -24,6 +24,7 @@
 
 import jakarta.faces.model.SelectItem;
 
+@jakarta.inject.Named("Music") @jakarta.enterprise.context.RequestScoped
 public class SelectItemsBean {
 
   private List<String> myList;

diff --git a/src/com/sun/ts/tests/jsf/spec/coretags/selectitems/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/coretags/selectitems/faces-config.xml
@@ -21,13 +21,4 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-
-    <managed-bean>
-        <managed-bean-name>Music</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.coretags.common.SelectItemsBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
-
 </faces-config>
diff --git a/src/com/sun/ts/tests/jsf/spec/coretags/viewaction/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/coretags/viewaction/faces-config.xml
@@ -21,14 +21,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd"
     version="3.0">
-
-    <managed-bean>
-        <managed-bean-name>book</managed-bean-name>
-        <managed-bean-class>
-            com.sun.ts.tests.jsf.spec.coretags.common.BookBean
-        </managed-bean-class>
-        <managed-bean-scope>request</managed-bean-scope>
-    </managed-bean>
 
     <navigation-rule>
     <from-view-id>/test_facelet.xhtml</from-view-id>

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedBean.java
@@ -22,6 +22,7 @@
 
 import java.io.Serializable;
 
+@jakarta.inject.Named("applicationScoped") @jakarta.enterprise.context.ApplicationScoped
 public class ApplicationScopedBean implements Serializable {
   {
     this.setStringProperty("default");

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPackagePrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPackagePrivateBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("applicationScopedPackagePrivate") @jakarta.enterprise.context.ApplicationScoped
 public class ApplicationScopedPackagePrivateBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPrivateBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("applicationScopedPrivate") @jakarta.enterprise.context.ApplicationScoped
 public class ApplicationScopedPrivateBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedProtectedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedProtectedBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("applicationScopedProtected") @jakarta.enterprise.context.ApplicationScoped
 public class ApplicationScopedProtectedBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPublicBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ApplicationScopedPublicBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("applicationScopedPublic") @jakarta.enterprise.context.ApplicationScoped
 public class ApplicationScopedPublicBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/NoScopeBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/NoScopeBean.java
@@ -22,6 +22,7 @@
 
 import java.io.Serializable;
 
+@jakarta.inject.Named("noScope")
 public class NoScopeBean implements Serializable {
   private String stringProperty;
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedBean.java
@@ -22,6 +22,7 @@
 
 import java.io.Serializable;
 
+@jakarta.inject.Named("requestScoped") @jakarta.enterprise.context.RequestScoped
 public class RequestScopedBean implements Serializable {
   private String stringProperty;
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPackagePrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPackagePrivateBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("requestScopedPackagePrivate") @jakarta.enterprise.context.RequestScoped
 public class RequestScopedPackagePrivateBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPrivateBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("requestScopedPrivate") @jakarta.enterprise.context.RequestScoped
 public class RequestScopedPrivateBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedProtectedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedProtectedBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("requestScopedProtected") @jakarta.enterprise.context.RequestScoped
 public class RequestScopedProtectedBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPublicBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RequestScopedPublicBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("requestScopedPublic") @jakarta.enterprise.context.RequestScoped
 public class RequestScopedPublicBean extends ScopedBean
     implements Serializable {
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RuntimeExceptionPostConstructBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RuntimeExceptionPostConstructBean.java
@@ -24,6 +24,7 @@
 
 import jakarta.annotation.PostConstruct;
 
+@jakarta.inject.Named("RuntimeExceptionPostConstruct") @jakarta.enterprise.context.RequestScoped
 public class RuntimeExceptionPostConstructBean implements Serializable {
 
   // intentionally generate an unchecked exception

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RuntimeExceptionPreDestroyBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/RuntimeExceptionPreDestroyBean.java
@@ -24,6 +24,7 @@
 
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("RuntimeExceptionPreDestroy") @jakarta.enterprise.context.RequestScoped
 public class RuntimeExceptionPreDestroyBean implements Serializable {
 
   // intentionally generate an unchecked exception

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedBean.java
@@ -22,6 +22,7 @@
 
 import java.io.Serializable;
 
+@jakarta.inject.Named("sessionScoped") @jakarta.enterprise.context.SessionScoped
 public class SessionScopedBean implements Serializable {
   private String stringProperty;
 

diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPackagePrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPackagePrivateBean.java
@@ -25,6 +25,7 @@
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.PreDestroy;
 
+@jakarta.inject.Named("sessionScopedPackagePrivate") @jakarta.enterprise.context.SessionScoped
 public class SessionScopedPackagePrivateBean extends ScopedBean
     implements Serializable {