-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adds tests to check issues mojarra #5160 and MYFACES-4491
- Loading branch information
Showing
16 changed files
with
455 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
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.0.0-SNAPSHOT</version> | ||
</parent> | ||
|
||
<artifactId>localized-composite</artifactId> | ||
<packaging>war</packaging> | ||
|
||
<name>Jakarta Faces TCK ${project.version} - Test - Faces 2.3 - localized-composite</name> | ||
<description>Composite .properties l10n files should reflect current locale when using resourceBundleMap.</description> | ||
</project> |
74 changes: 74 additions & 0 deletions
74
...s23/localized-composite/src/main/java/ee/jakarta/tck/faces/test/composite/LocaleBean.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
/* | ||
* Copyright (c) 2021 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 jakarta.annotation.PostConstruct; | ||
import jakarta.enterprise.context.SessionScoped; | ||
import jakarta.faces.component.UIViewRoot; | ||
import jakarta.faces.context.FacesContext; | ||
import jakarta.inject.Inject; | ||
import jakarta.inject.Named; | ||
import jakarta.servlet.http.HttpServletRequest; | ||
import java.io.Serializable; | ||
import java.util.Locale; | ||
|
||
@Named | ||
@SessionScoped | ||
public class LocaleBean implements Serializable { | ||
|
||
@Inject | ||
private HttpServletRequest request; | ||
|
||
private Locale locale; | ||
|
||
private String language; | ||
|
||
@PostConstruct | ||
public void init() { | ||
Locale requestLocale = request.getLocale(); | ||
setLocale(requestLocale != null ? requestLocale.toString() : "en"); | ||
} | ||
|
||
private void setLocale(String languageTag) { | ||
String[] chunks = languageTag.split("(-|_)"); | ||
switch (chunks.length) { | ||
case 1: | ||
locale = new Locale(chunks[0]); | ||
break; | ||
case 2: | ||
locale = new Locale(chunks[0], chunks[1]); | ||
break; | ||
default: | ||
locale = new Locale(chunks[0], chunks[1], chunks[2]); | ||
break; | ||
} | ||
language = locale.toString(); | ||
UIViewRoot root = FacesContext.getCurrentInstance().getViewRoot(); | ||
if (root != null) { | ||
root.setLocale(locale); | ||
} | ||
} | ||
|
||
public Locale getLocale() { | ||
return locale; | ||
} | ||
|
||
public String getLanguage() { | ||
return language; | ||
} | ||
|
||
} |
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/resources/locale/messages.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
appheader=Application | ||
buttonvalue=My precious button |
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/resources/locale/messages_es.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
appheader=Aplicaci\u00f3n | ||
buttonvalue=Mi precioso bot\u00f3n |
25 changes: 25 additions & 0 deletions
25
tck/faces23/localized-composite/src/main/webapp/WEB-INF/beans.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Copyright (c) 2017, 2018 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> |
37 changes: 37 additions & 0 deletions
37
tck/faces23/localized-composite/src/main/webapp/WEB-INF/faces-config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Copyright (c) 2017, 2018 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> |
29 changes: 29 additions & 0 deletions
29
tck/faces23/localized-composite/src/main/webapp/WEB-INF/glassfish-web.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd"> | ||
<!-- | ||
Copyright (c) 2017, 2018 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 | ||
--> | ||
|
||
<glassfish-web-app error-url=""> | ||
<context-root>/localized-composite</context-root> | ||
<class-loader delegate="true"/> | ||
<jsp-config> | ||
<property name="keepgenerated" value="true"> | ||
<description>Keep a copy of the generated servlet class' java code.</description> | ||
</property> | ||
</jsp-config> | ||
</glassfish-web-app> |
55 changes: 55 additions & 0 deletions
55
tck/faces23/localized-composite/src/main/webapp/WEB-INF/web.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Copyright (c) 1997, 2018 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>localized-composite.xhtml</welcome-file> | ||
</welcome-file-list> | ||
</web-app> |
35 changes: 35 additions & 0 deletions
35
tck/faces23/localized-composite/src/main/webapp/localized-composite.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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="#{localeBean.language}"> | ||
<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> |
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/webapp/resources/comps/button.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
btnvalue=Button | ||
|
31 changes: 31 additions & 0 deletions
31
tck/faces23/localized-composite/src/main/webapp/resources/comps/button.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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> |
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/webapp/resources/comps/button_es.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
btnvalue=Bot\u00f3n | ||
|
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/webapp/resources/comps/button_pt.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
btnvalue=Accionador | ||
|
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/webapp/resources/comps/button_pt_BR.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
btnvalue=Bot\u00e3o | ||
|
2 changes: 2 additions & 0 deletions
2
tck/faces23/localized-composite/src/main/webapp/resources/comps/button_pt_BR_PB.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
btnvalue=Pitoco | ||
|
Oops, something went wrong.