From 22abd19f1a6127de05de3d177b45b88984b3ccff Mon Sep 17 00:00:00 2001 From: Bauke Scholtz Date: Wed, 2 Mar 2022 15:27:49 -0400 Subject: [PATCH] Migrate to @Named -- pass1 Noticed a bunch of ManagedPropertyBean related tests which should either be removed or be reworked to use @ManagedProperty instead --- .../ts/tests/jsf/common/beans/AlbumBean.java | 1 + .../spec/ajax/common/AjaxTagValuesBean.java | 1 + .../jsf/spec/ajax/common/faces-config.xml | 8 - .../absolute_ordering/faces-config.xml | 5 - .../common/beans/AnswerNoBean.java | 1 + .../common/beans/AnswerYesBean.java | 1 + .../common/beans/ColorBlueBean.java | 1 + .../common/beans/ColorRedBean.java | 1 + .../common/beans/OrderingBean.java | 1 + .../common/beans/StatBean.java | 1 + .../relative_ordering/faces-config.xml | 6 - .../colorBean.faces-config.xml | 7 - .../startupbehavior/faces-config.xml | 7 - .../startupbehavior/statBean.faces-config.xml | 7 - .../startupbehavior/testCase2-config.xml | 7 - .../startupbehavior/testCase2-config_1.xml | 7 - .../spec/composite/actionsource/BeanOne.java | 1 + .../composite/actionsource/faces-config.xml | 7 - .../spec/composite/attribute/faces-config.xml | 8 - .../editablevalueholder/FirstNameBean.java | 1 + .../editablevalueholder/LastNameBean.java | 1 + .../editablevalueholder/faces-config.xml | 15 - .../jsf/spec/coretags/common/BookBean.java | 3 +- .../spec/coretags/common/SelectItemsBean.java | 1 + .../coretags/selectitems/faces-config.xml | 9 - .../spec/coretags/viewaction/faces-config.xml | 8 - .../common/ApplicationScopedBean.java | 1 + .../ApplicationScopedPackagePrivateBean.java | 1 + .../common/ApplicationScopedPrivateBean.java | 1 + .../ApplicationScopedProtectedBean.java | 1 + .../common/ApplicationScopedPublicBean.java | 1 + .../el/managedbean/common/NoScopeBean.java | 1 + .../managedbean/common/RequestScopedBean.java | 1 + .../RequestScopedPackagePrivateBean.java | 1 + .../common/RequestScopedPrivateBean.java | 1 + .../common/RequestScopedProtectedBean.java | 1 + .../common/RequestScopedPublicBean.java | 1 + .../RuntimeExceptionPostConstructBean.java | 1 + .../RuntimeExceptionPreDestroyBean.java | 1 + .../managedbean/common/SessionScopedBean.java | 1 + .../SessionScopedPackagePrivateBean.java | 1 + .../common/SessionScopedPrivateBean.java | 1 + .../common/SessionScopedProtectedBean.java | 1 + .../common/SessionScopedPublicBean.java | 1 + .../el/managedbean/common/ViewScopedBean.java | 1 + .../common/ViewScopedPackagePrivateBean.java | 1 + .../common/ViewScopedPrivateBean.java | 1 + .../common/ViewScopedProtectedBean.java | 1 + .../common/ViewScopedPublicBean.java | 1 + .../el/managedbean/common/faces-config.xml | 280 ------------------ .../jsf/spec/render/body/faces-config.xml | 5 - .../booleancheckbox/CheckBoxUIBean.java | 1 + .../render/booleancheckbox/faces-config.xml | 10 - .../commandbutton/CommandButtonUIBean.java | 1 + .../render/commandbutton/faces-config.xml | 15 - .../render/commandlink/CommandLinkUIBean.java | 1 + .../spec/render/commandlink/faces-config.xml | 15 - .../jsf/spec/render/common/AttributeBean.java | 1 + .../jsf/spec/render/common/EscapeBean.java | 1 + .../jsf/spec/render/common/MessageBean.java | 1 + .../render/common/OutputUIComponentBean.java | 1 + .../spec/render/common/SelectMany01Bean.java | 1 + .../render/common/SelectUIComponentBean.java | 1 + .../render/common/SimpleActionListener.java | 1 + .../jsf/spec/render/common/StatBean.java | 1 + .../jsf/spec/render/common/faces-config.xml | 30 -- .../spec/render/datatable/DataListBean.java | 1 + .../render/datatable/DataTableUIBean.java | 1 + .../spec/render/datatable/faces-config.xml | 15 - .../jsf/spec/render/form/FormUIBean.java | 1 + .../jsf/spec/render/form/faces-config.xml | 15 - .../spec/render/graphic/GraphicUIBean.java | 1 + .../jsf/spec/render/graphic/faces-config.xml | 10 - .../jsf/spec/render/grid/GridUIBean.java | 1 + .../jsf/spec/render/grid/faces-config.xml | 5 - .../jsf/spec/render/head/faces-config.xml | 6 - .../jsf/spec/render/hidden/HiddenUIBean.java | 1 + .../jsf/spec/render/hidden/faces-config.xml | 10 - .../render/inputtext/InputTextUIBean.java | 1 + .../spec/render/inputtext/faces-config.xml | 15 - .../spec/render/manycheckbox/faces-config.xml | 15 - .../spec/render/manylistbox/faces-config.xml | 15 - .../jsf/spec/render/manymenu/faces-config.xml | 15 - .../jsf/spec/render/message/faces-config.xml | 10 - .../jsf/spec/render/messages/faces-config.xml | 10 - .../spec/render/onelistbox/faces-config.xml | 10 - .../jsf/spec/render/onemenu/faces-config.xml | 10 - .../jsf/spec/render/oneradio/faces-config.xml | 15 - .../render/outputformat/FormatterBean.java | 1 + .../render/outputformat/FormatterUIBean.java | 1 + .../spec/render/outputformat/faces-config.xml | 15 - .../spec/render/outputlabel/faces-config.xml | 10 - .../spec/render/outputlink/faces-config.xml | 10 - .../spec/render/outputtext/faces-config.xml | 11 - .../jsf/spec/render/secret/faces-config.xml | 10 - .../jsf/spec/render/textarea/faces-config.xml | 10 - 96 files changed, 56 insertions(+), 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 index 135c9360f0..336ad7ee44 100644 --- 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 index eb89b68fa3..baefb7fdf4 100644 --- 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 index 38b987b3b0..61b6273772 100644 --- 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"> - - ajaxtag - - com.sun.ts.tests.jsf.spec.ajax.common.AjaxTagValuesBean - - session - - 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 index d18ea2b1fa..5a9f1de6dd 100644 --- 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"> - - orderingBean - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.OrderingBean - session - D 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 index 502c84458b..7c2637c7e1 100644 --- 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 index b6a7d1214f..99c4c900b6 100644 --- 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 index df91f52829..e9072b7d96 100644 --- 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 index 1037a12fbe..0cc0870551 100644 --- 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 index c4a348e4f3..f498dbe14a 100644 --- 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 index a745d4153a..fea135976b 100644 --- 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 index ca4806ae28..bfbfd31bd6 100644 --- 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"> - - orderingBean - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.OrderingBean - session - - 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 index 6a80cef247..4b585caa02 100644 --- 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"> - - Color - - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.ColorRedBean - - session - 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 index afe0fa5f92..4b585caa02 100644 --- 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"> - - Answer - - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.AnswerYesBean - - session - 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 index 78cbcef8fd..4b585caa02 100644 --- 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"> - - Status - - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.StatBean - - session - 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 index 4932194b1c..4b585caa02 100644 --- 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"> - - Ball - - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.ColorBlueBean - - session - 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 index 9db3810d05..4b585caa02 100644 --- 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"> - - Question - - com.sun.ts.tests.jsf.spec.appconfigresources.common.beans.AnswerNoBean - - session - 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 index 7e8412a3af..02fcd9a759 100644 --- 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 index 5572a70f67..4b585caa02 100644 --- 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"> - - beanOne - - com.sun.ts.tests.jsf.spec.composite.actionsource.BeanOne - - request - 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 index 6cb46ac795..4b585caa02 100644 --- 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"> - - - album - - com.sun.ts.tests.jsf.common.beans.AlbumBean - - request - 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 index 05b12664b8..7aef831821 100644 --- 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 index 9b6271fff2..86925f6c00 100644 --- 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 index f565c7e5dc..61b6273772 100644 --- 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"> - - firstname - - com.sun.ts.tests.jsf.spec.composite.editablevalueholder.FirstNameBean - - session - - - - lastname - - com.sun.ts.tests.jsf.spec.composite.editablevalueholder.LastNameBean - - session - 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 index 186f407a1c..fb77ba1356 100644 --- 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 index a8ab871be2..9b31cbc220 100644 --- 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 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 index e996c1da93..4b585caa02 100644 --- 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"> - - - Music - - com.sun.ts.tests.jsf.spec.coretags.common.SelectItemsBean - - request - - 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 index 0c8396d588..213b60c55b 100644 --- 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"> - - - book - - com.sun.ts.tests.jsf.spec.coretags.common.BookBean - - request - /test_facelet.xhtml 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 index fa42012f43..7e93761710 100644 --- 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 index 272f210f1c..6129ffad08 100644 --- 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 index 9824cfc06f..140a10ee28 100644 --- 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 index 3584b64096..8b5c774584 100644 --- 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 index 1cfb448fc9..69de39bc23 100644 --- 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 index 9213fdb16f..2fe9873a0f 100644 --- 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 index 5f2845c040..6b6c55e12c 100644 --- 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 index f0b6a3ac2f..1267dca4f3 100644 --- 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 index 74affdd529..f3e45d7ae0 100644 --- 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 index 9ae37363c4..ca9a2cc7ec 100644 --- 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 index c46b2980ce..848445da37 100644 --- 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 index 2d59537d2d..a14c24e158 100644 --- 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 index 8f463bba6f..cbbec4ef0d 100644 --- 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 index 93c6aa5ea1..382c884ee1 100644 --- 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 index cd16be2899..21fea222a3 100644 --- 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 { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPrivateBean.java index 3e7fcdeef3..c3b6ad4023 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPrivateBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPrivateBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("sessionScopedPrivate") @jakarta.enterprise.context.SessionScoped public class SessionScopedPrivateBean extends ScopedBean implements Serializable { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedProtectedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedProtectedBean.java index 93d30e8e62..dffee391c9 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedProtectedBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedProtectedBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("sessionScopedProtected") @jakarta.enterprise.context.SessionScoped public class SessionScopedProtectedBean extends ScopedBean implements Serializable { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPublicBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPublicBean.java index 8aa0e85439..baa7b2837c 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPublicBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/SessionScopedPublicBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("sessionScopedPublic") @jakarta.enterprise.context.SessionScoped public class SessionScopedPublicBean extends ScopedBean implements Serializable { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedBean.java index e80096316b..5d9e551920 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedBean.java @@ -22,6 +22,7 @@ import java.io.Serializable; +@jakarta.inject.Named("viewScoped") @jakarta.faces.view.ViewScoped public class ViewScopedBean implements Serializable { private String stringProperty; diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPackagePrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPackagePrivateBean.java index f36d5149a6..7575684846 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPackagePrivateBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPackagePrivateBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("viewScopedPackagePrivate") @jakarta.faces.view.ViewScoped public class ViewScopedPackagePrivateBean extends ScopedBean implements Serializable { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPrivateBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPrivateBean.java index 229c9c73a1..ddea2857f2 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPrivateBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPrivateBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("viewScopedPrivate") @jakarta.faces.view.ViewScoped public class ViewScopedPrivateBean extends ScopedBean implements Serializable { private @PostConstruct void onPostConstructPrivate() { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedProtectedBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedProtectedBean.java index 37c14496b2..d438f4abe7 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedProtectedBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedProtectedBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("viewScopedProtected") @jakarta.faces.view.ViewScoped public class ViewScopedProtectedBean extends ScopedBean implements Serializable { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPublicBean.java b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPublicBean.java index bf6de6a70e..8fd4005597 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPublicBean.java +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/ViewScopedPublicBean.java @@ -25,6 +25,7 @@ import jakarta.annotation.PostConstruct; import jakarta.annotation.PreDestroy; +@jakarta.inject.Named("viewScopedPublic") @jakarta.faces.view.ViewScoped public class ViewScopedPublicBean extends ScopedBean implements Serializable { public @PostConstruct void onPostConstruct() { diff --git a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/faces-config.xml index e1ac4f3e52..8f166cc95c 100644 --- a/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/el/managedbean/common/faces-config.xml @@ -22,286 +22,6 @@ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd" version="3.0"> - - - - requestScoped - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RequestScopedBean - - - request - - - - - - sessionScoped - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.SessionScopedBean - - - session - - - - - - applicationScoped - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ApplicationScopedBean - - - application - - - - - - viewScoped - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ViewScopedBean - - - view - - - - - - noScopeBean - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.NoScopeBean - - - none - - - - - - - requestScopedPackagePrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RequestScopedPackagePrivateBean - - - request - - - - - - requestScopedPrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RequestScopedPrivateBean - - - request - - - - - - requestScopedProtected - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RequestScopedProtectedBean - - - request - - - - - - requestScopedPublic - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RequestScopedPublicBean - - - request - - - - - - sessionScopedPackagePrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.SessionScopedPackagePrivateBean - - - session - - - - - - sessionScopedPrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.SessionScopedPrivateBean - - - session - - - - - - sessionScopedProtected - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.SessionScopedProtectedBean - - - session - - - - - - sessionScopedPublic - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.SessionScopedPublicBean - - - session - - - - - - applicationScopedPackagePrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ApplicationScopedPackagePrivateBean - - - application - - - - - - applicationScopedPrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ApplicationScopedPrivateBean - - - application - - - - - - applicationScopedProtected - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ApplicationScopedProtectedBean - - - application - - - - - - applicationScopedPublic - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ApplicationScopedPublicBean - - - application - - - - - - viewScopedPackagePrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ViewScopedPackagePrivateBean - - - request - - - - - - viewScopedPrivate - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ViewScopedPrivateBean - - - request - - - - - - viewScopedProtected - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ViewScopedProtectedBean - - - request - - - - - - viewScopedPublic - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.ViewScopedPublicBean - - - request - - - - - - - RuntimeExceptionPostConstruct - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RuntimeExceptionPostConstructBean - - - request - - - - - - - RuntimeExceptionPreDestroy - - - com.sun.ts.tests.jsf.spec.el.managedbean.common.RuntimeExceptionPreDestroyBean - - - request - - - diff --git a/src/com/sun/ts/tests/jsf/spec/render/body/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/body/faces-config.xml index dc44a575a2..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/body/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/body/faces-config.xml @@ -21,9 +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"> - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/CheckBoxUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/CheckBoxUIBean.java index 2e077f5e1d..e29cee9ed8 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/CheckBoxUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/CheckBoxUIBean.java @@ -22,6 +22,7 @@ import jakarta.faces.component.html.HtmlSelectBooleanCheckbox; +@jakarta.inject.Named("status") @jakarta.enterprise.context.RequestScoped public class CheckBoxUIBean { private HtmlSelectBooleanCheckbox yesno; diff --git a/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/faces-config.xml index 3916ec833a..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/booleancheckbox/faces-config.xml @@ -21,14 +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"> - - status - com.sun.ts.tests.jsf.spec.render.booleancheckbox.CheckBoxUIBean - request - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/commandbutton/CommandButtonUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/commandbutton/CommandButtonUIBean.java index db319c2648..d162a5f6a3 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/commandbutton/CommandButtonUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/commandbutton/CommandButtonUIBean.java @@ -22,6 +22,7 @@ import jakarta.faces.component.html.HtmlCommandButton; +@jakarta.inject.Named("status") @jakarta.enterprise.context.SessionScoped public class CommandButtonUIBean { private HtmlCommandButton onoff; diff --git a/src/com/sun/ts/tests/jsf/spec/render/commandbutton/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/commandbutton/faces-config.xml index 63daf93dff..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/commandbutton/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/commandbutton/faces-config.xml @@ -21,19 +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"> - - status - com.sun.ts.tests.jsf.spec.render.commandbutton.CommandButtonUIBean - request - - - ActionListener - com.sun.ts.tests.jsf.spec.render.common.SimpleActionListener - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/commandlink/CommandLinkUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/commandlink/CommandLinkUIBean.java index 8bfc8a4037..9bd96143d6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/commandlink/CommandLinkUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/commandlink/CommandLinkUIBean.java @@ -22,6 +22,7 @@ import jakarta.faces.component.html.HtmlCommandLink; +@jakarta.inject.Named("linker") @jakarta.enterprise.context.RequestScoped public class CommandLinkUIBean { private HtmlCommandLink gothere; diff --git a/src/com/sun/ts/tests/jsf/spec/render/commandlink/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/commandlink/faces-config.xml index d1541cbe4a..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/commandlink/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/commandlink/faces-config.xml @@ -21,19 +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"> - - linker - com.sun.ts.tests.jsf.spec.render.commandlink.CommandLinkUIBean - request - - - ActionListener - com.sun.ts.tests.jsf.spec.render.common.SimpleActionListener - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java index 6db71dafca..ebe33dcb0b 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/AttributeBean.java @@ -23,6 +23,7 @@ import java.util.HashMap; import java.util.Map; +@jakarta.inject.Named("Attribute") @jakarta.enterprise.context.SessionScoped public class AttributeBean { public Map attMap = new HashMap(); diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/EscapeBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/EscapeBean.java index b665ec85c4..48f09515c6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/EscapeBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/EscapeBean.java @@ -16,6 +16,7 @@ package com.sun.ts.tests.jsf.spec.render.common; +@jakarta.inject.Named("Escape") @jakarta.enterprise.context.SessionScoped public class EscapeBean { private String foo; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/MessageBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/MessageBean.java index 9a271b27df..90654cde5f 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/MessageBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/MessageBean.java @@ -23,6 +23,7 @@ import jakarta.faces.application.FacesMessage; import jakarta.faces.context.FacesContext; +@jakarta.inject.Named("Message") @jakarta.enterprise.context.SessionScoped public class MessageBean { private static String INFO_SUMMARY = "INFO: Summary Message"; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/OutputUIComponentBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/OutputUIComponentBean.java index a0f2dabc90..7304f6bb9d 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/OutputUIComponentBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/OutputUIComponentBean.java @@ -23,6 +23,7 @@ import jakarta.faces.component.html.HtmlOutputLink; import jakarta.faces.component.html.HtmlOutputText; +@jakarta.inject.Named("Out") @jakarta.enterprise.context.SessionScoped public class OutputUIComponentBean { private HtmlOutputLabel label; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/SelectMany01Bean.java b/src/com/sun/ts/tests/jsf/spec/render/common/SelectMany01Bean.java index b07c17307c..d2f2e24108 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/SelectMany01Bean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/SelectMany01Bean.java @@ -37,6 +37,7 @@ /** * $Id: */ +@jakarta.inject.Named("select01") @jakarta.enterprise.context.SessionScoped public class SelectMany01Bean { private final Collection possibleValues; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/SelectUIComponentBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/SelectUIComponentBean.java index 36227d45b0..88eeebe8a5 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/SelectUIComponentBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/SelectUIComponentBean.java @@ -25,6 +25,7 @@ import jakarta.faces.component.UISelectItem; import jakarta.faces.context.FacesContext; +@jakarta.inject.Named("Answer") @jakarta.enterprise.context.SessionScoped public class SelectUIComponentBean { private UIComponent yesNo; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java b/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java index cbb3a9c7e5..521b82520a 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/SimpleActionListener.java @@ -30,6 +30,7 @@ import jakarta.faces.event.ActionListener; import jakarta.servlet.http.HttpServletResponse; +@jakarta.inject.Named("ActionListener") @jakarta.enterprise.context.SessionScoped public class SimpleActionListener implements ActionListener { /** diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/StatBean.java b/src/com/sun/ts/tests/jsf/spec/render/common/StatBean.java index ae419c5567..2fb46dba6d 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/StatBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/common/StatBean.java @@ -20,6 +20,7 @@ package com.sun.ts.tests.jsf.spec.render.common; +@jakarta.inject.Named("Status") @jakarta.enterprise.context.SessionScoped public class StatBean { private String formOneOutput = ""; diff --git a/src/com/sun/ts/tests/jsf/spec/render/common/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/common/faces-config.xml index 47838373b0..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/common/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/common/faces-config.xml @@ -21,34 +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"> - - ActionListener - com.sun.ts.tests.jsf.spec.render.common.SimpleActionListener - session - - - Message - com.sun.ts.tests.jsf.spec.render.common.MessageBean - session - - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - Out - com.sun.ts.tests.jsf.spec.render.common.OutputUIComponentBean - session - - - select01 - com.sun.ts.tests.jsf.spec.render.common.SelectMany01Bean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/datatable/DataListBean.java b/src/com/sun/ts/tests/jsf/spec/render/datatable/DataListBean.java index b45dffcb3d..f19eda6d2b 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/datatable/DataListBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/datatable/DataListBean.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.List; +@jakarta.inject.Named("dList") @jakarta.enterprise.context.RequestScoped public class DataListBean { private List dataList = new ArrayList(); diff --git a/src/com/sun/ts/tests/jsf/spec/render/datatable/DataTableUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/datatable/DataTableUIBean.java index 447df0619d..b4de6a2749 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/datatable/DataTableUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/datatable/DataTableUIBean.java @@ -25,6 +25,7 @@ import jakarta.faces.component.html.HtmlOutputText; import jakarta.faces.context.FacesContext; +@jakarta.inject.Named("library") @jakarta.enterprise.context.SessionScoped public class DataTableUIBean { private HtmlDataTable books; diff --git a/src/com/sun/ts/tests/jsf/spec/render/datatable/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/datatable/faces-config.xml index 2e92184820..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/datatable/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/datatable/faces-config.xml @@ -21,19 +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"> - - library - com.sun.ts.tests.jsf.spec.render.datatable.DataTableUIBean - session - - - dList - com.sun.ts.tests.jsf.spec.render.datatable.DataListBean - request - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/form/FormUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/form/FormUIBean.java index 682f6fae25..e44eb60c09 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/form/FormUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/form/FormUIBean.java @@ -24,6 +24,7 @@ import jakarta.faces.component.html.HtmlInputText; import jakarta.faces.context.FacesContext; +@jakarta.inject.Named("greeting") @jakarta.enterprise.context.SessionScoped public class FormUIBean { private HtmlForm myForm; diff --git a/src/com/sun/ts/tests/jsf/spec/render/form/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/form/faces-config.xml index b31ef78448..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/form/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/form/faces-config.xml @@ -21,19 +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"> - - greeting - com.sun.ts.tests.jsf.spec.render.form.FormUIBean - session - - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/graphic/GraphicUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/graphic/GraphicUIBean.java index 187de51983..33676b6a42 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/graphic/GraphicUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/graphic/GraphicUIBean.java @@ -22,6 +22,7 @@ import jakarta.faces.component.html.HtmlGraphicImage; +@jakarta.inject.Named("pictures") @jakarta.enterprise.context.SessionScoped public class GraphicUIBean { private HtmlGraphicImage img1; diff --git a/src/com/sun/ts/tests/jsf/spec/render/graphic/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/graphic/faces-config.xml index 5beca34e09..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/graphic/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/graphic/faces-config.xml @@ -21,14 +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"> - - pictures - com.sun.ts.tests.jsf.spec.render.graphic.GraphicUIBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/grid/GridUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/grid/GridUIBean.java index 7a01aadcb7..8726c6cadb 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/grid/GridUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/grid/GridUIBean.java @@ -26,6 +26,7 @@ import jakarta.faces.component.html.HtmlPanelGrid; import jakarta.faces.context.FacesContext; +@jakarta.inject.Named("location") @jakarta.enterprise.context.SessionScoped public class GridUIBean { private HtmlPanelGrid gps; diff --git a/src/com/sun/ts/tests/jsf/spec/render/grid/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/grid/faces-config.xml index 779948fba6..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/grid/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/grid/faces-config.xml @@ -21,9 +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"> - - location - com.sun.ts.tests.jsf.spec.render.grid.GridUIBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/head/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/head/faces-config.xml index 6c184c4c01..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/head/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/head/faces-config.xml @@ -21,10 +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"> - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/hidden/HiddenUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/hidden/HiddenUIBean.java index 5dc7e08c79..ef48bbcdb9 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/hidden/HiddenUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/hidden/HiddenUIBean.java @@ -21,6 +21,7 @@ import jakarta.faces.component.html.HtmlInputHidden; +@jakarta.inject.Named("scene") @jakarta.enterprise.context.SessionScoped public class HiddenUIBean { private HtmlInputHidden seeMe; diff --git a/src/com/sun/ts/tests/jsf/spec/render/hidden/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/hidden/faces-config.xml index 7f90a0d643..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/hidden/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/hidden/faces-config.xml @@ -21,14 +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"> - - scene - com.sun.ts.tests.jsf.spec.render.hidden.HiddenUIBean - session - - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/inputtext/InputTextUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/inputtext/InputTextUIBean.java index feecaf3482..d9361214c1 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/inputtext/InputTextUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/inputtext/InputTextUIBean.java @@ -21,6 +21,7 @@ import jakarta.faces.component.html.HtmlInputText; +@jakarta.inject.Named("Hello") @jakarta.enterprise.context.SessionScoped public class InputTextUIBean { private HtmlInputText greeting; diff --git a/src/com/sun/ts/tests/jsf/spec/render/inputtext/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/inputtext/faces-config.xml index 99be496d4c..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/inputtext/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/inputtext/faces-config.xml @@ -21,19 +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"> - - Hello - com.sun.ts.tests.jsf.spec.render.inputtext.InputTextUIBean - session - - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/manycheckbox/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/manycheckbox/faces-config.xml index 59a58ee068..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/manycheckbox/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/manycheckbox/faces-config.xml @@ -21,19 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - select01 - com.sun.ts.tests.jsf.spec.render.common.SelectMany01Bean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/manylistbox/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/manylistbox/faces-config.xml index 59a58ee068..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/manylistbox/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/manylistbox/faces-config.xml @@ -21,19 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - select01 - com.sun.ts.tests.jsf.spec.render.common.SelectMany01Bean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/manymenu/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/manymenu/faces-config.xml index 59a58ee068..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/manymenu/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/manymenu/faces-config.xml @@ -21,19 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - select01 - com.sun.ts.tests.jsf.spec.render.common.SelectMany01Bean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/message/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/message/faces-config.xml index 2dbae6ac15..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/message/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/message/faces-config.xml @@ -21,14 +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"> - - Message - com.sun.ts.tests.jsf.spec.render.common.MessageBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/messages/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/messages/faces-config.xml index 2dbae6ac15..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/messages/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/messages/faces-config.xml @@ -21,14 +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"> - - Message - com.sun.ts.tests.jsf.spec.render.common.MessageBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/onelistbox/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/onelistbox/faces-config.xml index c3ddfa1708..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/onelistbox/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/onelistbox/faces-config.xml @@ -21,14 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/onemenu/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/onemenu/faces-config.xml index c3ddfa1708..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/onemenu/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/onemenu/faces-config.xml @@ -21,14 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/oneradio/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/oneradio/faces-config.xml index 7b92f88fd0..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/oneradio/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/oneradio/faces-config.xml @@ -21,19 +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"> - - Answer - com.sun.ts.tests.jsf.spec.render.common.SelectUIComponentBean - session - - - Escape - com.sun.ts.tests.jsf.spec.render.common.EscapeBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterBean.java b/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterBean.java index 0679329c4f..c6f445e18d 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterBean.java @@ -21,6 +21,7 @@ import java.io.Serializable; +@jakarta.inject.Named("info") @jakarta.enterprise.context.SessionScoped public class FormatterBean implements Serializable { public String technology = "JSF"; diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterUIBean.java b/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterUIBean.java index 1a7df47624..eb3b22823f 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterUIBean.java +++ b/src/com/sun/ts/tests/jsf/spec/render/outputformat/FormatterUIBean.java @@ -21,6 +21,7 @@ import jakarta.faces.component.html.HtmlOutputFormat; +@jakarta.inject.Named("score") @jakarta.enterprise.context.SessionScoped public class FormatterUIBean { private HtmlOutputFormat fscore; diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputformat/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/outputformat/faces-config.xml index f997e29c52..b0797c49be 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputformat/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/outputformat/faces-config.xml @@ -21,19 +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"> - - info - com.sun.ts.tests.jsf.spec.render.outputformat.FormatterBean - session - - - score - com.sun.ts.tests.jsf.spec.render.outputformat.FormatterUIBean - request - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputlabel/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/outputlabel/faces-config.xml index b67912b47c..00da8111d6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputlabel/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/outputlabel/faces-config.xml @@ -21,14 +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"> - - Out - com.sun.ts.tests.jsf.spec.render.common.OutputUIComponentBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputlink/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/outputlink/faces-config.xml index b67912b47c..00da8111d6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputlink/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/outputlink/faces-config.xml @@ -21,14 +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"> - - Out - com.sun.ts.tests.jsf.spec.render.common.OutputUIComponentBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/outputtext/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/outputtext/faces-config.xml index 2b91b8ad8f..62722a191a 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/outputtext/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/outputtext/faces-config.xml @@ -20,15 +20,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"> - - - Out - com.sun.ts.tests.jsf.spec.render.common.OutputUIComponentBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/secret/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/secret/faces-config.xml index 03bd55f8d5..00da8111d6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/secret/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/secret/faces-config.xml @@ -21,14 +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"> - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session - diff --git a/src/com/sun/ts/tests/jsf/spec/render/textarea/faces-config.xml b/src/com/sun/ts/tests/jsf/spec/render/textarea/faces-config.xml index 03bd55f8d5..00da8111d6 100644 --- a/src/com/sun/ts/tests/jsf/spec/render/textarea/faces-config.xml +++ b/src/com/sun/ts/tests/jsf/spec/render/textarea/faces-config.xml @@ -21,14 +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"> - - Status - com.sun.ts.tests.jsf.spec.render.common.StatBean - session - - - Attribute - com.sun.ts.tests.jsf.spec.render.common.AttributeBean - session -