You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2023/08/03 14:54:25 UTC
[myfaces-tobago] branch JakartaEE10 created (now 35534574a4)
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a change to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
at 35534574a4 feature(jakarta10): tomcat, jetty, docker
This branch includes the following new commits:
new 9f9ecc54fa feature(jakarta10): rename XML namespace
new 3e53e58d01 feature(jakarta10): update schema version
new 604e292377 feature: Jakarta EE 10
new 04bbd1980b feature(jakarta10): tag declarations
new 5811ffbb81 feature(jakarta10): open-liberty
new 35534574a4 feature(jakarta10): tomcat, jetty, docker
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[myfaces-tobago] 01/06: feature(jakarta10): rename XML namespace
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 9f9ecc54fa899f78cf918a6794f9948e023e6476
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Jul 27 10:26:59 2023 +0200
feature(jakarta10): rename XML namespace
* replace "http://xmlns.jcp.org/jsf/" with "jakarta.faces."
* replace "http://xmlns.jcp.org/jsp/jstl/core" with "jakarta.tags.core"
Issue: TOBAGO-2094
---
.../src/main/resources/META-INF/resources/tobago/error.xhtml | 2 +-
.../tobago-example-blank/src/main/webapp/helloWorld.xhtml | 2 +-
tobago-example/tobago-example-blank/src/main/webapp/result.xhtml | 2 +-
.../src/main/webapp/content/000-intro/05-search/Search.xhtml | 4 ++--
.../content/000-intro/10-getting-started/Getting_Started.xhtml | 2 +-
.../src/main/webapp/content/000-intro/20-docker/Docker.xhtml | 2 +-
.../content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml | 4 ++--
.../content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml | 4 ++--
.../content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml | 4 ++--
.../content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml | 4 ++--
.../content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml | 4 ++--
.../content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml | 4 ++--
.../content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml | 4 ++--
.../content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml | 4 ++--
.../content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml | 2 +-
.../content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml | 4 ++--
.../content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml | 4 ++--
.../content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml | 2 +-
.../src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml | 2 +-
.../content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml | 2 +-
.../content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml | 2 +-
.../content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml | 2 +-
.../content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml | 2 +-
.../content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml | 2 +-
.../src/main/webapp/content/000-intro/50-migration/Migration.xhtml | 2 +-
.../webapp/content/000-intro/60-compatibility/Compatibility.xhtml | 2 +-
.../src/main/webapp/content/000-intro/70-faq/FAQ.xhtml | 2 +-
.../src/main/webapp/content/000-intro/80-api/API.xhtml | 4 ++--
.../src/main/webapp/content/000-intro/85-download/Download.xhtml | 4 ++--
.../content/000-intro/90-release-checklist/Release_Checklist.xhtml | 6 +++---
.../main/webapp/content/000-intro/93-server-info/Server_Info.xhtml | 2 +-
.../webapp/content/000-intro/96-logging-info/Logging_Info.xhtml | 4 ++--
.../src/main/webapp/content/000-intro/Intro.xhtml | 2 +-
.../src/main/webapp/content/010-input/10-in/In.xhtml | 4 ++--
.../src/main/webapp/content/010-input/20-suggest/Suggest.xhtml | 2 +-
.../src/main/webapp/content/010-input/30-textarea/Textarea.xhtml | 4 ++--
.../src/main/webapp/content/010-input/40-date/Date.xhtml | 4 ++--
.../src/main/webapp/content/010-input/45-range/Range.xhtml | 4 ++--
.../src/main/webapp/content/010-input/50-input-group/Group.xhtml | 4 ++--
.../src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml | 4 ++--
.../src/main/webapp/content/010-input/Input.xhtml | 4 ++--
.../src/main/webapp/content/020-output/10-out/Out.xhtml | 2 +-
.../src/main/webapp/content/020-output/20-label/Label.xhtml | 2 +-
.../src/main/webapp/content/020-output/25-badge/Badge.xhtml | 6 +++---
.../src/main/webapp/content/020-output/40-image/Image.xhtml | 2 +-
.../src/main/webapp/content/020-output/45-figure/Figure.xhtml | 2 +-
.../src/main/webapp/content/020-output/50-progress/Progress.xhtml | 4 ++--
.../src/main/webapp/content/020-output/60-object/Object.xhtml | 4 ++--
.../src/main/webapp/content/020-output/Output.xhtml | 2 +-
.../content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml | 4 ++--
.../webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml | 4 ++--
.../webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml | 4 ++--
.../main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml | 6 +++---
.../webapp/content/030-select/40-selectOneListbox/Listbox.xhtml | 4 ++--
.../webapp/content/030-select/45-selectOneList/SelectOneList.xhtml | 4 ++--
.../content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml | 6 +++---
.../content/030-select/60-selectManyListbox/Multi_Listbox.xhtml | 4 ++--
.../webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml | 4 ++--
.../content/030-select/80-selectManyList/SelectManyList.xhtml | 4 ++--
.../src/main/webapp/content/030-select/Select.xhtml | 2 +-
.../webapp/content/040-command/00-button-link/Button_and_Link.xhtml | 4 ++--
.../webapp/content/040-command/10-default/Default_Command.xhtml | 2 +-
.../main/webapp/content/040-command/20-buttons/Button_Group.xhtml | 2 +-
.../content/040-command/21-buttons-customizer/Customizer.xhtml | 6 +++---
.../src/main/webapp/content/040-command/25-links/Link_Group.xhtml | 2 +-
.../src/main/webapp/content/040-command/Command.xhtml | 2 +-
.../src/main/webapp/content/050-container/10-box/Box.xhtml | 4 ++--
.../src/main/webapp/content/050-container/20-panel/Panel.xhtml | 4 ++--
.../main/webapp/content/050-container/30-separator/Separator.xhtml | 2 +-
.../src/main/webapp/content/050-container/40-section/Section.xhtml | 2 +-
.../content/050-container/50-header-footer/Header_and_Footer.xhtml | 2 +-
.../050-container/50-header-footer/x-header-footer-example.xhtml | 4 ++--
.../src/main/webapp/content/050-container/60-bar/Bar.xhtml | 4 ++--
.../src/main/webapp/content/050-container/Container.xhtml | 2 +-
.../src/main/webapp/content/060-popup/Popup.xhtml | 4 ++--
.../src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml | 4 ++--
.../src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml | 4 ++--
.../src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml | 2 +-
.../src/main/webapp/content/070-tab/Tab_Group.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml | 4 ++--
.../content/080-sheet/20-selector/Sheet_Column_Selector.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/32-action/Sheet_Action.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml | 2 +-
.../src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml | 2 +-
.../src/main/webapp/content/080-sheet/45-bar/Column_Bar.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml | 4 ++--
.../content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml | 2 +-
.../content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml | 2 +-
.../src/main/webapp/content/080-sheet/75-panel/Column_Panel.xhtml | 2 +-
.../main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml | 4 ++--
.../src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml | 2 +-
.../src/main/webapp/content/080-sheet/95-nested/Sheet_Nested.xhtml | 2 +-
.../src/main/webapp/content/080-sheet/Sheet.xhtml | 2 +-
.../webapp/content/090-tree/00-command/Tree_Command_Types.xhtml | 2 +-
.../src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml | 4 ++--
.../src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml | 4 ++--
.../src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml | 2 +-
.../src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml | 2 +-
.../tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml | 4 ++--
.../src/main/webapp/content/100-upload/File_Upload.xhtml | 4 ++--
.../src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml | 4 ++--
.../src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml | 4 ++--
.../src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml | 2 +-
.../src/main/webapp/content/120-layout/10-flow/Flow_Layout.xhtml | 2 +-
.../src/main/webapp/content/120-layout/20-flex/Flex_Layout.xhtml | 2 +-
.../main/webapp/content/120-layout/30-segment/Segment_Layout.xhtml | 2 +-
.../src/main/webapp/content/120-layout/40-label/Label_Layout.xhtml | 2 +-
.../src/main/webapp/content/120-layout/50-grid/Grid_Layout.xhtml | 4 ++--
.../src/main/webapp/content/120-layout/60-split/Split_Layout.xhtml | 2 +-
.../content/120-layout/90-message-layout/message-layout.xhtml | 2 +-
.../src/main/webapp/content/120-layout/Layout.xhtml | 2 +-
.../130-collapsible/00-collapsible-box/Collapsible_Box.xhtml | 4 ++--
.../130-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml | 4 ++--
.../130-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml | 4 ++--
.../30-collapsible-section/Collapsible_Section.xhtml | 4 ++--
.../src/main/webapp/content/130-collapsible/Collapsible.xhtml | 2 +-
.../src/main/webapp/content/140-partial/Partial_Ajax.xhtml | 4 ++--
.../src/main/webapp/content/150-behavior/Behavior.xhtml | 4 ++--
.../src/main/webapp/content/160-form/10-required/Required.xhtml | 2 +-
.../src/main/webapp/content/160-form/20-ajax/Ajax.xhtml | 4 ++--
.../tobago-example-demo/src/main/webapp/content/160-form/Form.xhtml | 2 +-
.../main/webapp/content/170-validation/00/Content_Validation.xhtml | 4 ++--
.../src/main/webapp/content/170-validation/01/JSR_303.xhtml | 2 +-
.../src/main/webapp/content/170-validation/02/Severity.xhtml | 2 +-
.../main/webapp/content/170-validation/30-messages/Messages.xhtml | 4 ++--
.../src/main/webapp/content/170-validation/Validation.xhtml | 2 +-
.../src/main/webapp/content/180-conversion/Conversion.xhtml | 4 ++--
.../src/main/webapp/content/190-format/Format.xhtml | 2 +-
.../src/main/webapp/content/200-theme/Theme.xhtml | 4 ++--
.../src/main/webapp/content/205-style/10-style/Style_Tag.xhtml | 4 ++--
.../src/main/webapp/content/205-style/20-bootstrap/Bootstrap.xhtml | 4 ++--
.../src/main/webapp/content/205-style/Styling.xhtml | 4 ++--
.../src/main/webapp/content/210-browser/Browser.xhtml | 2 +-
.../src/main/webapp/content/220-locale/Locale.xhtml | 4 ++--
.../src/main/webapp/content/230-accessKey/AccessKey.xhtml | 4 ++--
.../src/main/webapp/content/240-dataAttribute/DataAttribute.xhtml | 2 +-
.../src/main/webapp/content/250-focus/Focus.xhtml | 2 +-
.../tobago-example-demo/src/main/webapp/content/260-meta/Meta.xhtml | 2 +-
.../src/main/webapp/content/270-icons/Icons.xhtml | 2 +-
.../content/280-security/05-csp/Content_Security_Policy.xhtml | 2 +-
.../src/main/webapp/content/280-security/10-sanitize/Sanitize.xhtml | 2 +-
.../src/main/webapp/content/280-security/20-roles/Roles.xhtml | 2 +-
.../src/main/webapp/content/280-security/20-roles/x-login.xhtml | 2 +-
.../src/main/webapp/content/280-security/Security.xhtml | 2 +-
.../src/main/webapp/content/290-error/Error_Handling.xhtml | 2 +-
.../src/main/webapp/content/290-error/x-error-in-syntax.xhtml | 4 ++--
.../webapp/content/300-exception-handler/Exception_Handler.xhtml | 4 ++--
.../src/main/webapp/content/310-for-each/For_Each.xhtml | 4 ++--
.../src/main/webapp/content/320-resize/Resize.xhtml | 4 ++--
.../src/main/webapp/content/330-conversation/Conversation.xhtml | 2 +-
.../src/main/webapp/content/340-websocket/WebSocket.xhtml | 4 ++--
.../src/main/webapp/content/350-transition/Transition.xhtml | 2 +-
.../webapp/content/350-transition/x-transition-after-sleep.xhtml | 2 +-
.../webapp/content/360-non-faces-response/Non_Faces_Response.xhtml | 2 +-
.../webapp/content/370-non-faces-request/Non_Faces_Request.xhtml | 2 +-
.../src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml | 4 ++--
.../src/main/webapp/content/500-config/Configuration.xhtml | 2 +-
.../content/900-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml | 2 +-
.../content/900-test/1025-suggest-group/Suggest_Input_Group.xhtml | 4 ++--
.../src/main/webapp/content/900-test/1100-date/Date.xhtml | 4 ++--
.../content/900-test/1500-output/21-label-for/Label_For.xhtml | 4 ++--
.../src/main/webapp/content/900-test/1500-output/Output.xhtml | 2 +-
.../src/main/webapp/content/900-test/1540-image/image.xhtml | 2 +-
.../src/main/webapp/content/900-test/2000-selectItem/Currency.xhtml | 2 +-
.../webapp/content/900-test/2000-selectItem/List_Of_Objects.xhtml | 2 +-
.../webapp/content/900-test/2000-selectItem/Type_Of_Literals.xhtml | 2 +-
.../src/main/webapp/content/900-test/2200-shuttle/shuttle.xhtml | 2 +-
.../src/main/webapp/content/900-test/2300-link/Link.xhtml | 4 ++--
.../main/webapp/content/900-test/2400-popup/Popup_with_jQuery.xhtml | 4 ++--
.../src/main/webapp/content/900-test/2500-tab/Tabgroup_Style.xhtml | 2 +-
.../content/900-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml | 2 +-
.../3000-sheet/20-sheet-column-width/Sheet_Column_Width.xhtml | 2 +-
.../3000-sheet/30-sheet-margin-bottom/Sheet_Margin_Bottom.xhtml | 2 +-
.../900-test/3000-sheet/40-sheet-selector/Sheet_Selector.xhtml | 2 +-
.../webapp/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml | 2 +-
.../src/main/webapp/content/900-test/3000-sheet/Sheet.xhtml | 2 +-
.../4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml | 4 ++--
.../main/webapp/content/900-test/4000-button-link/Button_Link.xhtml | 4 ++--
.../main/webapp/content/900-test/4000-button-link/x-action.xhtml | 2 +-
.../src/main/webapp/content/900-test/4000-button-link/x-link.xhtml | 2 +-
.../webapp/content/900-test/40000-style/100-headings/Headings.xhtml | 4 ++--
.../webapp/content/900-test/40000-style/215-input-group/Group.xhtml | 4 ++--
.../main/webapp/content/900-test/40000-style/300-nonce/Nonce.xhtml | 4 ++--
.../src/main/webapp/content/900-test/40000-style/Style.xhtml | 2 +-
.../webapp/content/900-test/4100-footer/FixedFooter_height.xhtml | 2 +-
.../src/main/webapp/content/900-test/4200-dropdown/Dropdown.xhtml | 4 ++--
.../10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml | 2 +-
.../900-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml | 2 +-
.../20-label-vertical/Grid_Layout_Label_Vertical.xhtml | 2 +-
.../content/900-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml | 2 +-
.../main/webapp/content/900-test/4600-gridLayout/Grid_Layout.xhtml | 2 +-
.../main/webapp/content/900-test/4700-flexLayout/FlexLayout.xhtml | 4 ++--
.../main/webapp/content/900-test/4700-flexLayout/x-template.xhtml | 4 ++--
.../main/webapp/content/900-test/4700-flexLayout/x-textarea-1.xhtml | 2 +-
.../content/900-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml | 2 +-
.../900-test/4800-labelLayout/200-input-heigth/Input_Height.xhtml | 2 +-
.../300-label-input-spacing/Label_Input_Spacing.xhtml | 2 +-
.../4800-labelLayout/350-label-required/Label_Required.xhtml | 2 +-
.../4800-labelLayout/500-message-layout/message-layout.xhtml | 4 ++--
.../main/webapp/content/900-test/4800-labelLayout/LabelLayout.xhtml | 4 ++--
.../content/900-test/4810-labelLayoutTop/LabelLayoutTop.xhtml | 4 ++--
.../4900-messageLayout/100-position/decorationPosition.xhtml | 4 ++--
.../webapp/content/900-test/4900-messageLayout/messageLayout.xhtml | 2 +-
.../src/main/webapp/content/900-test/5000-form/Sheet_In_Form.xhtml | 4 ++--
.../RendererBase_GetCurrentValue.xhtml | 4 ++--
.../content/900-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml | 4 ++--
.../30-ajax-special-character/Ajax_Special_Character.xhtml | 4 ++--
.../webapp/content/900-test/50000-java/40-force-npe/Force_NPE.xhtml | 4 ++--
.../src/main/webapp/content/900-test/50000-java/Java.xhtml | 2 +-
.../5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml | 4 ++--
.../900-test/5500-compositeComponent/Composite_Components.xhtml | 4 ++--
.../src/main/webapp/content/900-test/6000-event/Event.xhtml | 4 ++--
.../src/main/webapp/content/900-test/6000-event/Event_1870.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-bar.xhtml | 2 +-
.../main/webapp/content/900-test/6000-event/x-event-button.xhtml | 6 +++---
.../src/main/webapp/content/900-test/6000-event/x-event-date.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-file.xhtml | 2 +-
.../main/webapp/content/900-test/6000-event/x-event-hidden.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-in.xhtml | 6 +++---
.../src/main/webapp/content/900-test/6000-event/x-event-link.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-page.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-panel.xhtml | 2 +-
.../main/webapp/content/900-test/6000-event/x-event-progress.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-row.xhtml | 6 +++---
.../content/900-test/6000-event/x-event-selectBooleanCheckbox.xhtml | 6 +++---
.../content/900-test/6000-event/x-event-selectManyCheckbox.xhtml | 2 +-
.../content/900-test/6000-event/x-event-selectManyListbox.xhtml | 2 +-
.../content/900-test/6000-event/x-event-selectManyShuttle.xhtml | 2 +-
.../content/900-test/6000-event/x-event-selectOneChoice.xhtml | 2 +-
.../webapp/content/900-test/6000-event/x-event-selectOneList.xhtml | 6 +++---
.../content/900-test/6000-event/x-event-selectOneListbox.xhtml | 6 +++---
.../webapp/content/900-test/6000-event/x-event-selectOneRadio.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-sheet.xhtml | 2 +-
.../src/main/webapp/content/900-test/6000-event/x-event-tab.xhtml | 2 +-
.../main/webapp/content/900-test/6000-event/x-event-tabGroup.xhtml | 2 +-
.../main/webapp/content/900-test/6000-event/x-event-textarea.xhtml | 6 +++---
.../webapp/content/900-test/6000-event/x-event-treeCommand.xhtml | 2 +-
.../webapp/content/900-test/6000-event/x-event-treeSelect.xhtml | 2 +-
.../900-test/60000-manual/4000-button-link/Button_Link.xhtml | 4 ++--
.../webapp/content/900-test/60000-manual/4500-suggest/Suggest.xhtml | 4 ++--
.../900-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml | 4 ++--
.../900-test/60000-manual/5000-messageLayout/MessageLayout.xhtml | 4 ++--
.../src/main/webapp/content/900-test/60000-manual/Manual.xhtml | 2 +-
.../src/main/webapp/content/900-test/6500-behavior/Behavior.xhtml | 4 ++--
.../webapp/content/900-test/7000-layout/Markup_Spread_Flex.xhtml | 2 +-
.../webapp/content/900-test/7000-layout/Markup_Spread_Grid.xhtml | 2 +-
.../src/main/webapp/content/900-test/9000-attribute/Attribute.xhtml | 4 ++--
.../tobago-example-demo/src/main/webapp/content/900-test/Test.xhtml | 2 +-
.../tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml | 4 ++--
.../tobago-example-demo/src/main/webapp/error/exception.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/init.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/login.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/main.xhtml | 4 ++--
tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml | 4 ++--
.../src/main/webapp/resources/demo-components/dropdown-dummy.xhtml | 2 +-
.../src/main/webapp/resources/demo-components/inputAsText.xhtml | 2 +-
.../src/main/webapp/resources/demo-components/rolesTest.xhtml | 2 +-
tobago-example/tobago-example-demo/src/main/webapp/test.xhtml | 2 +-
.../tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml | 4 ++--
tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml | 4 ++--
266 files changed, 403 insertions(+), 403 deletions(-)
diff --git a/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml b/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
index 3a1f7201b6..906d57e80b 100644
--- a/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
+++ b/tobago-core/src/main/resources/META-INF/resources/tobago/error.xhtml
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
+<f:view xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml b/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
index 03e9d387a1..4c7ec801b7 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/helloWorld.xhtml
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
+<f:view xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml b/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
index fd0a35a013..1994ef2299 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/result.xhtml
@@ -17,7 +17,7 @@
* limitations under the License.
-->
-<f:view xmlns:f="http://xmlns.jcp.org/jsf/core"
+<f:view xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/05-search/Search.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/05-search/Search.xhtml
index 7e798ebe85..497409056c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/05-search/Search.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/05-search/Search.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Searching the Demo">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml
index 6fc5c490eb..16e23cd30f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/10-getting-started/Getting_Started.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
This section describes how to build Tobago and run the example applications from the sources.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml
index 9909aa65f5..75825ac3d7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/20-docker/Docker.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core">
<p>
To run the examples, or other Tobago applications (or any web applications), you
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
index 40ca68b915..631767677a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/60-new-in-5-0/Tobago_5.0.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
index 6c75ea8a59..d84bbeb97d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/65-new-in-4-5/Tobago_4.5.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
index 6e155a4ac8..f840d7d39f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/66-new-in-4-4/Tobago_4.4.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
index f798abbf11..2c838f65d4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/67-new-in-4-3/Tobago_4.3.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
index f3046f1ddd..2d6464b714 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/68-new-in-4-2/Tobago_4.2.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
index 6924ba5c02..0808605462 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/69-new-in-4-1/Tobago_4.1.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
index 53b78c37e5..e89b91f9fa 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/70-new-in-4-0/Tobago_4.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview and History">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
index d1dd5ba639..7553688516 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/79-new-in-3-1/Tobago_3.1.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
index bfc58ee4d9..23b0626c9b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/80-new-in-3-0/Tobago_3.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>In November 2015 the first alpha version of 3.0.0 has been released,
the first final release followed in December 2016.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
index 942b87b9fb..652162bdb6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/86-new-in-2-4/Tobago_2.4.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
index 2cd6cb7365..cda8c735f0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/88-new-in-2-2/Tobago_2.2.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Overview">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
index ffa2b01b2a..7d51acc023 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/90-new-in-2-0/Tobago_2.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>At July 21, 2014 the version 2.0.0 has been released. Here was a quick overview over the features and changes made
in the last time to release this major revision.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
index cd6f663caf..6e7b68aa49 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/30-whats-new/What's_New.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>
Here you find a condensed overview by versions:
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml
index 492a1940e3..43121b41f0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/95-migration/4.0_to_5.0.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Migration from Tobago 4.0 to 5.0">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
index 5d46aa2045..3332c1f8da 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/96-migration/3.0_to_4.0.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Migration from Tobago 3.0 to 4.0">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
index 66f2c7fd8b..199d67f34d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/97-migration/2.0_to_3.0.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="2 to 3"/>
<tc:section label="Migration from Tobago 2.0 to 3.0">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml
index 54f5fa505a..d861d35ad2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/98-migration/1.5_to_2.0.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Migration from Tobago 1.5 to 2.0">
<p>Tobago 2.0 has some API changes compared to Tobago 1.5.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml
index b754796990..8c5b80bc61 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/99-migration/1.0_to_1.5.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Migration from Tobago 1.0 to 1.5">
<p>Tobago 1.5 has a lot of changes compared to Tobago 1.0.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
index 052419ee28..7d981d95de 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/50-migration/Migration.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Migration of Tobago applications">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml
index b548a63fc4..acad75f36c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/60-compatibility/Compatibility.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>
The version and compatibility informations of Tobago has beed moved to the
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml
index bc75d8b918..e7705a7b4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/70-faq/FAQ.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section id="howto" label="Where can I find documentation or HowTos for using Tobago?">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml
index d20b20acff..08eea184f8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/80-api/API.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section id="api" label="API Documentation">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml
index a2f7d4367e..913255a92e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/85-download/Download.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section id="download" label="Download Tobago source- and binary packages">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
index 7c80e2af95..099a0ef99b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/90-release-checklist/Release_Checklist.xhtml
@@ -19,10 +19,10 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Developer Info">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/93-server-info/Server_Info.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/93-server-info/Server_Info.xhtml
index 3feb69a6d1..00de4a1192 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/93-server-info/Server_Info.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/93-server-info/Server_Info.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core">
<ui:param name="title" value="Server Info"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/96-logging-info/Logging_Info.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/96-logging-info/Logging_Info.xhtml
index eb42df3172..e1165a1e05 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/96-logging-info/Logging_Info.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/96-logging-info/Logging_Info.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns="http://www.w3.org/1999/xhtml">
<ui:param name="title" value="Logging Info"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
index 927ae200c5..d707d500f6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/000-intro/Intro.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>This is the demo and documentation of <b>Tobago #{serverInfo.version}</b>.
It shows the components and concepts of Tobago and is also a main part of the documentation.</p>
<p>If you want to migrate from an older version, you'll find further information in the
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml
index 936e8c3b74..c331b592f7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/10-in/In.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:in/></code> tag create a classic input field.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml
index 42ccfed104..4ae954ba0a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/20-suggest/Suggest.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A <code class="language-markup"><tc:suggest/></code> tag can be added to an input field to make
suggestions based on the already entered text.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
index cbd913a91f..0697ea3459 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/30-textarea/Textarea.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:textarea/></code> tag, creates a textfield with one or more rows.
The textarea becomes scrollable if the containing text could not displayed in the current size.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml
index 6373ddb5a5..e19d3f2f97 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/40-date/Date.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:date/></code>
tag create an input field for a date or time.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml
index 6f5eff4bfb..52173d513c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/45-range/Range.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Input Type Range">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml
index b9532cdc39..e3e9c412f1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/50-input-group/Group.xhtml
@@ -20,9 +20,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The <code class="language-markup"><tc:in/></code> tag may be extended with the facet tags
<code class="language-markup"><f:facet name="before"></code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml
index e7a629f2e5..8fe14b3d99 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/80-stars/5_Star_Rating.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Use <code class="language-markup"><tc:stars/></code> to create a five star rating.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml
index 88eb433a73..6557d3600e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/010-input/Input.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>With input components, a text or a date can be entered.
Input components should always use the <code>label</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml
index e3f24699a0..cc72c4ce1e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/10-out/Out.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:f="http://java.sun.com/jsf/core">
<p>The <code class="language-markup"><tc:out/></code> display an outputtext combined with a label.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml
index 1a0606bd53..a6564ee81b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/20-label/Label.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>With <code class="language-markup"><tc:label/></code>, a single label can be created.
Some components already have a <code>label</code> attribute to combine it with a label,
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml
index 61e94fbf56..c13ef20de2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/25-badge/Badge.xhtml
@@ -19,10 +19,10 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A simple badge can be created with <code class="language-markup"><tc:badge/></code>.<br/>
Buttons can be displayed as a badge with the <code>badge</code> markup.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml
index cbb96c18c2..ca881504c7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/40-image/Image.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Create an image with <code class="language-markup"><tc:image/></code>.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml
index 9ac7fab402..89c1f83826 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/45-figure/Figure.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets" xmlns:f="jakarta.faces.core">
<p>Create a figure with <code class="language-markup"><tc:figure/></code> around an image,
video or something else. The label can be set via the label attribute or with the label facet.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml
index 7bc64518fa..786d38654d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/50-progress/Progress.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<p>The <code class="language-markup"><tc:progress/></code> tag create a progressbar.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
index 652c8e4903..4d248938bd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/60-object/Object.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:script file="#{request.contextPath}/content/020-output/60-object/object.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
index 358723e7fb..ca64ad2b7e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/020-output/Output.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="hideGlobalMessages" value="true"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
index 955def1c13..8b122fabac 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/10-selectBooleanCheckbox/Checkbox.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The tag <code class="language-markup"><tc:selectBooleanCheckbox/></code> generate a classic boolean
checkbox.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml
index 0ba5d0a06b..07546b8e55 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/15-selectBooleanToggle/Toggle.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The tag <code class="language-markup"><tc:selectBooleanToggle/></code> generate a boolean
toggle.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml
index 0f60f52a3c..4ab442949a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/20-selectOneChoice/Dropdown.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The tag <code class="language-markup"><tc:selectOneChoice/></code> create a dropdown box,
which contain<br/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml
index 91879490d7..62d5ed14fb 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/30-selectOneRadio/Radio.xhtml
@@ -20,9 +20,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
+ xmlns:h="jakarta.faces.html"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<ui:param name="title" value="Select One Radio: <tc:selectOneRadio>"/>
<p>A group of radiobuttons will be created with the <code class="language-markup"><tc:selectOneRadio/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml
index 3d25dfd18b..98029ac0b0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/40-selectOneListbox/Listbox.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:selectOneListbox/></code> create a list of entries, where only one
entry can be selected. Items can be added with <code class="language-markup"><tc:selectItem/></code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/45-selectOneList/SelectOneList.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/45-selectOneList/SelectOneList.xhtml
index 81abdd7988..ff4067c59f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/45-selectOneList/SelectOneList.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/45-selectOneList/SelectOneList.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>
<tc:badge markup="warning" value="Preliminary feature, may be subject to change!"/>
</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
index a394185504..4f2b17ca42 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/50-selectManyCheckbox/Multi_Checkbox.xhtml
@@ -20,9 +20,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:h="http://xmlns.jcp.org/jsf/html"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
+ xmlns:h="jakarta.faces.html"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<p>With <code class="language-markup"><tc:selectManyCheckbox/></code>, you can create a group of checkboxes.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml
index d01644f3ca..2892e84d33 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/60-selectManyListbox/Multi_Listbox.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:selectManyListbox/></code> create a list,
where more than one entry could be selected. Entries are added with
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml
index d42b330c17..0a6d861cc4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/70-selectManyShuttle/Shuttle.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The shuttlelist component can be created with <code class="language-markup"><tc:selectManyShuttle/></code>.
In general, the height of the list depends on the number of items and is set to an amount, where no
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/80-selectManyList/SelectManyList.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/80-selectManyList/SelectManyList.xhtml
index 414dfb96f8..a4d4370088 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/80-selectManyList/SelectManyList.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/80-selectManyList/SelectManyList.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>
<tc:badge markup="warning" value="Preliminary feature, may be subject to change!"/>
</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml
index 66fe5b1692..fead3f1089 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/030-select/Select.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Tobago provides several ways to select an option.
Entries are added with <code class="language-markup"><tc:selectItem/></code> or
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
index e36f70c306..26787e26e9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/00-button-link/Button_and_Link.xhtml
@@ -18,8 +18,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<p>A classic link can be set with the <code class="language-markup"><tc:link/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml
index 8580b48f68..5b27e4df3d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/10-default/Default_Command.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A normal button, created with <code class="language-markup"><tc:button/></code>, must be actively pressed,
to run the action. A default-button can be activated, even if not selected.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml
index e989b0b18e..d3f0843c24 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/20-buttons/Button_Group.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Buttons can be grouped with the <code class="language-markup"><tc:buttons/></code> tag.
Just add some <code class="language-markup"><tc:button/></code> tags.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml
index 0c8544d95f..53b0bb2871 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/21-buttons-customizer/Customizer.xhtml
@@ -21,9 +21,9 @@
template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
+ xmlns:c="jakarta.tags.core">
<p>The data of the model can also be loaded directly from the webapp directory.
So we can define an item for each facelet matching buttons-item-*.xhtml.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml
index 21cfd50295..f05b7b8ced 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/25-links/Link_Group.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Links can be grouped with the <code class="language-markup"><tc:links/></code> tag.
Just add some <code class="language-markup"><tc:link/></code> or
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml
index a1642d0b77..4a96ee4c12 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/040-command/Command.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Commands are ways to execute actions after clicked by a user.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml
index 3c6b6a35c5..65feeef5e1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/10-box/Box.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>A content box is created with <code class="language-markup"><tc:box/></code>.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml
index df8fa6fffc..2de54f486c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/20-panel/Panel.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>A <code class="language-markup"><tc:panel/></code> is a simple content container.
In the most cases it's invisible and wrapping other components.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml
index f97a012eb4..92d93107d8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/30-separator/Separator.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A separator can be added with <code class="language-markup"><tc:separator/></code></p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml
index 7036a4cd4e..62a536acba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/40-section/Section.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A section can be added with <code class="language-markup"><tc:section/></code> tag.</p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml
index ec6b0081b9..648af39451 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/Header_and_Footer.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<p>A header / footer can be set via the <code class="language-markup"><tc:header/></code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml
index 609b5b1a06..83a43e285f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/50-header-footer/x-header-footer-example.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:header fixed="#{headerFooterController.fixHeader}" rendered="#{headerFooterController.renderHeader}">
<tc:style customClass="bg-warning"/>
<p>This is the header.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
index 0894d05c63..fc45944f4d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/60-bar/Bar.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p><code class="language-markup"><tc:bar/></code> is a container which display elements in one single line
as long as there is enough space.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml
index 9082de0101..aee492438c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/050-container/Container.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>With the container components, content can be shown in different ways.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml
index 824deac416..06c7e44cd9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/060-popup/Popup.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>A popup dialog is created with <code class="language-markup"><tc:popup/></code>.
It can be filled with other components.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml
index c64d17e366..bbfee02e71 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/00-client/Tab_Client.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Tabs can be created with one or more <code class="language-markup"><tc:tab/></code> within a
<code class="language-markup"><tc:tabGroup></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml
index 24819e220e..a1758f2c3b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/01-ajax/Tab_Ajax.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Tabs can be created with one or more <code class="language-markup"><tc:tab/></code> within a
<code class="language-markup"><tc:tabGroup></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml
index dd258ec34f..8b323c51ed 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/02-server/Tab_Server.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Tabs can be created with one or more <code class="language-markup"><tc:tab/></code> within a
<code class="language-markup"><tc:tabGroup></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml
index 9fa950b016..e8747fe41c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/070-tab/Tab_Group.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>A <code class="language-markup"><tc:tabGroup/></code> can contain several
<code class="language-markup"><tc:tab/></code> tags.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml
index 2f66692b01..d8c6ee6429 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/10-sort/Sheet_Sorting.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Sorting can be enable via the <code>sortable</code> attribute in the
<code class="language-markup"><tc:column/></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml
index d574383e5f..6db4ae6834 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/20-selector/Sheet_Column_Selector.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>To insert a selectable column, use the <code class="language-markup"><tc:columnSelector/></code> tag.
With the <code>selectable</code> in the <code class="language-markup"><tc:sheet/></code> tag, you can
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml
index 3fecb4bfd9..f8385d5c36 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/30-event/Sheet_Event.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>A <code class="language-markup"><tc:sheet/></code> can contain a
<code class="language-markup"><tc:row/></code> tag with a containing <code
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/32-action/Sheet_Action.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/32-action/Sheet_Action.xhtml
index ee0ccc62d2..aa86c17991 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/32-action/Sheet_Action.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/32-action/Sheet_Action.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Action in a sheet">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml
index 3b6b7809e4..3f29453d67 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/35-markup/Sheet_Markup.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>This example, demonstrate the different markups defined for sheet.
These markups reflecting the styles from bootstrap.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml
index 39d0d35674..f7ea7d10d6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/40-style/Sheet_Style.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Styling inside a sheet"/>
<p>
Inside of <code><tc:row></code> and <code><tc:column></code> tags a <code><tc:style></code> can be used
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/45-bar/Column_Bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/45-bar/Column_Bar.xhtml
index 5ceded44d4..ea3f1a74ce 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/45-bar/Column_Bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/45-bar/Column_Bar.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
xmlns="http://www.w3.org/1999/xhtml">
<p>With the bar-facet something can be placed in the header cell of a column.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml
index 38e49490e6..d3ea2602d8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/50-filter/Sheet_Filter.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
xmlns="http://www.w3.org/1999/xhtml">
<p>Filtering is not a explicit feature of the sheet. It is done in the controller.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
index 6af543b252..cfba0d0d90 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/55-staticheader/Sheet_Static_Header.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>There are several ways to display the header.
For simple column headers, use the attribute <code>label</code> of
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
index f70c153eec..4fd9173828 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/60-multiheader/Sheet_Multi_Header.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>For more complex headers, which can span over columns and/or rows use a
<code class="language-markup"><f:facet name="header"></code>in the sheet.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml
index 3ad000cccb..5d3150a3b2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/70-tree/Sheet_Tree.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>A tree can be added into a sheet. To do so, there are two steps which must be done.
First, the <code>value</code> attribute of the sheet must refer to a method, which return a tree instead of a list.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/75-panel/Column_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/75-panel/Column_Panel.xhtml
index e3cefabbbe..203b2d8f75 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/75-panel/Column_Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/75-panel/Column_Panel.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
The <code class="language-markup"><tc:columnPanel/></code> tag creates a panel space under each column.
The content may be futher information about the entries.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml
index 379f3af6b8..8c079e9ee4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/80-editable/Sheet_Editable.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Not only a sheet can be used to display data, it may also contain input fields to edit the data.</p>
<p>Tag Library Documentation:
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml
index 783b825a02..81e7b21d10 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/90-lazy/Sheet_Lazy.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Lazy Loading Large Data"/>
<tc:sheet value="#{sheetController.hugeSolarList}" id="sheet" var="luminary"
rows="20" markup="small" lazy="true"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/95-nested/Sheet_Nested.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/95-nested/Sheet_Nested.xhtml
index 54ab547663..ad623fc3f7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/95-nested/Sheet_Nested.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/95-nested/Sheet_Nested.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Nested Sheet"/>
<tc:badge markup="warning" value="Experimental"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml
index c6066a0cda..c21b6c4305 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/080-sheet/Sheet.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
The sheet control is a simple solution for displaying table based
information. The essential features are:
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml
index 92eb2cc94e..9570d2a7b0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/00-command/Tree_Command_Types.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The <code class="language-markup"><tc:link/></code> tag can be added to a
<code class="language-markup"><tc:treeNode/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml
index dc53a539af..ec65e2c15f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/01-select/Tree_Select.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:treeSelect/></code> tag can be used instead of
<code class="language-markup"><treeLabel/></code> to add radio buttons or checkboxes in front of the nodes.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml
index df83c53b6e..98be1b1ba9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/02-editor/Tree_Editor.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>This is an example, to show how to write an editor for a tree.
Some commands are using popups and AJAX.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml
index e77f431e5c..88691be5b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/03-menu/Tree_Menu.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The <code class="language-markup"><tc:treeMenu/></code> tag is deprecated, because it's easy to
build a tree menu with the <code class="language-markup"><tc:tree/></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml
index 81786d3cf7..64df54badf 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/04-listbox/Tree_Listbox.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The <code class="language-markup"><tc:treeListbox/></code> can be used to replace a classic
<code class="language-markup"><tc:tree/></code>. It displays the tree as a number of lists.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
index 098177fc65..4424051b07 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/090-tree/Tree.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
The tree control displays a tree which is generated from application data. The key features are:
<ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml
index 7dc9a164db..8f4ef01c49 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/100-upload/File_Upload.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><tc:file/></code> create an input field with a choose directory button on the
right.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
index e141859692..71aa95edc7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/00-tinymce/TinyMCE.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:script file="https://cdn.tiny.cloud/1/no-api-key/tinymce/5/tinymce.min.js" referrerpolicy="origin"/>
<tc:script file="#{request.contextPath}/content/110-wysiwyg/00-tinymce/init-tinymce.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
index b6de7023aa..b51150ef68 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/01-ckeditor/CKEditor.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:script file="https://cdn.ckeditor.com/ckeditor5/25.0.0/classic/ckeditor.js"/>
<tc:script file="#{request.contextPath}/content/110-wysiwyg/01-ckeditor/init-ckeditor.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml
index 62404fb309..7d8a6caa05 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/110-wysiwyg/WYSIWYG_Editor.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="So many alternatives">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/10-flow/Flow_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/10-flow/Flow_Layout.xhtml
index def4c4e5a3..03b50857d9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/10-flow/Flow_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/10-flow/Flow_Layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The flow layout can be used with the <code><tc:flowLayout/></code> tag.
By default, the content is displayed in a flow layout.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/20-flex/Flex_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/20-flex/Flex_Layout.xhtml
index 10630598e3..321e3167f6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/20-flex/Flex_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/20-flex/Flex_Layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The flex layout can be used with the <code><tc:flexLayout/></code> tag.
The two most important attributes are <code>columns</code> and <code>rows</code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/30-segment/Segment_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/30-segment/Segment_Layout.xhtml
index 99d946bbb2..f6b64d2b0a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/30-segment/Segment_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/30-segment/Segment_Layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The segment layout is a grid with 12 columns.
The number and the proportion of the columns can be set with the attributes
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/40-label/Label_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/40-label/Label_Layout.xhtml
index 7c864754a4..ec916c8956 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/40-label/Label_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/40-label/Label_Layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>For many components, a <code>label</code> attribute is available, which place a label in front
of the according component.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/50-grid/Grid_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/50-grid/Grid_Layout.xhtml
index 2f831b70b8..e4a7d08dfe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/50-grid/Grid_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/50-grid/Grid_Layout.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code><tc:gridLayout></code> has a dynamic history. </p>
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/60-split/Split_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/60-split/Split_Layout.xhtml
index ba07b01394..57e7895aa8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/60-split/Split_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/60-split/Split_Layout.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:tc="http://myfaces.apache.org/tobago/component"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/90-message-layout/message-layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/90-message-layout/message-layout.xhtml
index fbdf008c0f..8a2c7c83c6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/90-message-layout/message-layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/90-message-layout/message-layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="messages"/>
<p>The message layout renders messages directly on the component.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/Layout.xhtml
index d1726f80b8..0ccd129a17 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/120-layout/Layout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Tobago provide several layout options.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/00-collapsible-box/Collapsible_Box.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/00-collapsible-box/Collapsible_Box.xhtml
index 5541d3fcf3..ba75ff5f86 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/00-collapsible-box/Collapsible_Box.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/00-collapsible-box/Collapsible_Box.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>On this page the collapsible concept is explained for a
<tc:link label="Box" outcome="/content/050-container/10-box/Box.xhtml"/>.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
index 489629abe6..bd17757589 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/10-collapsible-popup/Collapsible_Popup.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>This page contain some examples for the collapsible concept of a popup. Please have a look at the
<tc:link label="Popup" outcome="/content/060-popup/Popup.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
index a6749ece05..ba54fda70a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/20-collapsible-panel/Collapsible_Panel.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>This page show some examples for the collapsible concept of a
<tc:link label="Panel" outcome="/content/050-container/20-panel/Panel.xhtml"/>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/30-collapsible-section/Collapsible_Section.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/30-collapsible-section/Collapsible_Section.xhtml
index ac892b4147..d9995f26af 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/30-collapsible-section/Collapsible_Section.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/30-collapsible-section/Collapsible_Section.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Collapsible concept explained for a
<tc:link label="Section"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/Collapsible.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/Collapsible.xhtml
index d35ab19819..1a121688b7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/Collapsible.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/130-collapsible/Collapsible.xhtml
@@ -18,7 +18,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo">
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/140-partial/Partial_Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/140-partial/Partial_Ajax.xhtml
index c277c4749e..14b7029b99 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/140-partial/Partial_Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/140-partial/Partial_Ajax.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core"
xmlns="http://www.w3.org/1999/xhtml">
<ui:param name="title" value="Partial Update (AJAX)"/>
<tc:panel id="parent">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/150-behavior/Behavior.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/150-behavior/Behavior.xhtml
index 5833c42452..65eb96821a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/150-behavior/Behavior.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/150-behavior/Behavior.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>There are two kinds of behaviors: </p>
<ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/10-required/Required.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/10-required/Required.xhtml
index 5e1e3beda3..a220baebd6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/10-required/Required.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/10-required/Required.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>If the validation of a form is activated and the actual value of this form is only stored temporarily,
the validation is deactivated until the value is definitely stored into the model.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/20-ajax/Ajax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/20-ajax/Ajax.xhtml
index fc2e8da8a8..9d5267fd9f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/20-ajax/Ajax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/20-ajax/Ajax.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code class="language-markup"><f:ajax execute="..." render="..."/></code> tag ignore the
<code class="language-markup"><tc:form></code> tag.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/Form.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/Form.xhtml
index 5a3b04d210..26a194ea99 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/Form.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/160-form/Form.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Tobago supports nested forms and can treat each form separately.
Values can be stored separately into the model, while already filled input elements keep their values (temporarily).
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml
index a54cc78152..679a8dd9cf 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/00/Content_Validation.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>There are several ways to validate the content of a component. In general input components have the option
for validation. In the following sections, the different kinds von validation are explained.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml
index 10ca07db2e..d7f2fdfa79 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/01/JSR_303.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Tobago has JSR 303 Validation support.
With it, you can describe the validation in an annotation in the controller.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml
index ba663ad88a..a19b12cc05 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/02/Severity.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
The validator of each field creates a FacesMessage with the given severity.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml
index 936c0c1315..4a1e6ea8bd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/30-messages/Messages.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="hideGlobalMessages" value="true"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml
index 4719d5ba03..1f79795022 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/170-validation/Validation.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Content validation of input fields can be made directly in the facelet
with the <code>required</code> attribute and several validation tags.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml
index 9201d79cdd..d78c511bea 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/180-conversion/Conversion.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>To convert numbers put a <code class="language-markup"><f:convertNumber/></code> tag in an component.</p>
<tc:section label="Example">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml
index 305398102d..615331ec8e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/190-format/Format.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:fn="http://xmlns.jcp.org/jsp/jstl/functions">
<p>Use the EL functions from <code>tc:format1</code> to <code>tc:format9</code>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml
index 878908dbcc..818b6eb94e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/200-theme/Theme.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>Tobago supports a big variety of displaying controls, so called designs or themes.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/10-style/Style_Tag.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/10-style/Style_Tag.xhtml
index 8d9de4bd37..1d20824328 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/10-style/Style_Tag.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/10-style/Style_Tag.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/20-bootstrap/Bootstrap.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/20-bootstrap/Bootstrap.xhtml
index 334b9f2dc3..2df2c391ce 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/20-bootstrap/Bootstrap.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/20-bootstrap/Bootstrap.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Example: Classes for Displaying Dependent on Screen Size">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/Styling.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/Styling.xhtml
index 0a01e0695d..65675ddbd3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/Styling.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/205-style/Styling.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>
All themes shipped with Tobago based on
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml
index bef0ff95e1..61026a5f6c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/210-browser/Browser.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Browser"/>
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml
index 892d6655b3..7038c3c9ee 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/220-locale/Locale.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
Tobago supports internationalization and localization.
<ul>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/230-accessKey/AccessKey.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/230-accessKey/AccessKey.xhtml
index 54606e2805..ccea235dda 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/230-accessKey/AccessKey.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/230-accessKey/AccessKey.xhtml
@@ -18,8 +18,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>The <code>accessKey</code> attribute is available for many components like buttons, checkboxes or links.
A component with this attribute is accessible by the given character. The character is not case sensitive.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/240-dataAttribute/DataAttribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/240-dataAttribute/DataAttribute.xhtml
index 93c2561be0..4151e4cc1d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/240-dataAttribute/DataAttribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/240-dataAttribute/DataAttribute.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:script file="dataAttribute.js"/>
<p>Add a data attribute to an UIComponent with
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/250-focus/Focus.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/250-focus/Focus.xhtml
index 331587f67a..573356edd6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/250-focus/Focus.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/250-focus/Focus.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Focus"/>
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/260-meta/Meta.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/260-meta/Meta.xhtml
index 8512da7cbb..7ff98acc6d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/260-meta/Meta.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/260-meta/Meta.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
+ xmlns:ui="jakarta.faces.facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
<ui:param name="title" value="Meta"/>
<tc:panel id="meta-panel">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/270-icons/Icons.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/270-icons/Icons.xhtml
index aa2bfac464..698c84343e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/270-icons/Icons.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/270-icons/Icons.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
+ xmlns:ui="jakarta.faces.facelets" xmlns:tc="http://myfaces.apache.org/tobago/component">
<!-- <ui:param name="title" value="Icons"/>-->
<tc:panel>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/05-csp/Content_Security_Policy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/05-csp/Content_Security_Policy.xhtml
index 378f572441..72451e6696 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/05-csp/Content_Security_Policy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/05-csp/Content_Security_Policy.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Content Security Policy"/>
<p>
Tobago supports Content Security Policy (CSP) to prevent cross-site
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/10-sanitize/Sanitize.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/10-sanitize/Sanitize.xhtml
index 567c5bef0d..755cccc4c5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/10-sanitize/Sanitize.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/10-sanitize/Sanitize.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns="http://www.w3.org/1999/xhtml">
<ui:param name="title" value="Sanitizer"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/Roles.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/Roles.xhtml
index c935821051..f42b4d652e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/Roles.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/Roles.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>It is possible to define roles for users. Based on this roles, components with an <code>action</code> attribute
like a button can be hidden or disabled for the current user.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/x-login.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/x-login.xhtml
index e543c6f15e..e8a9df51a5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/x-login.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/20-roles/x-login.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Login"/>
<tc:panel rendered="#{request.userPrincipal != null}">
<p>You are now logged in as user '#{request.userPrincipal.name}'</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
index 307ee500c6..9a1eb757c7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/280-security/Security.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Security"/>
<p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/Error_Handling.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/Error_Handling.xhtml
index 532d251c09..a5fed3c8ea 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/Error_Handling.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/Error_Handling.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Sample Error Scenarios (Todo: is to be optimized)"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/x-error-in-syntax.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/x-error-in-syntax.xhtml
index 00689af938..907738dd19 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/x-error-in-syntax.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/290-error/x-error-in-syntax.xhtml
@@ -19,6 +19,6 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
this page is syntactically incorrect!
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/300-exception-handler/Exception_Handler.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/300-exception-handler/Exception_Handler.xhtml
index ba8c392303..b627fa217f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/300-exception-handler/Exception_Handler.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/300-exception-handler/Exception_Handler.xhtml
@@ -20,9 +20,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:demo="http://myfaces.apache.org/tobago/example/demo"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Since Tobago 4.0.0 an AjaxExceptionHandler takes care of exceptions in ajax case.</p>
<p><span class="#{demo:bootstrapClass('BADGE')} #{demo:bootstrapClass('BADGE_DANGER')}">Important!</span>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/310-for-each/For_Each.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/310-for-each/For_Each.xhtml
index b2f9b8b9f0..69b0aa22cc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/310-for-each/For_Each.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/310-for-each/For_Each.xhtml
@@ -18,8 +18,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:c="jakarta.tags.core">
<p>Generating content with a loop can be done
with the <code class="language-markup"><c:forEach/></code> tag and
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/320-resize/Resize.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/320-resize/Resize.xhtml
index 7c7a9b2f96..7b8320c82e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/320-resize/Resize.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/320-resize/Resize.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/plain.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="Resize Event"/>
<f:facet name="resize">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/330-conversation/Conversation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/330-conversation/Conversation.xhtml
index 1bba965915..48ecc7bf88 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/330-conversation/Conversation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/330-conversation/Conversation.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:badge markup="warning"
value="Warning: This example is turned off, because its not suppored in Quarkus!"/><br/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/340-websocket/WebSocket.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/340-websocket/WebSocket.xhtml
index 288a18d989..b2b517b98f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/340-websocket/WebSocket.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/340-websocket/WebSocket.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Simple example for WebSockets.</p>
<tc:section label="Example">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml
index da40cf0141..e8128565d5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/Transition.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>For command components like a link or a button, the <code>transition</code> attribute is available.
It shows a loading animation if the site don't respond in a certain amount of time.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
index 4175919735..3c1dc227c3 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/350-transition/x-transition-after-sleep.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Transition after sleep"/>
<tc:button label="Back" outcome="/content/350-transition/Transition.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml
index 0c16955967..31489afde4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/360-non-faces-response/Non_Faces_Response.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Non Faces Response (e. g. a download link)"/>
<tc:segmentLayout large="10seg 2seg">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
index cde8a0ab16..89e1cd0d4b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/Non_Faces_Request.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns="http://www.w3.org/1999/xhtml">
<ui:param name="title" value="Non-Faces-Request Demo: Start"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
index c73dcbc91e..c4ef80331f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/370-non-faces-request/x-fish-pond.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="Non-Faces-Request Demo: Fish Pont"/>
<ui:define name="metadata">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/500-config/Configuration.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/500-config/Configuration.xhtml
index 0aebf8cbb2..13bb0fed9f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/500-config/Configuration.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/500-config/Configuration.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:link label="Tag Library Documentation" image="#{request.contextPath}/image/feather-leaf.png"
link="#{apiController.tobagoTld}/tc/config.html"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
index 1c43de8809..380f703302 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1020-suggest-quotMark/Suggest_QuotMark.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Test quotation mark in suggest results"/>
<tc:section label="Suggest">
<p>The suggest results contain an entry with a quotation mark.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1025-suggest-group/Suggest_Input_Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1025-suggest-group/Suggest_Input_Group.xhtml
index 3b1b8ee28e..44853e5f5c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1025-suggest-group/Suggest_Input_Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1025-suggest-group/Suggest_Input_Group.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Test quotation mark in suggest results"/>
<tc:section label="Suggest Input Group">
<p>The input groups should have rounded corners.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
index 26f128b46a..168ce49a18 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1100-date/Date.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:form id="resetButtonFrom">
<tc:button id="resetButton" label="Reset"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/21-label-for/Label_For.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/21-label-for/Label_For.xhtml
index c0d7d97870..27e66cfe35 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/21-label-for/Label_For.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/21-label-for/Label_For.xhtml
@@ -18,9 +18,9 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+ xmlns:c="jakarta.tags.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Label 'for'-attribute"/>
<p>Test if 'required' is set correctly on tc:label.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/Output.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/Output.xhtml
index 6d2f26482f..a0aaceb224 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/Output.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1500-output/Output.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Output"/>
<p>Tests for output fields.</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1540-image/image.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1540-image/image.xhtml
index 5f3c774848..0ea4dc0062 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1540-image/image.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/1540-image/image.xhtml
@@ -18,7 +18,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Image"/>
<tc:figure label="maxHeight='10px'">
<tc:image id="image1" value="#{request.contextPath}/image/alps.png">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Currency.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Currency.xhtml
index 6b0f07d56e..1d21761f9d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Currency.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Currency.xhtml
@@ -18,7 +18,7 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:f="jakarta.faces.core">
<tc:page label="Sample with model">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/List_Of_Objects.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/List_Of_Objects.xhtml
index d330774f8c..1c9d9f75b5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/List_Of_Objects.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/List_Of_Objects.xhtml
@@ -18,7 +18,7 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:f="jakarta.faces.core">
<tc:page>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Type_Of_Literals.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Type_Of_Literals.xhtml
index 997310d5b6..79fa9d6e31 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Type_Of_Literals.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2000-selectItem/Type_Of_Literals.xhtml
@@ -18,7 +18,7 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:f="jakarta.faces.core">
<tc:page width="700px" height="600px">
<tc:gridLayout columns="4fr 1fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2200-shuttle/shuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2200-shuttle/shuttle.xhtml
index 3c958db07d..33c1786494 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2200-shuttle/shuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2200-shuttle/shuttle.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:selectManyShuttle id="shuttle">
<tc:event/>
<tc:selectItem itemLabel="Dark" itemValue="dark"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2300-link/Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2300-link/Link.xhtml
index 1dcc61b0f2..7bd6974aab 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2300-link/Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2300-link/Link.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:link id="aLink" label="a.link" link="https://www.apache.org/">
<tc:style width="200px"/>
</tc:link>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2400-popup/Popup_with_jQuery.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2400-popup/Popup_with_jQuery.xhtml
index e49bbf97a7..a0dbc75499 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2400-popup/Popup_with_jQuery.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2400-popup/Popup_with_jQuery.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:script file="#{request.contextPath}/js/jquery-3.6.3.js" type="module"/>
<tc:button id="openClientPopup" label="Open Client Sided Popup" omit="true">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2500-tab/Tabgroup_Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2500-tab/Tabgroup_Style.xhtml
index cbd233a118..a8346c4e59 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2500-tab/Tabgroup_Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/2500-tab/Tabgroup_Style.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:tabGroup id="tabGroup">
<tc:style customClass="someCssClass"/>
<tc:tab id="tabOne" label="One">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml
index 8287260d7e..88324e50e6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/10-sheet-types/Sheet_Types.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:sheet value="#{sheetController.solarList}" id="sheet" var="luminary"
columns="50px 70px 70px 10px 90px 160px 100px 70px 180px 90px 130px"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/20-sheet-column-width/Sheet_Column_Width.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/20-sheet-column-width/Sheet_Column_Width.xhtml
index 8044b4fe96..3704eae92b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/20-sheet-column-width/Sheet_Column_Width.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/20-sheet-column-width/Sheet_Column_Width.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:style file="#{request.contextPath}/css/demo.css"/>
<tc:sheet id="testSheetColumnWidth" value="#{sheetController.solarList}" var="luminary"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/30-sheet-margin-bottom/Sheet_Margin_Bottom.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/30-sheet-margin-bottom/Sheet_Margin_Bottom.xhtml
index b3ac2910bc..cb66cffa85 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/30-sheet-margin-bottom/Sheet_Margin_Bottom.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/30-sheet-margin-bottom/Sheet_Margin_Bottom.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:style file="#{request.contextPath}/css/demo.css"/>
<tc:sheet id="sheet1" value="#{sheetController.solarList}" var="luminary" rows="3">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/40-sheet-selector/Sheet_Selector.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/40-sheet-selector/Sheet_Selector.xhtml
index 7ba8b5c538..f6aeb16841 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/40-sheet-selector/Sheet_Selector.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/40-sheet-selector/Sheet_Selector.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:link id="reload" label="Reload" link="Sheet_Selector.xhtml"/>
<tc:sheet id="sheetDefault" value="#{sheetController.solarList}" var="object" rows="6">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml
index a0c5e78823..ff8e2e2c08 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:button id="reset" label="Reset" outcome="/content/900-test/3000-sheet/70-tree/Sheet_Tree.xhtml"/>
<tc:sheet id="sheet" value="#{treeController.sample}" var="node" showRoot="true" showRootJunction="true">
<tc:columnNode id="nameCol" label="Name">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/Sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/Sheet.xhtml
index d2354fab0d..42395bdabd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/Sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/3000-sheet/Sheet.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="TODO"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
index 634a928679..e04fa1c071 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/4050-ajax-dropdown/Ajax_Dropdown.xhtml
@@ -17,9 +17,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>The dropdown menu should be closed, after clicking the 'AJAX' entry in the dropdown menu.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/Button_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/Button_Link.xhtml
index 61945eb2e5..4f39b0c9f2 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/Button_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/Button_Link.xhtml
@@ -18,8 +18,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="Standard">
<tc:buttons>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-action.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-action.xhtml
index e78381f5b4..f27cefd637 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-action.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-action.xhtml
@@ -18,7 +18,7 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section id="actionSection" label="Action">
<p>This page should be accessed by an link/button with <code>action</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-link.xhtml
index d32117f50f..0bcb922676 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4000-button-link/x-link.xhtml
@@ -18,7 +18,7 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section id="linkSection" label="Link">
<p>This page should be accessed by an link/button with <code>link</code> attribute.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/100-headings/Headings.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/100-headings/Headings.xhtml
index 835ca35a33..a752af6a12 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/100-headings/Headings.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/100-headings/Headings.xhtml
@@ -17,9 +17,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Components in heading tags"/>
<tc:box id="headingsBox" label="Links">
<p>The fonts of the apache.org-link and the ActionLink must be the same.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/215-input-group/Group.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/215-input-group/Group.xhtml
index 9b9823b460..20780acc29 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/215-input-group/Group.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/215-input-group/Group.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Dropdown Menu">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/300-nonce/Nonce.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/300-nonce/Nonce.xhtml
index 2056215c2e..9fb90bef4c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/300-nonce/Nonce.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/300-nonce/Nonce.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<p>
This tests among others the fix of issue TOBAGO-2210.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/Style.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/Style.xhtml
index b1f5bdd945..1d7df5a8b5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/Style.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/40000-style/Style.xhtml
@@ -17,7 +17,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Style tests"/>
<p>Automated tests for styling.</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4100-footer/FixedFooter_height.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4100-footer/FixedFooter_height.xhtml
index 205b76cba7..39ee2e5326 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4100-footer/FixedFooter_height.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4100-footer/FixedFooter_height.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:footer id="fixedFooter" fixed="true">
This is a fixed footer. Some input fields are added to increase the height.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4200-dropdown/Dropdown.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4200-dropdown/Dropdown.xhtml
index 98dac982a0..c6f0fdfe67 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4200-dropdown/Dropdown.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4200-dropdown/Dropdown.xhtml
@@ -18,10 +18,10 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://xmlns.jcp.org/jsf/composite/demo-components"
+ xmlns:dc="jakarta.faces.composite/demo-components"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:button id="root" label="Dropdown" omit="true">
<tc:link id="entry1" label="Entry One"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml
index bb5f79d99e..cceb0ebdfe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/10-label-horizontal/Grid_Layout_Label_Horizontal.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:box id="box" label="Grid Layout with labelLayout left and right (horizontal)">
<tc:gridLayout id="grid" columns="150px 2fr 1fr 5fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml
index 57bdce8aa2..b5eb78a3fc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/100-auto-column/Auto-Column.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:box id="surroundingBox" label="'auto' value">
<tc:style width="300px"/>
<p>Grid Layout - column with 'auto' but without '*'</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
index 035e42a950..2baa12bd0c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/20-label-vertical/Grid_Layout_Label_Vertical.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:box id="box" label="Grid Layout with labelLayout top and bottom (vertical)">
<tc:gridLayout id="grid" columns="1fr 2fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml
index 54ef9b27ef..a40d2b1cb1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/90-style-tag/Style_Tag.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Style tag inside grid layout">
<p>The <code class="language-markup"> <tc:out> </code> should have the CSS class 'text-warning'.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/Grid_Layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/Grid_Layout.xhtml
index d2354fab0d..42395bdabd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/Grid_Layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4600-gridLayout/Grid_Layout.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="TODO"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/FlexLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/FlexLayout.xhtml
index 05ed253ffa..eb3df05d8b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/FlexLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/FlexLayout.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="x-template.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:define name="x-textarea-1">
<ui:include src="/content/900-test/4700-flexLayout/x-textarea-1.xhtml"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-template.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-template.xhtml
index 033076e9d6..c56cfadad8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-template.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-template.xhtml
@@ -17,9 +17,9 @@
* limitations under the License.
-->
-<ui:composition xmlns:f="http://xmlns.jcp.org/jsf/core"
+<ui:composition xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<f:view locale="#{localeController.locale}">
<tc:page label="flex layout template" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-textarea-1.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-textarea-1.xhtml
index cf0c037c81..82caf989dc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-textarea-1.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4700-flexLayout/x-textarea-1.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:textarea value="T1"/>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
index ef902cc25f..fc70fe00de 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/100-id-markup/Id_Markup.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Test position of ids and markups"/>
<tc:section id="sectionNoLabel" label="No label set">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/200-input-heigth/Input_Height.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/200-input-heigth/Input_Height.xhtml
index 2123099956..0d7d4031f1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/200-input-heigth/Input_Height.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/200-input-heigth/Input_Height.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Test position of ids and markups"/>
<tc:section id="sectionNoLabel" label="Test height of input field">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/300-label-input-spacing/Label_Input_Spacing.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/300-label-input-spacing/Label_Input_Spacing.xhtml
index 15600ca290..c607be007b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/300-label-input-spacing/Label_Input_Spacing.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/300-label-input-spacing/Label_Input_Spacing.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Spacing between input field and label">
<tc:in id="inputLeft" label="Input left" labelLayout="flexLeft"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/350-label-required/Label_Required.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/350-label-required/Label_Required.xhtml
index 1a5edaed46..208d5acedd 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/350-label-required/Label_Required.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/350-label-required/Label_Required.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:in label="none" value="none" required="true" labelLayout="none"/>
<tc:in label="flexLeft" value="flexLeft" required="true" labelLayout="flexLeft"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/500-message-layout/message-layout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/500-message-layout/message-layout.xhtml
index 4ef29d91b3..7e1fc0f492 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/500-message-layout/message-layout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/500-message-layout/message-layout.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="messages"/>
<tc:button id="submit" label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/LabelLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/LabelLayout.xhtml
index 0d30d73b78..5c944420dc 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/LabelLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4800-labelLayout/LabelLayout.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="labelLayout"/>
<tc:box label="<tc:date>">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4810-labelLayoutTop/LabelLayoutTop.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
index 8535ec7db5..3c9f25bce4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4810-labelLayoutTop/LabelLayoutTop.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="labelLayout"/>
<tc:box label="<tc:date>">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/100-position/decorationPosition.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/100-position/decorationPosition.xhtml
index 083bbc744c..11ae0451c5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/100-position/decorationPosition.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/100-position/decorationPosition.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="messages"/>
<tc:section label="Change Layout">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/messageLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/messageLayout.xhtml
index de01af9937..715ba21493 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/messageLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/4900-messageLayout/messageLayout.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="messages"/>
<tc:button id="submit" label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5000-form/Sheet_In_Form.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5000-form/Sheet_In_Form.xhtml
index 1a88848ed7..0817a8870d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5000-form/Sheet_In_Form.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5000-form/Sheet_In_Form.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:panel id="panel">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
index 63d7846c84..52f98b9261 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/10-rendererBase-getCurrentValue/RendererBase_GetCurrentValue.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="Test: RendererBase.getCurrentValue()"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
index 7c2808854f..bd5b093c82 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/20-ajax-execute/Ajax_Execute.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="TODO"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
index b685f4e30a..c20506a8c0 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/30-ajax-special-character/Ajax_Special_Character.xhtml
@@ -18,9 +18,9 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Ajax Unicode"/>
<tc:out id="timestamp" label="Timestamp" value="#{ajaxSpecialCharacterController.timestamp}"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/40-force-npe/Force_NPE.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/40-force-npe/Force_NPE.xhtml
index 4a3dc17c8e..9224dc9704 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/40-force-npe/Force_NPE.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/40-force-npe/Force_NPE.xhtml
@@ -18,9 +18,9 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Ajax Unicode"/>
<tc:button id="ajaxButton" label="AJAX">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/Java.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/Java.xhtml
index 0c931dbc23..81458b88ba 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/Java.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/50000-java/Java.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="TODO"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
index f20b353fa5..4541dad480 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/2008-roles-allowed/Roles_Allowed.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://xmlns.jcp.org/jsf/composite/demo-components"
+ xmlns:dc="jakarta.faces.composite/demo-components"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Composite Components"/>
<tc:box label="Login">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/Composite_Components.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/Composite_Components.xhtml
index 736cab7d36..d56b77b7e4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/Composite_Components.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/5500-compositeComponent/Composite_Components.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:dc="http://xmlns.jcp.org/jsf/composite/demo-components"
+ xmlns:dc="jakarta.faces.composite/demo-components"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Composite Components"/>
<tc:section label="no layout manager">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
index 6d9ae69bc2..5e4946b9b4 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="<tc:event>"/>
<tc:style file="#{request.contextPath}/style/tobago.css"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event_1870.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event_1870.xhtml
index 13acbc69fc..e467b21c46 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event_1870.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/Event_1870.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:style file="#{request.contextPath}/css/demo.css"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-.xhtml
index 7de6d48b95..3abf8b6b29 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-.xhtml
@@ -17,6 +17,6 @@
* limitations under the License.
-->
-<ui:composition xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+<ui:composition xmlns:ui="jakarta.faces.facelets">
<!-- This is to prevent a FileNotFoundException if the value of ui:include evaluated and no component is selected. -->
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-bar.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-bar.xhtml
index 43f7d2f66e..16381067d8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-bar.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-bar.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns="http://www.w3.org/1999/xhtml">
<tc:bar/>
<p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-button.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-button.xhtml
index 78be21d1de..0112e649b1 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-button.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-button.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:button id="button#{eventType}" label="Button">
<c:if test="#{eventType == 'ajax'}">
<f:ajax event="click" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-date.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-date.xhtml
index 0372af2332..f393e11860 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-date.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-date.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:date/>
<p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-file.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-file.xhtml
index c673aba61c..ae736454ae 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-file.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-file.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:file/>
<p>Not implemented yet!</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-hidden.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-hidden.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-hidden.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-hidden.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-in.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-in.xhtml
index d5dc4e0d3e..f366af2fbe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-in.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-in.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:in id="in#{eventType}" valueChangeListener="#{eventController.valueChangeListener}">
<c:if test="#{eventType == 'ajax'}">
<f:ajax event="change" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-link.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-link.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-page.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-page.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-page.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-page.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-panel.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-panel.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-panel.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-panel.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-progress.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-progress.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-progress.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-progress.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-row.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-row.xhtml
index bb83290700..c5da01f36e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-row.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-row.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:sheet id="sheet#{eventType}" value="#{eventController.planets}" var="planet" markup="small">
<tc:style maxHeight="200px"/>
<tc:column label="Planet">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectBooleanCheckbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectBooleanCheckbox.xhtml
index e23d9f0b80..b1871ee46d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectBooleanCheckbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectBooleanCheckbox.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:selectBooleanCheckbox id="selectBooleanCheckbox#{eventType}"
valueChangeListener="#{eventController.valueChangeListener}" value="true">
<c:if test="#{eventType == 'ajax'}">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyCheckbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyCheckbox.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyCheckbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyCheckbox.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyListbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyListbox.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyListbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyListbox.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyShuttle.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyShuttle.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyShuttle.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectManyShuttle.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneChoice.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneChoice.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneChoice.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneChoice.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneList.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneList.xhtml
index 9cb862cb4e..6f029d1c34 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneList.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneList.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:selectOneList id="selectOneList#{eventType}" valueChangeListener="#{eventController.valueChangeListener}" expanded="true">
<tc:selectItem itemValue="alpha" itemLabel="Alpha"/>
<tc:selectItem itemValue="beta" itemLabel="Beta"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneListbox.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneListbox.xhtml
index 7e99e9827b..54ef367135 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneListbox.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneListbox.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:selectOneListbox id="selectOneListbox#{eventType}" valueChangeListener="#{eventController.valueChangeListener}">
<tc:selectItem itemValue="alpha" itemLabel="Alpha"/>
<tc:selectItem itemValue="beta" itemLabel="Beta"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneRadio.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneRadio.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneRadio.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-selectOneRadio.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-sheet.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-sheet.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-sheet.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-sheet.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tab.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tab.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tab.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tab.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tabGroup.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tabGroup.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tabGroup.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-tabGroup.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-textarea.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-textarea.xhtml
index 8531f4f0f1..e70f4a6ea5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-textarea.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-textarea.xhtml
@@ -18,10 +18,10 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:c="jakarta.tags.core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:textarea id="textarea#{eventType}" valueChangeListener="#{eventController.valueChangeListener}">
<c:if test="#{eventType == 'ajax'}">
<f:ajax event="change" render="metrics" listener="#{eventController.ajaxListener}"
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeCommand.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeCommand.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeCommand.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeCommand.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeSelect.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeSelect.xhtml
index 63526e227d..21c437ce2d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeSelect.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6000-event/x-event-treeSelect.xhtml
@@ -18,6 +18,6 @@
-->
<ui:composition xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>Not implemented yet!</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
index 9bc7c2044e..b170338ce8 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4000-button-link/Button_Link.xhtml
@@ -18,8 +18,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:section label="<button> - <a>">
<p>The left link is rendered as a <code><button></code>, the right side is rendered as an <code><a></code>.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4500-suggest/Suggest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4500-suggest/Suggest.xhtml
index 10ab832ff9..9e56889287 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4500-suggest/Suggest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/4500-suggest/Suggest.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:section label="Suggest Input - AJAX">
<p>The out component will show the selected value choosen from the suggest input field. Ajax case is covered and component is reloaded after valid selection.</p>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml
index cfea3501a1..4076ed979a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-lengthOfInputs/LengthOfInputs.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<tc:in label="In"/>
<tc:textarea label="Text Area"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-messageLayout/MessageLayout.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
index 2b55cd510e..fce4cf2fab 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/5000-messageLayout/MessageLayout.xhtml
@@ -20,8 +20,8 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="messages"/>
<tc:button label="Submit"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/Manual.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/Manual.xhtml
index 5084518abf..78914e0101 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/Manual.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/60000-manual/Manual.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<p>This section contain manual tests, which are not covered by QUnitTests.</p>
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6500-behavior/Behavior.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6500-behavior/Behavior.xhtml
index b499da0eb3..99f3c1af6a 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6500-behavior/Behavior.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/6500-behavior/Behavior.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:box id="counter" label="Counter">
<f:facet name="bar">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Flex.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Flex.xhtml
index e74b33c3de..92cc65b276 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Flex.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Flex.xhtml
@@ -18,7 +18,7 @@
-->
<f:view locale="#{localeController.locale}"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page markup="spread" label="Test" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Grid.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Grid.xhtml
index 53d1c1177b..2836e16cac 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Grid.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/7000-layout/Markup_Spread_Grid.xhtml
@@ -18,7 +18,7 @@
-->
<f:view locale="#{localeController.locale}"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page markup="spread" label="Test" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/9000-attribute/Attribute.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/9000-attribute/Attribute.xhtml
index 8264c2ece4..fbfd6a1a67 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/9000-attribute/Attribute.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/9000-attribute/Attribute.xhtml
@@ -18,8 +18,8 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+ xmlns:f="jakarta.faces.core"
+ xmlns:c="jakarta.tags.core">
<tc:page>
<tc:gridLayout columns="250px 1fr">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/Test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/Test.xhtml
index 3bf29f3549..40f95fdf13 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/Test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/900-test/Test.xhtml
@@ -18,7 +18,7 @@
-->
<ui:composition template="/main.xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<ui:param name="title" value="Test"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
index 99f96df265..21d172780d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/content/Root_Dummy.xhtml
@@ -19,6 +19,6 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
Root Dummy
</ui:composition>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
index 38e93a84c7..331170274d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/error/404.xhtml
@@ -19,8 +19,8 @@
<ui:composition template="/main.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:ui="jakarta.faces.facelets"
+ xmlns:f="jakarta.faces.core">
<ui:param name="title" value="Error 404"/>
<tc:messages/>
<tc:out id="pageNotFoundMessage" value="The page was not found!"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
index 93a18311d6..abc20dca5d 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/error/exception.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Sorry, an error has occured!"/>
<tc:messages/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
index f66482df6f..d31e24f412 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/init.xhtml
@@ -18,7 +18,7 @@
-->
<f:view locale="#{localeController.locale}"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:page label="Tobago Demo" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml
index b9660f5feb..5d2060463c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/login.xhtml
@@ -20,7 +20,7 @@
<ui:composition template="/main.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<ui:param name="title" value="Login"/>
<p>This login site is to demonstrate roles.
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
index 76a0db0689..a57c9ffe52 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
@@ -20,9 +20,9 @@
<!-- main template for this demo application, you may also use plain.xhtml for test purpose -->
<ui:composition
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns="http://www.w3.org/1999/xhtml">
<f:view locale="#{localeController.locale}">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
index dcd812a2b3..08929f0fb5 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/menu.xhtml
@@ -19,7 +19,7 @@
<tc:header fixed="true"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:f="http://xmlns.jcp.org/jsf/core">
+ xmlns:f="jakarta.faces.core">
<!-- tbd: how to solve this? -->
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
index b507d6c855..3c9d42cbea 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
@@ -18,7 +18,7 @@
-->
<f:subview id="navigator"
- xmlns:f="http://xmlns.jcp.org/jsf/core"
+ xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<tc:tree id="nav" value="#{navigationTree.tree}" var="node" state="#{navigationState.state}">
<tc:treeNode id="node">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
index e378a48838..81969cf491 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/plain.xhtml
@@ -17,9 +17,9 @@
* limitations under the License.
-->
-<ui:composition xmlns:f="http://xmlns.jcp.org/jsf/core"
+<ui:composition xmlns:f="jakarta.faces.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<f:view locale="#{localeController.locale}">
<tc:page label="Test" id="page">
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/dropdown-dummy.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/dropdown-dummy.xhtml
index 60e5b30285..c125e9ac76 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/dropdown-dummy.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/dropdown-dummy.xhtml
@@ -18,7 +18,7 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+<html xmlns:cc="jakarta.faces.composite"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<cc:interface>
<cc:attribute name="label"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
index f45a2fd27c..efb6d42a3c 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/inputAsText.xhtml
@@ -18,7 +18,7 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+<html xmlns:cc="jakarta.faces.composite"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<cc:interface>
<cc:attribute name="label"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
index ba2ffeae0e..1c37a4bd95 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/resources/demo-components/rolesTest.xhtml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+<html xmlns:cc="jakarta.faces.composite"
xmlns:tc="http://myfaces.apache.org/tobago/component">
<cc:interface>
<cc:attribute name="label"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
index f3b0394e69..687398fe52 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/test.xhtml
@@ -19,7 +19,7 @@
<ui:composition template="/plain.xhtml"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+ xmlns:ui="jakarta.faces.facelets"
xmlns="http://www.w3.org/1999/xhtml">
<tc:script file="#{request.contextPath}/js/jasmine.js"/>
<tc:script file="#{request.contextPath}/js/jasmine-html.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
index 990671cb32..0a571c728f 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAccessAllPages.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+ xmlns:c="jakarta.tags.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:style file="#{request.contextPath}/style/tobago-test.css"/>
<tc:script file="#{request.contextPath}/script/tobago-testAll.js"/>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
index e15f5ef2df..b0ba1460fe 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/testAll.xhtml
@@ -19,9 +19,9 @@
<ui:composition template="/plain.xhtml"
xmlns="http://www.w3.org/1999/xhtml"
- xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+ xmlns:c="jakarta.tags.core"
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+ xmlns:ui="jakarta.faces.facelets">
<tc:style file="#{request.contextPath}/style/tobago-test.css"/>
<tc:script file="#{request.contextPath}/script/tobago-testAll.js"/>
[myfaces-tobago] 03/06: feature: Jakarta EE 10
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 604e2923774c8bb933f257b4c2b7de42056c1fe9
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Wed Jul 26 12:59:49 2023 +0200
feature: Jakarta EE 10
* support Jakarta EE 10 (Faces 4.0); drop support for Jakarta EE 9
* switch Faces 3.0 to 4.0 in POM
* TobagoActionSource no longer needed, because jakarta.faces.el.MethodBinding is removed and with it the deprecated methods implemented by TobagoActionSource
* DefaultResourceResolver deleted, because jakarta.faces.view.facelets.ResourceResolver is removed. The ResourceResolver was deprecated as of Jakarta Server Faces 2.2. The same functionality is more correctly provided by jakarta.faces.application.ResourceHandler. So hopefully Tobago don't need a default implementation.
* AbstractUITabGroup now implements ActionSource2 instead of TobagoActionSource (which had ActionSource2 implemented)
* DeltaStateHelper: implement new eval() method
* fix myfaces-test imports and exclude outdated junit-jupiter version
* update Jakarta dependencies in POM; adjust MockHttpSession
Issue: TOBAGO-2094
---
pom.xml | 39 ++++++------
tobago-core/pom.xml | 2 +-
.../myfaces/tobago/event/TobagoActionSource.java | 71 ----------------------
.../tobago/facelets/DefaultResourceResolver.java | 51 ----------------
.../tobago/internal/behavior/DeltaStateHelper.java | 9 ++-
.../internal/component/AbstractUITabGroup.java | 23 ++++---
.../internal/config/AbstractTobagoTestBase.java | 2 +-
.../internal/mock/servlet/MockHttpSession.java | 40 ------------
.../webapp/TobagoResponseWriterUnitTest.java | 2 +-
tobago-example/pom.xml | 28 ++++-----
tobago-example/tobago-example-demo/pom.xml | 4 +-
11 files changed, 59 insertions(+), 212 deletions(-)
diff --git a/pom.xml b/pom.xml
index 478345c64e..b9fce60a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,8 @@
<properties>
<frontend.skip>true</frontend.skip>
- <myfaces30.version>3.0.2</myfaces30.version>
- <mojarra30.version>3.0.5</mojarra30.version>
+ <myfaces40.version>4.0.1</myfaces40.version>
+ <mojarra40.version>4.0.3</mojarra40.version>
<openwebbeans.version>2.0.27</openwebbeans.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.8</logback.version>
@@ -147,19 +147,19 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.faces</artifactId>
- <version>${mojarra30.version}</version>
+ <version>${mojarra40.version}</version>
<optional>true</optional>
</dependency>
<!-- jcl-over-slf4j for myfaces -->
@@ -172,13 +172,13 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
- <version>5.0.0</version>
+ <version>6.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
- <version>4.0.0</version>
+ <version>5.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -240,7 +240,7 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.1</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
@@ -250,7 +250,7 @@
<dependency>
<groupId>jakarta.servlet.jsp.jstl</groupId>
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
- <version>2.0.0</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -261,7 +261,7 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
- <version>3.0.1</version>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -273,15 +273,21 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-test</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- myfaces "next"-->
<!--
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-test</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>test</scope>
</dependency>
-->
@@ -301,7 +307,6 @@
</dependencyManagement>
<dependencies>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
@@ -1116,12 +1121,12 @@
</profile>
<profile>
- <id>jsf-3.0</id>
+ <id>jsf-4.0</id>
<activation>
<property>
<name>!jsf</name>
<!-- <name>jsf</name>-->
-<!-- <value>myfaces-3.0</value>-->
+<!-- <value>myfaces-4.0</value>-->
</property>
</activation>
<dependencyManagement>
@@ -1129,13 +1134,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<optional>true</optional>
</dependency>
</dependencies>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index af32f006aa..db2443db81 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -265,7 +265,7 @@
</profile>
<profile>
- <id>jsf-3.0</id>
+ <id>jsf-4.0</id>
<activation>
<property>
<name>!jsf</name>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
deleted file mode 100644
index 418d43ef4d..0000000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/event/TobagoActionSource.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.apache.myfaces.tobago.event;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jakarta.faces.component.ActionSource2;
-import jakarta.faces.el.MethodBinding;
-
-import java.lang.invoke.MethodHandles;
-
-public interface TobagoActionSource extends ActionSource2 {
-
- Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-
- /**
- * @deprecated Replaced by ActionSource2.getActionExpression
- */
-// @Override no longer overriding, because it was dropped in MyFaces 2.3-next
- @Deprecated
- default MethodBinding getAction() {
- LOG.debug("JSF 1.1 style is no longer supported!");
- return null;
- }
-
- /**
- * @deprecated Replaced by ActionSource2.setActionExpression
- */
-// @Override no longer overriding, because it was dropped in MyFaces 2.3-next
- @Deprecated
- default void setAction(MethodBinding action) {
- LOG.debug("JSF 1.1 style is no longer supported!");
- }
-
- /**
- * @deprecated Replaced by getActionListeners
- */
-// @Override no longer overriding, because it was dropped in MyFaces 2.3-next
- @Deprecated
- default MethodBinding getActionListener() {
- LOG.debug("JSF 1.1 style is no longer supported!");
- return null;
- }
-
- /**
- * @deprecated Replaced by getActionListeners
- */
-// @Override no longer overriding, because it was dropped in MyFaces 2.3-next
- @Deprecated
- default void setActionListener(MethodBinding actionListener) {
- LOG.debug("JSF 1.1 style is no longer supported!");
- }
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
deleted file mode 100644
index dfcd737a4d..0000000000
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/DefaultResourceResolver.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.apache.myfaces.tobago.facelets;
-
-import jakarta.faces.FacesException;
-import jakarta.faces.context.FacesContext;
-import jakarta.faces.view.facelets.ResourceResolver;
-
-import java.io.IOException;
-import java.net.URL;
-
-/*
- * Was copied from MyFaces-Impl, because there is no JSF base class.
- */
-public class DefaultResourceResolver extends ResourceResolver {
-
- public DefaultResourceResolver() {
- super();
- }
-
- @Override
- public URL resolveUrl(final String path) {
- try {
- return Resource.getResourceUrl(FacesContext.getCurrentInstance(), path);
- } catch (final IOException e) {
- throw new FacesException(e);
- }
- }
-
- public String toString() {
- return "DefaultResourceResolver";
- }
-
-}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
index fd86a8fbc7..efb6fd5372 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/behavior/DeltaStateHelper.java
@@ -19,13 +19,12 @@
package org.apache.myfaces.tobago.internal.behavior;
-import org.apache.myfaces.tobago.exception.TobagoException;
-
import jakarta.el.ValueExpression;
import jakarta.faces.component.StateHelper;
import jakarta.faces.component.StateHolder;
import jakarta.faces.component.UIComponentBase;
import jakarta.faces.context.FacesContext;
+import org.apache.myfaces.tobago.exception.TobagoException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -34,6 +33,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.function.Supplier;
// todo: clean up (is a copy of MyFaces, but not all stuff is refactored)
@@ -254,6 +254,11 @@ class DeltaStateHelper<A extends EventBehavior> implements StateHelper {
return defaultValue;
}
+ @Override
+ public Object eval(Serializable serializable, Supplier<Object> supplier) {
+ return eval(serializable, supplier.get());
+ }
+
@Override
public Object get(final Serializable key) {
return fullState.get(key);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index 68d8f05838..e4c6883942 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -19,19 +19,9 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.Attributes;
-import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
-import org.apache.myfaces.tobago.event.TabChangeEvent;
-import org.apache.myfaces.tobago.event.TabChangeListener;
-import org.apache.myfaces.tobago.event.TabChangeSource;
-import org.apache.myfaces.tobago.event.TobagoActionSource;
-import org.apache.myfaces.tobago.model.SwitchType;
-import org.apache.myfaces.tobago.util.FacesELUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import jakarta.el.MethodExpression;
import jakarta.el.ValueExpression;
+import jakarta.faces.component.ActionSource2;
import jakarta.faces.component.UIComponent;
import jakarta.faces.component.behavior.ClientBehaviorHolder;
import jakarta.faces.context.FacesContext;
@@ -39,6 +29,15 @@ import jakarta.faces.event.AbortProcessingException;
import jakarta.faces.event.ActionListener;
import jakarta.faces.event.FacesEvent;
import jakarta.faces.event.PhaseId;
+import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.component.SupportsAutoSpacing;
+import org.apache.myfaces.tobago.event.TabChangeEvent;
+import org.apache.myfaces.tobago.event.TabChangeListener;
+import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.model.SwitchType;
+import org.apache.myfaces.tobago.util.FacesELUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@@ -49,7 +48,7 @@ import java.util.List;
* {@link org.apache.myfaces.tobago.internal.taglib.component.TabGroupTagDeclaration}
*/
public abstract class AbstractUITabGroup extends AbstractUIPanelBase
- implements TabChangeSource, TobagoActionSource, ClientBehaviorHolder, SupportsAutoSpacing {
+ implements TabChangeSource, ActionSource2, ClientBehaviorHolder, SupportsAutoSpacing {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
index 815c2dc319..a7d89d1fbf 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/config/AbstractTobagoTestBase.java
@@ -24,7 +24,7 @@ import jakarta.faces.component.behavior.AjaxBehavior;
import jakarta.faces.convert.DateTimeConverter;
import jakarta.faces.render.RenderKit;
import jakarta.servlet.ServletContext;
-import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.test.config.ResourceBundleVarNames;
import org.apache.myfaces.test.mock.MockFacesContext;
import org.apache.myfaces.test.mock.MockHttpServletRequest;
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
index aed387f751..212e81cb30 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/internal/mock/servlet/MockHttpSession.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.internal.mock.servlet;
import jakarta.servlet.ServletContext;
import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
import java.util.Enumeration;
import java.util.HashMap;
@@ -62,33 +61,6 @@ public class MockHttpSession implements HttpSession {
return 0;
}
- /**
- * @deprecated
- */
- @Deprecated
- @Override
- public HttpSessionContext getSessionContext() {
- return null;
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- @Override
- public Object getValue(final String s) {
- return null;
- }
-
- /**
- * @deprecated
- */
- @Deprecated
- @Override
- public String[] getValueNames() {
- return new String[0];
- }
-
@Override
public void invalidate() {
}
@@ -98,23 +70,11 @@ public class MockHttpSession implements HttpSession {
return false;
}
- /**
- * @deprecated
- */
- @Deprecated
- @Override
- public void putValue(final String s, final Object o) {
- }
-
@Override
public void removeAttribute(final String s) {
attributes.remove(s);
}
- @Override
- public void removeValue(final String s) {
- }
-
@Override
public void setAttribute(final String s, final Object o) {
attributes.put(s, o);
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
index 49418de4dc..cf59ed8b96 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.webapp;
-import org.apache.myfaces.test.base.junit4.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.apache.myfaces.tobago.internal.webapp.HtmlResponseWriter;
import org.apache.myfaces.tobago.internal.webapp.XmlResponseWriter;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 0eaf8d1bad..3580b349cf 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -178,49 +178,49 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>myfaces-3.0</id>
+ <id>myfaces-4.0</id>
<activation>
<property>
<name>!jsf</name>
<!-- <name>jsf</name>-->
- <!-- <value>myfaces-3.0</value>-->
+ <!-- <value>myfaces-4.0</value>-->
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</profile>
<profile>
- <id>mojarra-3.0</id>
+ <id>mojarra-4.0</id>
<activation>
<property>
<name>jsf</name>
- <value>mojarra-3.0</value>
+ <value>mojarra-4.0</value>
</property>
</activation>
<dependencies>
@@ -401,13 +401,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -539,13 +539,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -604,13 +604,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>provided</scope>
</dependency>
<!-- this enables the development mode -->
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index fcd18cba44..2050ed14c2 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -374,13 +374,13 @@
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces30.version}</version>
+ <version>${myfaces40.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
[myfaces-tobago] 04/06: feature(jakarta10): tag declarations
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 04bbd1980b772e9c7a5c269cd5d40201c5bde503
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Fri Jul 28 13:00:34 2023 +0200
feature(jakarta10): tag declarations
* In JEE10 "ValueBinding getValueBinding(String name)" is removed from UIComponentBase. Remove UIComponentTagAttribute annotation from "binding" to avoid definition of binding attribute in generated faces-config.xml, which leads to a startup failure. The binding attribute is still defined in jakarta.faces.component.UIComponent.
* In JEE10 "MethodBinding getActionListener()" is removed from UICommand. Remove UIComponentTagAttribute annotation from "actionListener" to avoid generation of a getActionListenerExpression() method in generated UI*-Classes. The actionListener attribute is still defined in jakarta.faces.component.UICommand.
* In JEE10 "MethodBinding getValueChangeListener()" is removed from UIInput. Remove UIComponentTagAttribute annotation from "valueChangeListener" to avoid generation of a getValueChangeListenerExpression() method in generated UI*-Classes. The valueChangeListener attribute is still defined in jakarta.faces.component.UIInput
* In JEE10 "MethodBinding getValidator()" is removed from UIInput. Remove UIComponentTagAttribute annotation from "validator" to avoid generation of a getValidatorExpression() method in generated UI*-Classes. The validator attribute is still defined in jakarta.faces.component.UIInput.
* In JEE10 "MethodBinding getAction()" is removed from UICommand. Remove UIComponentTagAttribute annotation from "action" to avoid generation of a getActionExpression() method in generated UI*-Classes. The action attribute is still defined in jakarta.faces.component.UICommand.
* Add getActionExpression() to AbstractUITabGroup, because the UIComponentTagAttribute annotation is removed from "action".
Issue: TOBAGO-2094
---
.../tobago/internal/component/AbstractUITabGroup.java | 14 ++++++++++++++
.../tobago/internal/taglib/declaration/HasAction.java | 7 -------
.../internal/taglib/declaration/HasActionListener.java | 8 +-------
.../tobago/internal/taglib/declaration/HasBinding.java | 4 +---
.../tobago/internal/taglib/declaration/HasValidator.java | 8 --------
.../taglib/declaration/HasValueChangeListener.java | 8 +-------
.../myfaces/tobago/apt/processor/TaglibGenerator.java | 2 +-
7 files changed, 18 insertions(+), 33 deletions(-)
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
index e4c6883942..3584935869 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUITabGroup.java
@@ -253,6 +253,16 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
return null;
}
+ @Override
+ public MethodExpression getActionExpression() {
+ return (MethodExpression) getStateHelper().eval(AbstractUITabGroup.PropertyKeys.actionExpression);
+ }
+
+ @Override
+ public void setActionExpression(MethodExpression actionExpression) {
+ getStateHelper().put(PropertyKeys.actionExpression, actionExpression);
+ }
+
/**
* @since 1.5.0
*/
@@ -276,4 +286,8 @@ public abstract class AbstractUITabGroup extends AbstractUIPanelBase
public void removeActionListener(final ActionListener listener) {
removeFacesListener(listener);
}
+
+ enum PropertyKeys {
+ actionExpression
+ }
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
index 95a5418757..ca167af691 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasAction.java
@@ -19,9 +19,7 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasAction {
/**
@@ -34,10 +32,5 @@ public interface HasAction {
* The string is directly passed to the navigation handler.
*/
@TagAttribute
- @UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION,
- methodReturnType = "java.lang.Object")
void setAction(String action);
-
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
index 513aead34f..fbd960c861 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasActionListener.java
@@ -19,9 +19,7 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasActionListener {
/**
@@ -30,10 +28,6 @@ public interface HasActionListener {
* The expression must evaluate to a public method that takes an ActionEvent
* parameter, with a return type of void.
*/
- @TagAttribute
- @UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "jakarta.faces.event.ActionEvent")
+ @TagAttribute(type = "")
void setActionListener(String actionListener);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
index 01f7e7417c..8b86f166c7 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasBinding.java
@@ -20,14 +20,12 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasBinding {
/**
* The value binding expression linking this component to a property in a backing bean.
* For Facelets, the component is the outer UIPanel, not the input control.
*/
- @TagAttribute
- @UIComponentTagAttribute(type = "jakarta.faces.component.UIComponent")
+ @TagAttribute(type = "jakarta.faces.component.UIComponent")
void setBinding(String binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
index 56109dce9d..a8baef59ff 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValidator.java
@@ -19,9 +19,7 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasValidator {
/**
@@ -29,11 +27,5 @@ public interface HasValidator {
* that validates the component's local value.
*/
@TagAttribute
- @UIComponentTagAttribute(type = {},
- expression = DynamicExpression.METHOD_EXPRESSION,
- methodSignature = {
- "jakarta.faces.context.FacesContext",
- "jakarta.faces.component.UIComponent",
- "java.lang.Object"})
void setValidator(String validator);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
index 73e57d4436..48a963feff 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasValueChangeListener.java
@@ -19,9 +19,7 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
public interface HasValueChangeListener {
/**
@@ -30,10 +28,6 @@ public interface HasValueChangeListener {
* The expression must evaluate to a public method that takes a ValueChangeEvent
* parameter, with a return type of void.
*/
- @TagAttribute
- @UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
- methodSignature = "jakarta.faces.event.ValueChangeEvent")
+ @TagAttribute(type = "")
void setValueChangeListener(String valueChangeListener);
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
index 5a33996730..4851bc6171 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
@@ -560,7 +560,7 @@ public class TaglibGenerator extends AbstractGenerator {
}
addLeafTextElement(clazz, "type", attribute, document);
}
- } else {
+ } else if (!tagAttribute.type().isEmpty()) {
addLeafTextElement(tagAttribute.type(), "type", attribute, document);
}
}
[myfaces-tobago] 06/06: feature(jakarta10): tomcat, jetty, docker
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 35534574a4085ccbf4d0eae6b0736e978da95502
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Aug 3 11:55:23 2023 +0200
feature(jakarta10): tomcat, jetty, docker
* Tobago runs in Tomcat, Jetty and Docker (with Tomcat)
* replace bval-jsr with hibernate-validator
* replace openwebbeans with weld
* remove jakarta.xml.bind-api because it's no longer needed to start with Java 11
* set Tomcat context path to /
* adjust readme
** add Tomcat start description
** update jetty description
** TomEE doesn't work
** rewrite Docker description
* remove tobago-config-owb because openwebbeans is not used anymore
* main.xhtml: check on null to prevent jakarta.el.ELException: java.lang.NullPointerException
Issue: TOBAGO-2094
---
README.md | 23 +--
pom.xml | 1 -
tobago-example/pom.xml | 215 ++++-----------------
tobago-example/tobago-example-demo/pom.xml | 99 +---------
.../tobago-example-demo/src/main/webapp/main.xhtml | 3 +-
tobago-tool/pom.xml | 1 -
tobago-tool/tobago-config-owb/pom.xml | 104 ----------
.../src/main/resources/META-INF/web-fragment.xml | 41 ----
8 files changed, 54 insertions(+), 433 deletions(-)
diff --git a/README.md b/README.md
index c23a371054..a9902bc636 100644
--- a/README.md
+++ b/README.md
@@ -66,23 +66,23 @@ Browse to the local URL http://localhost:8080/
You can also run the demo with different servers and JSF implementations
-**Jetty, OpenWebBeans (⚠ currently broken ⚠)**
+**Jetty, MyFaces and Weld**
```shell
mvn -f tobago-example/tobago-example-demo/pom.xml clean package jetty:run -Pjetty
```
-**Jetty, MyFaces and OpenWebBeans**
+**Jetty, Mojarra and Weld**
```shell
-mvn -f tobago-example/tobago-example-demo/pom.xml clean package jetty:run -Pjetty
+mvn -f tobago-example/tobago-example-demo/pom.xml clean package jetty:run -Pjetty -Djsf=mojarra-4.0
```
-**Jetty, Mojarra and Weld (⚠ some problems ⚠)**
+**Tomcat**
```shell
-mvn -f tobago-example/tobago-example-demo/pom.xml clean package jetty:run -Pjetty -Djsf=mojarra-3.0
+mvn -f tobago-example/tobago-example-demo/pom.xml package -Ptomcat cargo:run
```
-**TomEE**
+**TomEE (currently broken)**
```shell
mvn -f tobago-example/tobago-example-demo/pom.xml clean package -Ptomee tomee:run
```
@@ -93,13 +93,14 @@ mvn -f tobago-example/tobago-example-demo/pom.xml clean -Pliberty liberty:run
```
Browse to the local URL http://localhost:9080/
-**Tomcat, Mojarra and Weld (in Docker)**
+**Tomcat in Docker**
+
```
-cd tobago-example/tobago-example-demo
-mvn clean install -Djsf=mojarra-3.0
-docker run -it --rm -p 8080:8080 -v `pwd`/target/tobago-example-demo.war:/usr/local/tomcat/webapps/tobago-example-demo.war --name tobago-example-demo tomcat:10.0-jre11
+mvn -f tobago-example/tobago-example-demo/pom.xml clean package -Pdocker
+docker run -p 8080:8080 myfaces/tobago-example-demo:latest
```
-Browse to the local URL http://localhost:8080/tobago-example-demo/
+
+Browse to the local URL http://localhost:8080/
# Issue Tracking
diff --git a/pom.xml b/pom.xml
index b9fce60a3e..8ec04966f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
<frontend.skip>true</frontend.skip>
<myfaces40.version>4.0.1</myfaces40.version>
<mojarra40.version>4.0.3</mojarra40.version>
- <openwebbeans.version>2.0.27</openwebbeans.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.8</logback.version>
<maven.compile.source>1.8</maven.compile.source>
diff --git a/tobago-example/pom.xml b/tobago-example/pom.xml
index 3580b349cf..13e1c13925 100644
--- a/tobago-example/pom.xml
+++ b/tobago-example/pom.xml
@@ -81,26 +81,23 @@
-->
<scanIntervalSeconds>5</scanIntervalSeconds>
</configuration>
- <dependencies>
- <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencyManagement>
- <!-- todo: replace with implementation of bean validation 3.0 -->
<dependencies>
<dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- <classifier>jakarta</classifier>
- <version>2.0.6</version>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <version>5.1.1.SP1</version>
+ </dependency>
+ <dependency>
+ <!-- Jakarta Bean Validation 3.0 implementation -->
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>7.0.5.Final</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -275,80 +272,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
-
- <!-- openwebbeans -->
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-config-owb</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@@ -360,10 +283,13 @@
<scope>compile</scope>
</dependency>
<dependency>
- <!-- todo: replace with implementation of bean validation 3.0 -->
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -393,6 +319,16 @@
<containerId>tomcat10x</containerId>
<type>embedded</type>
</container>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>tobago-example-demo</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/</context>
+ </properties>
+ </deployable>
+ </deployables>
</configuration>
</plugin>
</plugins>
@@ -414,90 +350,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el22</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-config-owb</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@@ -514,9 +366,13 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
<scope>compile</scope>
</dependency>
<!-- this enables the development mode -->
@@ -525,11 +381,6 @@
<artifactId>tobago-config-dev</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
- </dependency>
</dependencies>
</profile>
diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 2050ed14c2..b4fc753e89 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -387,90 +387,6 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el22</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-config-owb</artifactId>
- <version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
@@ -487,9 +403,13 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.bval</groupId>
- <artifactId>bval-jsr</artifactId>
- <classifier>jakarta</classifier>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet-shaded</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate.validator</groupId>
+ <artifactId>hibernate-validator</artifactId>
<scope>compile</scope>
</dependency>
<!-- this enables the development mode -->
@@ -498,11 +418,6 @@
<artifactId>tobago-config-dev</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency> <!-- add JAXB to run the demo with Java 11 and higher -->
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>3.0.1</version>
- </dependency>
</dependencies>
</profile>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
index a57c9ffe52..007e82ffc9 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/main.xhtml
@@ -33,7 +33,8 @@
</f:metadata>
-->
- <tc:page label="#{'Tobago Demo - '.concat(navigationState.currentNode.label)}" id="page">
+ <tc:page id="page"
+ label="#{'Tobago Demo - '.concat(navigationState.currentNode.label != null ? navigationState.currentNode.label : '')}">
<!--
<tc:dataAttribute name="tobago-log-level" value="DEBUG"/>
diff --git a/tobago-tool/pom.xml b/tobago-tool/pom.xml
index b2d589c08c..64f8b425c4 100644
--- a/tobago-tool/pom.xml
+++ b/tobago-tool/pom.xml
@@ -30,7 +30,6 @@
<module>tobago-config-dev</module>
<module>tobago-config-mojarra</module>
<module>tobago-config-myfaces</module>
- <module>tobago-config-owb</module>
<module>tobago-tool-apt</module>
<module>tobago-tool-annotation</module>
<module>tobago-tool-test</module>
diff --git a/tobago-tool/tobago-config-owb/pom.xml b/tobago-tool/tobago-config-owb/pom.xml
deleted file mode 100644
index 0ca97381a7..0000000000
--- a/tobago-tool/tobago-config-owb/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-tool</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>tobago-config-owb</artifactId>
- <packaging>jar</packaging>
- <name>Tobago Helper to activate OpenWebBeans</name>
- <description>Includes the OWB activation listener.</description>
-
- <dependencies>
- <!-- openwebbeans -->
-<!-- XXX
- it seems that the "classifier" tag breaks the call of
- mvn dependency-check:check
-
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-impl</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-web</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-resource</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-spi</artifactId>
- <classifier>jakarta</classifier>
- <version>${openwebbeans.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- -->
- </dependencies>
-</project>
diff --git a/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml b/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml
deleted file mode 100644
index 4155d42f9b..0000000000
--- a/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
- * 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.
--->
-
-<web-fragment
- xmlns="https://jakarta.ee/xml/ns/jakartaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
- version="6.0">
-
- <name>tobago_config_owb</name>
-
- <ordering>
- <after>
- <!-- XXX Jetty doesn't allow undefined names here: NullPointerException in AnnotationConfiguration -->
- <!--<name>tobago_config_mojarra</name>-->
- <!--<name>tobago_config_myfaces</name>-->
- <name>tobago_core</name>
- </after>
- </ordering>
-
- <listener>
- <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
- </listener>
-
-</web-fragment>
[myfaces-tobago] 02/06: feature(jakarta10): update schema version
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 3e53e58d0142a9f57d7dc6639bd5719578aa925f
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Thu Jul 27 15:25:22 2023 +0200
feature(jakarta10): update schema version
* set faces-config version to 4.0
* set web.xml version to 6.0
* set beans.xml version to 4.0
Issue: TOBAGO-2094
---
tobago-core/src/main/faces-config/faces-config.xml | 4 ++--
tobago-core/src/main/resources/META-INF/beans.xml | 6 +++---
tobago-core/src/main/resources/META-INF/web-fragment.xml | 4 ++--
tobago-example/tobago-example-blank/src/main/resources/beans.xml | 6 +++---
.../tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml | 4 ++--
tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml | 4 ++--
.../tobago-example-demo/src/main/webapp/WEB-INF/beans.xml | 6 +++---
.../tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml | 4 ++--
tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml | 4 ++--
.../tobago-config-dev/src/main/resources/META-INF/web-fragment.xml | 4 ++--
.../src/main/resources/META-INF/web-fragment.xml | 4 ++--
.../src/main/resources/META-INF/web-fragment.xml | 4 ++--
.../tobago-config-owb/src/main/resources/META-INF/web-fragment.xml | 4 ++--
.../apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java | 4 ++--
14 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/tobago-core/src/main/faces-config/faces-config.xml b/tobago-core/src/main/faces-config/faces-config.xml
index 37407ffb54..781e3c49b0 100644
--- a/tobago-core/src/main/faces-config/faces-config.xml
+++ b/tobago-core/src/main/faces-config/faces-config.xml
@@ -20,8 +20,8 @@
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
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">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+ version="4.0">
<name>tobago_core</name>
diff --git a/tobago-core/src/main/resources/META-INF/beans.xml b/tobago-core/src/main/resources/META-INF/beans.xml
index 20d480b899..4a48ce50e7 100644
--- a/tobago-core/src/main/resources/META-INF/beans.xml
+++ b/tobago-core/src/main/resources/META-INF/beans.xml
@@ -17,9 +17,9 @@
* limitations under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
bean-discovery-mode="annotated"
- version="2.0">
+ version="4.0">
</beans>
diff --git a/tobago-core/src/main/resources/META-INF/web-fragment.xml b/tobago-core/src/main/resources/META-INF/web-fragment.xml
index 6a97bbd296..5c1b001f67 100644
--- a/tobago-core/src/main/resources/META-INF/web-fragment.xml
+++ b/tobago-core/src/main/resources/META-INF/web-fragment.xml
@@ -20,8 +20,8 @@
<web-fragment
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
+ version="6.0">
<name>tobago_core</name>
<description>MyFaces Tobago Core</description>
diff --git a/tobago-example/tobago-example-blank/src/main/resources/beans.xml b/tobago-example/tobago-example-blank/src/main/resources/beans.xml
index 20d480b899..4a48ce50e7 100644
--- a/tobago-example/tobago-example-blank/src/main/resources/beans.xml
+++ b/tobago-example/tobago-example-blank/src/main/resources/beans.xml
@@ -17,9 +17,9 @@
* limitations under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
bean-discovery-mode="annotated"
- version="2.0">
+ version="4.0">
</beans>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml
index 74a4496803..21a2b42f6b 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/faces-config.xml
@@ -20,8 +20,8 @@
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
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">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+ version="4.0">
<application>
<locale-config>
diff --git a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
index 0a7b25be38..5873584a0c 100644
--- a/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-blank/src/main/webapp/WEB-INF/web.xml
@@ -19,8 +19,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+ version="6.0">
<display-name>Blank Tobago Application</display-name>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/beans.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/beans.xml
index 20d480b899..4a48ce50e7 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/beans.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/beans.xml
@@ -17,9 +17,9 @@
* limitations under the License.
-->
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
bean-discovery-mode="annotated"
- version="2.0">
+ version="4.0">
</beans>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
index e86832fcde..5eb952f49b 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/faces-config.xml
@@ -20,8 +20,8 @@
<faces-config
xmlns="https://jakarta.ee/xml/ns/jakartaee"
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">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+ version="4.0">
<application>
<locale-config>
<default-locale>en</default-locale>
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
index b4351fefd4..5c6f5490f6 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
@@ -19,8 +19,8 @@
<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+ version="6.0">
<display-name>Tobago Demo Application</display-name>
diff --git a/tobago-tool/tobago-config-dev/src/main/resources/META-INF/web-fragment.xml b/tobago-tool/tobago-config-dev/src/main/resources/META-INF/web-fragment.xml
index 82cdfba327..86e85f89a2 100644
--- a/tobago-tool/tobago-config-dev/src/main/resources/META-INF/web-fragment.xml
+++ b/tobago-tool/tobago-config-dev/src/main/resources/META-INF/web-fragment.xml
@@ -20,8 +20,8 @@
<web-fragment
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
+ version="6.0">
<name>tobago_config_dev</name>
diff --git a/tobago-tool/tobago-config-mojarra/src/main/resources/META-INF/web-fragment.xml b/tobago-tool/tobago-config-mojarra/src/main/resources/META-INF/web-fragment.xml
index 6e7d76a185..835377a1fa 100644
--- a/tobago-tool/tobago-config-mojarra/src/main/resources/META-INF/web-fragment.xml
+++ b/tobago-tool/tobago-config-mojarra/src/main/resources/META-INF/web-fragment.xml
@@ -20,8 +20,8 @@
<web-fragment
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
+ version="6.0">
<name>tobago_config_mojarra</name>
diff --git a/tobago-tool/tobago-config-myfaces/src/main/resources/META-INF/web-fragment.xml b/tobago-tool/tobago-config-myfaces/src/main/resources/META-INF/web-fragment.xml
index e42813c02b..09ce7b28e0 100644
--- a/tobago-tool/tobago-config-myfaces/src/main/resources/META-INF/web-fragment.xml
+++ b/tobago-tool/tobago-config-myfaces/src/main/resources/META-INF/web-fragment.xml
@@ -20,8 +20,8 @@
<web-fragment
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
+ version="6.0">
<name>tobago_config_myfaces</name>
diff --git a/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml b/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml
index ad5c53274c..4155d42f9b 100644
--- a/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml
+++ b/tobago-tool/tobago-config-owb/src/main/resources/META-INF/web-fragment.xml
@@ -20,8 +20,8 @@
<web-fragment
xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"
- version="5.0">
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-fragment_6_0.xsd"
+ version="6.0">
<name>tobago_config_owb</name>
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
index ed953bfb08..5b4edb93b3 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
@@ -168,8 +168,8 @@ public class FacesConfigGenerator extends AbstractGenerator {
final Namespace xsi = Namespace.getNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
// rootElement.addNamespaceDeclaration(Namespace.getNamespace("xi", "http://www.w3.org/2001/XInclude"));
rootElement.setAttribute(new Attribute("schemaLocation",
- "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_3_0.xsd", xsi));
- rootElement.setAttribute("version", "3.0");
+ "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd", xsi));
+ rootElement.setAttribute("version", "4.0");
final Namespace namespace = rootElement.getNamespace();
applyNamespace(rootElement, namespace);
[myfaces-tobago] 05/06: feature(jakarta10): open-liberty
Posted by hn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hnoeth pushed a commit to branch JakartaEE10
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 5811ffbb81e6712987abf7ff46a5481ac9c87738
Author: Henning Noeth <hn...@apache.org>
AuthorDate: Tue Aug 1 13:04:52 2023 +0200
feature(jakarta10): open-liberty
* Tobago runs in open-liberty
** fix readme
** adjust server.xml; use jakartaee-10.0 feature
* workaround for NPE in MyFaces UISelectOne.processValidators()
Issue: TOBAGO-2094
---
README.md | 2 +-
.../internal/component/AbstractUISelectOneRadio.java | 17 +++++++++++++++++
.../src/test/liberty/config/server.xml | 2 +-
3 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index c9f896d607..c23a371054 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ mvn -f tobago-example/tobago-example-demo/pom.xml clean package jetty:run -Pjett
mvn -f tobago-example/tobago-example-demo/pom.xml clean package -Ptomee tomee:run
```
-**Open Liberty **
+**Open Liberty**
```shell
mvn -f tobago-example/tobago-example-demo/pom.xml clean -Pliberty liberty:run
```
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneRadio.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneRadio.java
index 1f712a06d2..eec72ba91e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneRadio.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectOneRadio.java
@@ -41,4 +41,21 @@ public abstract class AbstractUISelectOneRadio extends AbstractUISelectOneBase i
public AbstractUISelectReference getRenderRangeReference() {
return renderRangeReference;
}
+
+ /**
+ * This fixes an NPE with MyFaces 4.0.1 #{jakarta.faces.component.UISelectOne.processValidators} where the group is
+ * "null" and an .equals() is called.
+ * todo: remove this method, if the bug is fixed in MyFaces
+ *
+ * @return never null; either the group name or an empty string
+ */
+ @Override
+ public String getGroup() {
+ final String group = super.getGroup();
+ if (group != null) {
+ return group;
+ } else {
+ return "";
+ }
+ }
}
diff --git a/tobago-example/tobago-example-demo/src/test/liberty/config/server.xml b/tobago-example/tobago-example-demo/src/test/liberty/config/server.xml
index 05c9da64ee..4fba924877 100644
--- a/tobago-example/tobago-example-demo/src/test/liberty/config/server.xml
+++ b/tobago-example/tobago-example-demo/src/test/liberty/config/server.xml
@@ -16,7 +16,7 @@
-->
<server>
<featureManager>
- <feature>jakartaee-9.1</feature>
+ <feature>jakartaee-10.0</feature>
</featureManager>
<webApplication contextRoot="/" location="tobago-example-demo.war" type="war">