Fixes mojarra #5160 and MYFACES-4491

tck/faces23/localizedComposite/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.eclipse.ee4j.tck.faces.faces23</groupId>
+        <artifactId>pom</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>localizedComposite</artifactId>
+    <packaging>war</packaging>
+
+    <name>Jakarta Faces TCK ${project.version} - Test - Faces 2.3 - localizedComposite</name>
+    <description>Composite .properties l10n files should reflect current locale when using resourceBundleMap.</description>
+</project>

tck/faces23/localizedComposite/src/main/java/ee/jakarta/tck/faces/test/localizedComposite/Issue5160Bean.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation.
+ * Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0, which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the
+ * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ * version 2 with the GNU Classpath Exception, which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ */
+package ee.jakarta.tck.faces.test.composite;
+
+import java.util.Locale;
+
+import jakarta.annotation.PostConstruct;
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.servlet.http.HttpServletRequest;
+
+@Named
+@RequestScoped
+public class Issue5160Bean {
+
+    @Inject
+    private HttpServletRequest request;
+
+    private Locale locale;
+
+    @PostConstruct
+    public void init() {
+        locale = parseLocale(request.getHeader("Accept-Language"));
+    }
+
+    private Locale parseLocale(String languageTag) {
+        String[] chunks = languageTag.split("[_-]");
+        switch (chunks.length) {
+            case 1: return new Locale(chunks[0]);
+            case 2: return new Locale(chunks[0], chunks[1]);
+            default: return new Locale(chunks[0], chunks[1], chunks[2]);
+        }
+    }
+
+    public Locale getLocale() {
+        return locale;
+    }
+
+}

tck/faces23/localizedComposite/src/main/resources/locale/messages.properties

@@ -0,0 +1,2 @@
+appheader=Application
+buttonvalue=My precious button

tck/faces23/localizedComposite/src/main/resources/locale/messages_es.properties

@@ -0,0 +1,2 @@
+appheader=Aplicaci\u00f3n
+buttonvalue=Mi precioso bot\u00f3n

tck/faces23/localizedComposite/src/main/webapp/WEB-INF/beans.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       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_1_1.xsd"
+       bean-discovery-mode="all" 
+       version="1.1">
+</beans>

tck/faces23/localizedComposite/src/main/webapp/WEB-INF/faces-config.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 2017, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+              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/web-facesconfig_2_3.xsd"
+              version="2.3">
+    <application>
+        <locale-config>
+            <default-locale>en</default-locale>
+            <supported-locale>es</supported-locale>
+            <supported-locale>pt</supported-locale>
+            <supported-locale>pt_BR</supported-locale>
+            <supported-locale>pt_BR_PB</supported-locale>
+        </locale-config>
+        <resource-bundle>
+            <base-name>locale.messages</base-name>
+            <var>msgs</var>
+        </resource-bundle>
+    </application>
+</faces-config>

tck/faces23/localizedComposite/src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" 
+         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/web-app_3_1.xsd">
+
+    <context-param>
+        <param-name>jakarta.faces.PROJECT_STAGE</param-name>
+        <param-value>${webapp.projectStage}</param-value>
+    </context-param>
+    <context-param>
+        <param-name>jakarta.faces.PARTIAL_STATE_SAVING</param-name>
+        <param-value>${webapp.partialStateSaving}</param-value>
+    </context-param>
+    <context-param>
+        <param-name>jakarta.faces.STATE_SAVING_METHOD</param-name>
+        <param-value>${webapp.stateSavingMethod}</param-value>
+    </context-param>    
+    <context-param>
+        <param-name>jakarta.faces.SERIALIZE_SERVER_STATE</param-name>
+        <param-value>${webapp.serializeServerState}</param-value>
+    </context-param>
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.xhtml</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>30</session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>issue5160.xhtml</welcome-file>
+    </welcome-file-list>
+</web-app>

tck/faces23/localizedComposite/src/main/webapp/issue5160.xhtml

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<html xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+        xmlns:comp="http://xmlns.jcp.org/jsf/composite/comps">
+    <f:view locale="#{issue5160Bean.locale}">
+        <h:head id="head">
+            <title>JSF 2.3 Localized Composite</title>
+        </h:head>
+        <h:body>
+            <h1 id="header">#{msgs.appheader}</h1>
+            <h:form id="frm">
+                <h:commandButton id="btn" value="#{msgs.buttonvalue}"/>
+                <comp:button id="btn1"/>
+            </h:form>
+        </h:body>
+    </f:view>
+</html>

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button.properties

@@ -0,0 +1,2 @@
+btnvalue=Button
+

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button.xhtml

@@ -0,0 +1,31 @@
+<!--
+    Copyright (c) 2022 Contributors to the Eclipse Foundation.
+    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:cc="http://xmlns.jcp.org/jsf/composite"
+                xmlns:h="http://xmlns.jcp.org/jsf/html">
+
+    <cc:interface>
+    </cc:interface>
+
+    <cc:implementation>
+        <h:commandButton id="btn" value="#{cc.resourceBundleMap.btnvalue}"/>
+    </cc:implementation>
+
+</ui:composition>

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button_es.properties

@@ -0,0 +1,2 @@
+btnvalue=Bot\u00f3n
+

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button_pt.properties

@@ -0,0 +1,2 @@
+btnvalue=Accionador
+

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button_pt_BR.properties

@@ -0,0 +1,2 @@
+btnvalue=Bot\u00e3o
+

tck/faces23/localizedComposite/src/main/webapp/resources/comps/button_pt_BR_PB.properties

@@ -0,0 +1,2 @@
+btnvalue=Pitoco
+