From 8510563bb6e90a5156593e40d26ce08ff2516bc6 Mon Sep 17 00:00:00 2001
From: arjantijms
- * Apply the {@link java.lang.annotation.Annotation}(s). The act of doing so should affect the JSF runtime in some
+ * Apply the {@link java.lang.annotation.Annotation}(s). The act of doing so should affect the Faces runtime in some
* fashion (see the spec for the specific annotation types).
*
- * This class manages the initialization of each web application that uses JSF.
+ * This class manages the initialization of each web application that uses Faces.
*
- * This method bootstraps JSF based on the parsed configuration resources.
+ * This method bootstraps Faces based on the parsed configuration resources.
*
- * A specialized implementation of {@link ExceptionHandler} for JSF 2.0 that handles exceptions by writing error
+ * A specialized implementation of {@link ExceptionHandler} for Faces that handles exceptions by writing error
* information to the partial response.
*
- * The default implementation of {@link ExceptionHandler} for JSF 2.0.
+ * The default implementation of {@link ExceptionHandler} for Faces.
*
diff --git a/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java b/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java
index fe51211e62..3e92bd35a9 100644
--- a/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java
+++ b/impl/src/main/java/com/sun/faces/context/ExternalContextImpl.java
@@ -122,7 +122,7 @@ public ExternalContextImpl(ServletContext sc, ServletRequest request, ServletRes
boolean enabled = ContextParamUtils.getValue(servletContext, SendPoweredByHeader, Boolean.class);
if (enabled) {
- ((HttpServletResponse) response).addHeader("X-Powered-By", "JSF/2.3");
+ ((HttpServletResponse) response).addHeader("X-Powered-By", "Faces/3.0");
}
distributable = ContextParamUtils.getValue(servletContext, ContextParam.EnableDistributable, Boolean.class);
diff --git a/impl/src/main/java/com/sun/faces/context/flash/FlashELResolver.java b/impl/src/main/java/com/sun/faces/context/flash/FlashELResolver.java
index f8e747aba1..e671711852 100644
--- a/impl/src/main/java/com/sun/faces/context/flash/FlashELResolver.java
+++ b/impl/src/main/java/com/sun/faces/context/flash/FlashELResolver.java
@@ -52,7 +52,7 @@
*
- * Consider three JSF views: viewA, viewB, and viewC. The user first views viewA, then clicks a button and is shown
+ * Consider three Faces views: viewA, viewB, and viewC. The user first views viewA, then clicks a button and is shown
* viewB, where she clicks a button and is shown viewC. If values are stored into the flash during the rendering or
* postback phases of viewA, they are available to during the rendering phase of viewB, but are not available during the
* rendering or postback phases of viewC. In other words, values stored into the flash on "this" request are accessible
@@ -67,7 +67,7 @@
*
- * Using an EL Expression, such as using
- * JSP indicates this CompositeELResolver instance is the JSP chain, specified in section 5.6.1 of the spec.
+ * JSP indicates this CompositeELResolver instance is the Jakarta Server Pages chain, specified in section 5.6.1 of the spec.
*
- * Faces indicates this CompositeELResolver instance is the JSF chain, specified in section 5.6.2 of the spec.
+ * Faces indicates this CompositeELResolver instance is the Faces chain, specified in section 5.6.2 of the spec.
*
- * This class is used to register the JSF
diff --git a/impl/src/main/java/com/sun/faces/mgbean/BeanManager.java b/impl/src/main/java/com/sun/faces/mgbean/BeanManager.java
index 7aa44d5a6f..ce8c6febf2 100644
--- a/impl/src/main/java/com/sun/faces/mgbean/BeanManager.java
+++ b/impl/src/main/java/com/sun/faces/mgbean/BeanManager.java
@@ -46,7 +46,7 @@
/**
*
- * Main interface for dealing with JSF managed beans
+ * Main interface for dealing with Faces managed beans
*
- * This JSF listener for {@link UIViewRoot} ensures that the necessary JavaScript code to open or close the
+ * This Faces listener for {@link UIViewRoot} ensures that the necessary JavaScript code to open or close the
*
- * Original author Inderjeet Singh, J2EE Blue Prints Team. Modified to suit JSF needs.
+ * Original author Inderjeet Singh, J2EE Blue Prints Team. Modified to suit Faces needs.
*
- * This interface defines an integration point for Java EE vendors. Each vendor will need to provide an implementation
- * of this interface which will provide the JSF implementation the necessary hooks to perform resource injection.
+ * This interface defines an integration point for Jakarta EE vendors. Each vendor will need to provide an implementation
+ * of this interface which will provide the Faces implementation the necessary hooks to perform resource injection.
*
diff --git a/impl/src/main/java/com/sun/faces/taglib/FacesValidator.java b/impl/src/main/java/com/sun/faces/taglib/FacesValidator.java
index 550e5f7cb7..b86ea2cb3f 100644
--- a/impl/src/main/java/com/sun/faces/taglib/FacesValidator.java
+++ b/impl/src/main/java/com/sun/faces/taglib/FacesValidator.java
@@ -61,105 +61,105 @@ public abstract class FacesValidator extends TagLibraryValidator {
private static final String JSTL_NEW_CORE_URI = "http://java.sun.com/jsp/jstl/core";
- // Prefix for JSF HTML tags
+ // Prefix for Faces HTML tags
protected String JSF_HTML_PRE = null;
public String getJSF_HTML_PRE() {
return JSF_HTML_PRE;
}
- // Prefix for JSF CORE tags
+ // Prefix for Faces CORE tags
protected String JSF_CORE_PRE = null;
public String getJSF_CORE_PRE() {
return JSF_CORE_PRE;
}
- // Prefix for JSTL CORE tags
+ // Prefix for Jakarta Standard Tag CORE tags
protected String JSTL_CORE_PRE = null;
public String getJSTL_CORE_PRE() {
return JSTL_CORE_PRE;
}
- // QName for JSTL conditional tag
+ // QName for Jakarta Standard Tag conditional tag
protected String JSTL_IF_QN = ":if";
public String getJSTL_IF_QN() {
return JSTL_IF_QN;
}
- // Local Name for JSTL conditional tag
+ // Local Name for Jakarta Standard Tag conditional tag
protected String JSTL_IF_LN = "if";
public String getJSTL_IF_LN() {
return JSTL_IF_LN;
}
- // QName for JSTL conditional tag
+ // QName for Jakarta Standard Tag conditional tag
protected String JSTL_CHOOSE_QN = ":choose";
public String getJSTL_CHOOSE_QN() {
return JSTL_CHOOSE_QN;
}
- // Local Name for JSTL conditional tag
+ // Local Name for Jakarta Standard Tag conditional tag
protected String JSTL_CHOOSE_LN = "choose";
public String getJSTL_CHOOSE_LN() {
return JSTL_CHOOSE_LN;
}
- // QName for JSTL iterator tag
+ // QName for Jakarta Standard Tag iterator tag
protected String JSTL_FOREACH_QN = ":forEach";
public String getJSTL_FOREACH_QN() {
return JSTL_FOREACH_QN;
}
- // Local Name for JSTL iterator tag
+ // Local Name for Jakarta Standard Tag iterator tag
protected String JSTL_FOREACH_LN = "forEach";
public String getJSTL_FOREACH_LN() {
return JSTL_FOREACH_LN;
}
- // QName for JSTL iterator tag
+ // QName for Jakarta Standard Tag iterator tag
protected String JSTL_FORTOKENS_QN = ":forTokens";
public String getJSTL_FORTOKENS_QN() {
return JSTL_FORTOKENS_QN;
}
- // Local Name for JSTL iterator tag
+ // Local Name for Jakarta Standard Tag iterator tag
protected String JSTL_FORTOKENS_LN = "forTokens";
public String getJSTL_FORTOKENS_LN() {
return JSTL_FORTOKENS_LN;
}
- // QName for JSF Form tag
+ // QName for Faces Form tag
protected String JSF_FORM_QN = ":form";
public String getJSF_FORM_QN() {
return JSF_FORM_QN;
}
- // Local Name for JSF Form tag
+ // Local Name for Faces Form tag
protected String JSF_FORM_LN = "form";
public String getJSF_FORM_LN() {
return JSF_FORM_LN;
}
- // QName for JSF subview tag
+ // QName for Faces subview tag
protected String JSF_SUBVIEW_QN = ":subview";
public String getJSF_SUBVIEW_QN() {
return JSF_SUBVIEW_QN;
}
- // Local Name for JSF subview tag
+ // Local Name for Faces subview tag
protected String JSF_SUBVIEW_LN = "subview";
public String getJSF_SUBVIEW_LN() {
@@ -198,7 +198,7 @@ public void release() {
// Validation entry point
/**
- * Validate a JSP page. Return an an array of Validation Messages if a validation failure occurs. Return null on
+ * Validate a Jakarta Server Pages page. Return an an array of Validation Messages if a validation failure occurs. Return null on
* success.
*
* @param prefix Value of directive prefix argument.
@@ -211,7 +211,7 @@ public synchronized ValidationMessage[] validate(String prefix, String uri, Page
ValidationMessage[] result = null;
try {
-// get a handler
+ // get a handler
DefaultHandler h = getSAXHandler();
// if the subclass doesn't want validation to ocurr
@@ -227,11 +227,11 @@ public synchronized ValidationMessage[] validate(String prefix, String uri, Page
SAXParser p = f.newSAXParser();
p.parse(page.getInputStream(), h);
-//on validation failure generate error message
+ // on validation failure generate error message
if (failed) {
result = vmFromString(getFailureMessage(prefix, uri));
} else {
-//success
+ // success
result = null;
}
diff --git a/impl/src/main/java/com/sun/faces/taglib/jsf_core/CoreValidator.java b/impl/src/main/java/com/sun/faces/taglib/jsf_core/CoreValidator.java
index 98431299c1..148b92d93d 100644
--- a/impl/src/main/java/com/sun/faces/taglib/jsf_core/CoreValidator.java
+++ b/impl/src/main/java/com/sun/faces/taglib/jsf_core/CoreValidator.java
@@ -24,8 +24,8 @@
/**
*
- * A TagLibrary Validator class to allow a TLD to mandate that JSF tag must have an id if it is a child or sibling of a
- * JSTL conditional or iteration tag
+ * A TagLibrary Validator class to allow a TLD to mandate that Faces tag must have an id if it is a child or sibling of a
+ * Jakarta Standard Tag conditional or iteration tag
* ServletContext
for the application that requires initialization
diff --git a/impl/src/main/java/com/sun/faces/context/AjaxExceptionHandlerImpl.java b/impl/src/main/java/com/sun/faces/context/AjaxExceptionHandlerImpl.java
index 16ea960856..21ac29bea9 100644
--- a/impl/src/main/java/com/sun/faces/context/AjaxExceptionHandlerImpl.java
+++ b/impl/src/main/java/com/sun/faces/context/AjaxExceptionHandlerImpl.java
@@ -44,7 +44,7 @@
/**
*
*
*
#{flash.foo}
as the value of an attribute in a JSP page.
+ * Using an Expression Language Expression, such as using #{flash.foo}
as the value of an attribute in a Jakarta Server Pages page.
* ELResolver for JSF
.
+ * Maintains an ordered composite list of child ELResolver for Faces
.
*
*/
public final class ChainTypeCompositeELResolver extends FacesCompositeELResolver {
diff --git a/impl/src/main/java/com/sun/faces/el/DemuxCompositeELResolver.java b/impl/src/main/java/com/sun/faces/el/DemuxCompositeELResolver.java
index 5c238051c4..8cb89c2d36 100644
--- a/impl/src/main/java/com/sun/faces/el/DemuxCompositeELResolver.java
+++ b/impl/src/main/java/com/sun/faces/el/DemuxCompositeELResolver.java
@@ -25,7 +25,7 @@
import jakarta.el.ELResolver;
/**
- * Maintains an ordered composite list of child ELResolver for JSF
.
+ * Maintains an ordered composite list of child ELResolver for Faces
.
*
*/
public class DemuxCompositeELResolver extends FacesCompositeELResolver {
diff --git a/impl/src/main/java/com/sun/faces/el/ELContextListenerImpl.java b/impl/src/main/java/com/sun/faces/el/ELContextListenerImpl.java
index 077c2d5489..cec107e9b6 100644
--- a/impl/src/main/java/com/sun/faces/el/ELContextListenerImpl.java
+++ b/impl/src/main/java/com/sun/faces/el/ELContextListenerImpl.java
@@ -40,14 +40,14 @@ public void contextCreated(ELContextEvent ece) {
return;
}
ELContext source = (ELContext) ece.getSource();
- // Register FacesContext with JSP
+ // Register FacesContext with Jakarta Server Pages
source.putContext(FacesContext.class, context);
ExpressionFactory exFactory = ELUtils.getDefaultExpressionFactory(context);
if (null != exFactory) {
source.putContext(ExpressionFactory.class, exFactory);
}
- // dispatch the event to any JSF applications interested in
+ // dispatch the event to any Faces applications interested in
// the event.
ELContextListener[] listeners = context.getApplication().getELContextListeners();
if (listeners == null) {
diff --git a/impl/src/main/java/com/sun/faces/el/FacesCompositeELResolver.java b/impl/src/main/java/com/sun/faces/el/FacesCompositeELResolver.java
index e64f67bd38..e20d9df3cb 100644
--- a/impl/src/main/java/com/sun/faces/el/FacesCompositeELResolver.java
+++ b/impl/src/main/java/com/sun/faces/el/FacesCompositeELResolver.java
@@ -20,18 +20,18 @@
import jakarta.el.ELResolver;
/**
- * Maintains an ordered composite list of child ELResolver for JSF
.
+ * Maintains an ordered composite list of child ELResolver for Faces
.
*
*/
public abstract class FacesCompositeELResolver extends CompositeELResolver {
/**
* ELResolver
stack with the JSP container.
+ * This class is used to register the Faces ELResolver
stack with the Jakarta Server Pages container.
* WebSocket
is properly rendered depending on rendered
and connected
attributes.
*
* @author Bauke Scholtz
diff --git a/impl/src/main/java/com/sun/faces/renderkit/ApplicationObjectInputStream.java b/impl/src/main/java/com/sun/faces/renderkit/ApplicationObjectInputStream.java
index 02ca87c7c1..0ce70cab3e 100644
--- a/impl/src/main/java/com/sun/faces/renderkit/ApplicationObjectInputStream.java
+++ b/impl/src/main/java/com/sun/faces/renderkit/ApplicationObjectInputStream.java
@@ -25,7 +25,7 @@
/**
* An ObjectInputStream that can deserialize objects relative to the current application's class loader. In particular,
- * this class works around deserialization problems when the JSF JARs are shared (i.e. the classloader has no access to
+ * this class works around deserialization problems when the Faces JARs are shared (i.e. the classloader has no access to
* application objects).
*/
public class ApplicationObjectInputStream extends ObjectInputStream {
diff --git a/impl/src/main/java/com/sun/faces/renderkit/ByteArrayGuard.java b/impl/src/main/java/com/sun/faces/renderkit/ByteArrayGuard.java
index f44ebede2d..0ee688fbf6 100644
--- a/impl/src/main/java/com/sun/faces/renderkit/ByteArrayGuard.java
+++ b/impl/src/main/java/com/sun/faces/renderkit/ByteArrayGuard.java
@@ -54,7 +54,7 @@
*
- * Original author Inderjeet Singh, J2EE Blue Prints Team. Modified to suit JSF needs. + * Original author Inderjeet Singh, J2EE Blue Prints Team. Modified to suit Faces needs. *
*/ public final class ByteArrayGuardAESCTR { diff --git a/impl/src/main/java/com/sun/faces/util/Util.java b/impl/src/main/java/com/sun/faces/util/Util.java index da5721be19..75efdcb855 100644 --- a/impl/src/main/java/com/sun/faces/util/Util.java +++ b/impl/src/main/java/com/sun/faces/util/Util.java @@ -64,9 +64,6 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - import com.sun.faces.RIConstants; import com.sun.faces.application.ApplicationAssociate; import com.sun.faces.config.WebConfiguration; @@ -195,7 +192,7 @@ public static String generateCreatedBy(FacesContext facesContext) { /** *
- * Factory method for creating the varius JSF listener instances that may be referenced by type
or
+ * Factory method for creating the various Faces listener instances that may be referenced by type
or
* binding
.
*
@@ -1074,7 +1071,7 @@ private static String getMappingForRequest(ExternalContext externalContext, Stri * Not to be confused with {@link Util#isExactMapped(String)}, which checks if a string representing a mapping, not a * resource, is an exact mapping. *
- * This should be replaced by the Servlet 4 mapping API when/if that becomes available and JSF/Mojarra can depend on it. + * This should be replaced by the Servlet 4 mapping API when/if that becomes available and Faces/Mojarra can depend on it. * * @param viewId the view id to test * @return true if the FacesServlet is exact mapped to the given viewId, false otherwise @@ -1089,7 +1086,7 @@ public static boolean isViewIdExactMappedToFacesServlet(String viewId) { * Not to be confused with {@link Util#isExactMapped(String)}, which checks if a string representing a mapping, not a * resource, is an exact mapping. *
- * This should be replaced by the Servlet 4 mapping API when/if that becomes available and JSF/Mojarra can depend on it. + * This should be replaced by the Servlet 4 mapping API when/if that becomes available and Faces/Mojarra can depend on it. * * @param externalContext the external context for this request * @param resource the resource to test @@ -1105,7 +1102,7 @@ public static boolean isResourceExactMappedToFacesServlet(ExternalContext extern } public static String getFirstWildCardMappingToFacesServlet(ExternalContext externalContext) { - // If needed, cache this after initialization of JSF + // If needed, cache this after initialization of Faces Object context = externalContext.getContext(); if (context instanceof ServletContext) { return getFacesServletMappings((ServletContext) context).stream().filter(mapping -> mapping.contains("*")).findFirst().orElse(null); diff --git a/impl/src/main/java/jakarta/faces/validator/BeanValidator.java b/impl/src/main/java/jakarta/faces/validator/BeanValidator.java index 36e15ca70c..ba031f2a44 100644 --- a/impl/src/main/java/jakarta/faces/validator/BeanValidator.java +++ b/impl/src/main/java/jakarta/faces/validator/BeanValidator.java @@ -210,7 +210,7 @@ public String getValidationGroups() { *
* Let valueExpression be the return from calling {@link UIComponent#getValueExpression} on the argument
* component, passing the literal string “value” (without the quotes) as an argument. If this
- * application is running in an environment with a Unified EL Implementation for Java EE6 or later, obtain the
+ * application is running in an environment with Jakarta Expression Language, obtain the
* ValueReference
from valueExpression and let valueBaseClase be the return from calling
* ValueReference.getBase()
and valueProperty be the return from calling
* ValueReference.getProperty()
. If an earlier version of Jakarta Expression Language is present, use the
diff --git a/impl/src/main/java/jakarta/faces/view/ViewScoped.java b/impl/src/main/java/jakarta/faces/view/ViewScoped.java
index 7f50ca4faf..28bd5d4281 100644
--- a/impl/src/main/java/jakarta/faces/view/ViewScoped.java
+++ b/impl/src/main/java/jakarta/faces/view/ViewScoped.java
@@ -31,7 +31,7 @@
* jakarta.inject.Named} is found on a class, the runtime must place the bean in a CDI scope such that it remains active
* as long as {@link jakarta.faces.application.NavigationHandler#handleNavigation} does not cause a navigation to a view
* with a viewId that is different than the viewId of the current view. Any injections and notifications required by CDI
- * and the Java EE platform must occur as usual at the expected time.
+ * and the Jakarta EE platform must occur as usual at the expected time.
*
Creation of the SearchExpressionContext
As with other factories in JSF, the FactoryFinder
is
- used by the system to create instances of
- the SearchExpressionContext
which holds state during the
- operation of this API.
As with other factories in Faces, the FactoryFinder
is used by the system to create instances of
+ the SearchExpressionContext
which holds state during the operation of this API.
+
Adding new SearchKewordResolver
s
where #USER_FUNCTION# is the user's JavaScript and - #JSF_FUNCTION# is the JavaScript rendered by JSF. The choice + #JSF_FUNCTION# is the JavaScript rendered by Faces. The choice function should operate such that if the user's JavaScript returns true, then the rendered JavaScript will also execute.
diff --git a/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js b/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js index c94c5db8da..f6954fa537 100644 --- a/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js +++ b/impl/src/main/resources/META-INF/resources/jakarta.faces/jsf-uncompressed.js @@ -18,9 +18,9 @@ */ /** - @project JSF JavaScript Library + @project Faces JavaScript Library @version 2.2 - @description This is the standard implementation of the JSF JavaScript Library. + @description This is the standard implementation of the Faces JavaScript Library. */ // Detect if this is already loaded, and if loaded, if it's a higher version @@ -2748,9 +2748,9 @@ if (!((jsf && jsf.specversion && jsf.specversion >= 23000 ) && * unique within this view, but must not be included in the * view state. This requirement is simply to satisfy XML * correctness in parity with what is done in the - * corresponding non-partial JSF view. Locate and update + * corresponding non-partial Faces view. Locate and update * thejakarta.faces.ViewState
value for all
- * JSF forms covered in the render
target
+ * Faces forms covered in the render
target
* list whose ID starts with the same
* <VIEW_ROOT_CONTAINER_CLIENT_ID> value.
@@ -2775,9 +2775,9 @@ if (!((jsf && jsf.specversion && jsf.specversion >= 23000 ) &&
* unique within this view, but must not be included in the
* view state. This requirement is simply to satisfy XML
* correctness in parity with what is done in the
- * corresponding non-partial JSF view. Locate and update
+ * corresponding non-partial Faces view. Locate and update
* the jakarta.faces.ClientWindow
value for all
- * JSF forms covered in the render
target
+ * Faces forms covered in the render
target
* list whose ID starts with the same
* <VIEW_ROOT_CONTAINER_CLIENT_ID> value.
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings.properties b/impl/src/main/resources/com/sun/faces/LogStrings.properties
index 0cfae30c76..1072e74154 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024: Client state encryption: DI
jsf.config.webconfig.param.deprecated=JSF1025: [{0}] Context initialization parameter ''{1}'' is deprecated. The option will still be configured, but please use ''{2}'' in the future.
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025: [{0}] Context initialization parameter ''{1}'' is deprecated and will have no effect.
jsf.config.webconfig.option.notconfigured=JSF1026: [{0}] Configuration option ''{1}'' not configured
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] The ELResolvers for JSF were not registered with the JSP container.
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] The ELResolvers for JSF successfully registered with the JSP container.
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] The ELResolvers for Faces were not registered with the Jakarta Server Pages container.
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] The ELResolvers for Faces successfully registered with the Jakarta Server Pages container.
jsf.spi.injection.provider_not_implemented=JSF1029: The specified InjectionProvider implementation ''{0}'' does not implement the InjectionProvider interface.
jsf.spi.injection.provider_not_found=JSF1030: The specified InjectionProvider implementation ''{0}'' cannot be loaded.
jsf.spi.injection.provider_cannot_instantiate=JSF1031: The specified InjectionProvider ''{0}'' cannot be instantiated.
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065: Unable
jsf.application.publish.event.base_type_mismatch=JSF1066: Source object {0} is not an instance of provided base type {1}. Event search will not occur.
jsf.config.web_resource_not_found=JSF1067: Resource {0} specified by the {1} configuration option cannot be found. The resource will be ignored.
jsf.cannot_instantiate_component_error=JSF1068: Cannot instantiate component with component-type {0}
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069: Disabling the JSF 2.0 Facelets ViewHandler as an older FaceletViewHandler, {0}, has been explicitly configured. \
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069: Disabling the Faces Facelets ViewHandler as an older FaceletViewHandler, {0}, has been explicitly configured. \
If this is not desired behavior, remove the older FaceletViewHandler and library from your application.
jsf.navigation_invalid_query_string=JSF1070: Invalid query string in navigation outcome {0}
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_de.properties b/impl/src/main/resources/com/sun/faces/LogStrings_de.properties
index 17a123d2f5..3149d9f6ad 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_de.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_de.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024: Clientstatusverschl\u00fcss
jsf.config.webconfig.param.deprecated=JSF1025: [{0}] Kontextinitialisierungs-Parameter ''{1}'' wurde abgelehnt. Die Option wird trotzdem konfiguriert, aber bitte verwenden Sie in Zukunft ''{2}''.
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025: [{0}] Kontextinitialiasierungsparameter ''{1}'' wurde abgelehnt und wird nicht wirksam.
jsf.config.webconfig.option.notconfigured=JSF1026: [{0}] Konfigurationsoption ''{1}'' wurde nicht konfiguriert
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0} Die ELResolvers f\u00fcr JSF wurden nicht im JSP-Container registriert.
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] Die ELResolvers f\u00fcr JSF wurden erfolgreich im JSP-Container registriert.
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0} Die ELResolvers f\u00fcr Faces wurden nicht im JSP-Container registriert.
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] Die ELResolvers f\u00fcr Faces wurden erfolgreich im JSP-Container registriert.
jsf.spi.injection.provider_not_implemented=JSF1029: Die angegebene InjectionProvider-Implementierung ''{0}'' implementiert nicht die InjectionProvider-Schnittstelle.
jsf.spi.injection.provider_not_found=JSF1030: Die angegebene InjectionProvider-Implementierung ''{0}'' kann nicht geladen werden.
jsf.spi.injection.provider_cannot_instantiate=JSF1031: Der angegebene InjectionProvider ''{0}'' kann nicht instanziiert werden.
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_es.properties b/impl/src/main/resources/com/sun/faces/LogStrings_es.properties
index ea252958ed..0fbf5af701 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_es.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_es.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024: cifrado de estado de client
jsf.config.webconfig.param.deprecated=JSF1025: [{0}] el par\u00e1metro de inicializaci\u00f3n del contexto''{1}'' se ha desaprobado. La opci\u00f3n se configurar\u00e1, en lo sucesivo utilice ''{2}''.
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025: [{0}] el par\u00e1metro de inicializaci\u00f3n del contexto''{1}'' se ha desaprobado y no tendr\u00e1 efecto.
jsf.config.webconfig.option.notconfigured=JSF1026: [{0}] opci\u00f3n de configuraci\u00f3n ''{1}'' no configurada
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] los ELResolvers para JSF no se han registrado con el contenedor JSP.
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] los ELResolvers para JSF se han registrado con \u00e9xito con el contenedor JSP.
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] los ELResolvers para Faces no se han registrado con el contenedor JSP.
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] los ELResolvers para Faces se han registrado con \u00e9xito con el contenedor JSP.
jsf.spi.injection.provider_not_implemented=JSF1029: la implementaci\u00f3n especificada de InjectionProvider ''{0}'' no implementa la interfaz de InjectionProvider.
jsf.spi.injection.provider_not_found=JSF1030: la implementaci\u00f3n especificada de InjectionProvider ''{0}'' no se puede cargar.
jsf.spi.injection.provider_cannot_instantiate=JSF1031: no se puede crear una instancia de la implementaci\u00f3n InjectionProvider ''{0}'' especificada.
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065: no se p
jsf.application.publish.event.base_type_mismatch=JSF1066: el objeto de origen {0} no es una instancia del tipo de base proporcionado {1}. No se producir\u00e1 la b\u00fasqueda de eventos.
jsf.config.web_resource_not_found=JSF1067: no se encuentra el recurso {0} especificado por la opci\u00f3n de configuraci\u00f3n {1}. Se ignorar\u00e1 este recurso.
jsf.cannot_instantiate_component_error=JSF1068: no se puede crear una instancia para el componente con component-type {0}
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069: se han desactivado FaceletsViewHandler JSF 2.0 ya que se ha configurado expl\u00edcitamente un FaceletViewHandler, {0} m\u00e1s antiguo. Este comportamiento no es el deseado, elimine de la aplicaci\u00f3n el FaceletViewHandler m\u00e1s antiguo y la biblioteca.
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069: se han desactivado FaceletsViewHandler Faces 2.0 ya que se ha configurado expl\u00edcitamente un FaceletViewHandler, {0} m\u00e1s antiguo. Este comportamiento no es el deseado, elimine de la aplicaci\u00f3n el FaceletViewHandler m\u00e1s antiguo y la biblioteca.
jsf.navigation_invalid_query_string=JSF1070: cadena de consulta no v\u00e1lida en el resultado de navegaci\u00f3n {0}
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
jsf.context.exception.handler.log_before=JSF1071: se ha interceptado {0} durante el procesamiento beforePhase() de {1} : UIComponent-ClientId={2}, Mensaje={3}
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_fr.properties b/impl/src/main/resources/com/sun/faces/LogStrings_fr.properties
index ceaf26e63e..cb00d14bab 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_fr.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_fr.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024 : Cryptage de l\u2019\u00e9t
jsf.config.webconfig.param.deprecated=JSF1025 : [{0}] le param\u00e8tre d\u2019initialisation du contexte \u00ab{1}\u00bb est d\u00e9sapprouv\u00e9. Cette option sera toujours configur\u00e9e, mais \u00e0 l\u2019avenir, utilisez \u00ab{2}\u00bb.
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025 : [{0}] le param\u00e8tre d\u2019initialisation du contexte \u00ab{1}\u00bb est d\u00e9sapprouv\u00e9 et n\u2019aura aucun effet.
jsf.config.webconfig.option.notconfigured=JSF1026: [{0}] L\u2019option de configuration \u00ab{1}\u00bb n\u2019est pas configur\u00e9e.
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027 : [{0}] Les objets ELResolvers de JSF n\u2019ont pas \u00e9t\u00e9 enregistr\u00e9s avec le conteneur JSP.
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028 : [{0}] Les objets ELResolvers de JSF ont bien \u00e9t\u00e9 enregistr\u00e9s avec le conteneur JSP.
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027 : [{0}] Les objets ELResolvers de Faces n\u2019ont pas \u00e9t\u00e9 enregistr\u00e9s avec le conteneur JSP.
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028 : [{0}] Les objets ELResolvers de Faces ont bien \u00e9t\u00e9 enregistr\u00e9s avec le conteneur JSP.
jsf.spi.injection.provider_not_implemented=JSF1029 : L\u2019impl\u00e9mentation sp\u00e9cifi\u00e9e d\u2019InjectionProvider \u00ab{0}\u00bb n\u2019impl\u00e9mente pas l\u2019interface InjectionProvider.
jsf.spi.injection.provider_not_found=JSF1030 : Impossible de charger l\u2019impl\u00e9mentation sp\u00e9cifi\u00e9e d\u2019InjectionProvider \u00ab{0}\u00bb
jsf.spi.injection.provider_cannot_instantiate=JSF1031 : Impossible d\u2019instancier l\u2019InjectionProvider sp\u00e9cifi\u00e9 \u00ab{0}\u00bb
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065: Impossi
jsf.application.publish.event.base_type_mismatch=JSF1066 : L\u2019objet source {0} n\u2019est pas une instance du type de base fourni {1}. La recherche d\u2019\u00e9v\u00e9nements ne sera pas r\u00e9alis\u00e9e.
jsf.config.web_resource_not_found=JSF1067 : La ressource {0} sp\u00e9cifi\u00e9e par l\u2019option de configuration {1} est introuvable. Cette ressource sera ignor\u00e9e.
jsf.cannot_instantiate_component_error=JSF1068 : Impossible d\u2019instancier un composant dont le type est {0}
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069 : Le ViewHandler de Facelets JSF 2.0 a \u00e9t\u00e9 d\u00e9sactiv\u00e9 car un FaceletViewHandler plus ancien, {0}, a \u00e9t\u00e9 configur\u00e9 explicitement. Ce comportement n\u2019est pas d\u00e9sir\u00e9. Retirez l\u2019ancien FaceletViewHandler et sa biblioth\u00e8que de votre application.
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069 : Le ViewHandler de Facelets Faces 2.0 a \u00e9t\u00e9 d\u00e9sactiv\u00e9 car un FaceletViewHandler plus ancien, {0}, a \u00e9t\u00e9 configur\u00e9 explicitement. Ce comportement n\u2019est pas d\u00e9sir\u00e9. Retirez l\u2019ancien FaceletViewHandler et sa biblioth\u00e8que de votre application.
jsf.navigation_invalid_query_string=JSF1070 : Cha\u00eene de requ\u00eate non valide dans le r\u00e9sultat de navigation {0}
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
jsf.context.exception.handler.log_before=JSF1071 : {0} intercept\u00e9 durant le traitement beforePhase() de {1} : UIComponent-ClientId={2}, Message={3}
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_pt_BR.properties b/impl/src/main/resources/com/sun/faces/LogStrings_pt_BR.properties
index 6094e45c90..e579267583 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_pt_BR.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_pt_BR.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024: Criptografia de estado de c
jsf.config.webconfig.param.deprecated=JSF1025: [{0}] O par\u00e2metro de inicializa\u00e7\u00e3o de contexto ''{1}'' est\u00e1 desaprovado. A op\u00e7\u00e3o continuar\u00e1 configurada, mas use ''{2}'' no futuro.
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025: [{0}] O par\u00e2metro de iniciali\u00e7\u00e3o de contexto ''{1}'' est\u00e1 desaprovado e n\u00e3o ter\u00e1 efeito.
jsf.config.webconfig.option.notconfigured=JSF1026: [{0}] A op\u00e7\u00e3o de configura\u00e7\u00e3o ''{1}'' n\u00e3o est\u00e1 configurada
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] Os ELResolvers para JSF n\u00e3o foram registrados com o cont\u00eainer JSP.
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] Os ELResolvers para JSF foram registrados com o cont\u00eainer JSP.
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027: [{0}] Os ELResolvers para Faces n\u00e3o foram registrados com o cont\u00eainer JSP.
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028: [{0}] Os ELResolvers para Faces foram registrados com o cont\u00eainer JSP.
jsf.spi.injection.provider_not_implemented=JSF1029: A implementa\u00e7\u00e3o do InjectionProvider especificado ''{0}'' n\u00e3o implementa a interface do InjectionProvider.
jsf.spi.injection.provider_not_found=JSF1030: A implementa\u00e7\u00e3o do InjectionProvider especificado ''{0}'' n\u00e3o pode ser carregada.
jsf.spi.injection.provider_cannot_instantiate=JSF1031: O InjectionProvider especificado ''{0}'' n\u00e3o pode ser instanciado.
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065: N\u00e3
jsf.application.publish.event.base_type_mismatch=JSF1066: O objeto de origem {0} n\u00e3o \u00e9 uma inst\u00e2ncia do tipo de base fornecido {1}. A pesquisa de evento n\u00e3o ser\u00e1 realizada.
jsf.config.web_resource_not_found=JSF1067: O recurso {0} especificado pela op\u00e7\u00e3o de configura\u00e7\u00e3o {1} n\u00e3o p\u00f4de ser encontrado. O recurso ser\u00e1 ignorado.
jsf.cannot_instantiate_component_error=JSF1068: N\u00e3o \u00e9 poss\u00edvel criar inst\u00e2ncia para o componente com o component-type {0}
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069: Desativar os Facelets do JSF 2.0 ViewHandler como um FaceletViewHandler antigo, {0}, foi explicitamente configurado. Se este n\u00e3o for um comportamento desejado, remova o FaceletViewHandler antigo e a biblioteca do seu aplicativo.
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069: Desativar os Facelets do Faces 2.0 ViewHandler como um FaceletViewHandler antigo, {0}, foi explicitamente configurado. Se este n\u00e3o for um comportamento desejado, remova o FaceletViewHandler antigo e a biblioteca do seu aplicativo.
jsf.navigation_invalid_query_string=JSF1070: Seq\u00fc\u00eancia de consulta inv\u00e1lida no resultado da navega\u00e7\u00e3o {0}
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
jsf.context.exception.handler.log_before=JSF1071: {0} obtido durante o processamento de beforePhase() de {1}: UIComponent-ClientId={2}, Message={3}
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_zh_CN.properties b/impl/src/main/resources/com/sun/faces/LogStrings_zh_CN.properties
index b83048fdfb..129dd76dff 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_zh_CN.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_zh_CN.properties
@@ -43,8 +43,8 @@ jsf.config.webconfig.enventry.clientencrypt=JSF1024\uff1a \u5ba2\u6237\u673a\u72
jsf.config.webconfig.param.deprecated=JSF1025\uff1a[{0}] \u4e0a\u4e0b\u6587\u521d\u59cb\u5316\u53c2\u6570 ''{1}'' \u5df2\u8fc7\u65f6\u3002\u4ecd\u5c06\u914d\u7f6e\u8be5\u9009\u9879\uff0c\u4f46\u4ee5\u540e\u8bf7\u4f7f\u7528 ''{2}''\u3002
jsf.config.webconfig.param.deprecated.no_replacement=JSF1025\uff1a[{0}] \u4e0a\u4e0b\u6587\u521d\u59cb\u5316\u53c2\u6570 ''{1}'' \u5df2\u8fc7\u65f6\uff0c\u4e0d\u8d77\u4f5c\u7528\u3002
jsf.config.webconfig.option.notconfigured=JSF1026\uff1a[{0}] \u914d\u7f6e\u9009\u9879 ''{1}'' \u672a\u914d\u7f6e
-jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027\uff1a[{0}] \u672a\u5728 JSP \u5bb9\u5668\u4e2d\u6ce8\u518c JSF \u7684 ELResolver\u3002
-jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028\uff1a[{0}] \u5df2\u5728 JSP \u5bb9\u5668\u4e2d\u6210\u529f\u6ce8\u518c JSF \u7684 ELResolver\u3002
+jsf.lifecycle.initphaselistener.resolvers_not_registered=JSF1027\uff1a[{0}] \u672a\u5728 JSP \u5bb9\u5668\u4e2d\u6ce8\u518c Faces \u7684 ELResolver\u3002
+jsf.lifecycle.initphaselistener.resolvers_registered=JSF1028\uff1a[{0}] \u5df2\u5728 JSP \u5bb9\u5668\u4e2d\u6210\u529f\u6ce8\u518c Faces \u7684 ELResolver\u3002
jsf.spi.injection.provider_not_implemented=JSF1029\uff1a\u6307\u5b9a\u7684 InjectionProvider \u5b9e\u73b0 ''{0}'' \u672a\u5b9e\u73b0 InjectionProvider \u63a5\u53e3\u3002
jsf.spi.injection.provider_not_found=JSF1030\uff1a\u6307\u5b9a\u7684 InjectionProvider \u5b9e\u73b0 ''{0}'' \u65e0\u6cd5\u88c5\u5165\u3002
jsf.spi.injection.provider_cannot_instantiate=JSF1031\uff1a\u6307\u5b9a\u7684 InjectionProvider ''{0}'' \u65e0\u6cd5\u5b9e\u4f8b\u5316\u3002
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065\uff1a\u6
jsf.application.publish.event.base_type_mismatch=JSF1066\uff1a\u6e90\u5bf9\u8c61 {0} \u4e0d\u662f\u6240\u63d0\u4f9b\u7684\u57fa\u7c7b\u578b {1} \u7684\u5b9e\u4f8b\u3002\u4e0d\u4f1a\u8fdb\u884c\u4e8b\u4ef6\u641c\u7d22\u3002
jsf.config.web_resource_not_found=JSF1067\uff1a\u65e0\u6cd5\u627e\u5230 {1} \u914d\u7f6e\u9009\u9879\u6307\u5b9a\u7684\u8d44\u6e90 {0}\u3002\u6b64\u8d44\u6e90\u5c06\u88ab\u5ffd\u7565\u3002
jsf.cannot_instantiate_component_error=JSF1068\uff1a\u65e0\u6cd5\u5b9e\u4f8b\u5316\u7ec4\u4ef6\u7c7b\u578b\u4e3a {0} \u7684\u7ec4\u4ef6
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069\uff1a\u5df2\u660e\u786e\u914d\u7f6e\u7981\u6b62\u5c06 JSF 2.0 Facelets ViewHandler \u7528\u4f5c\u8f83\u65e7\u7684 FaceletViewHandler {0}\u3002\u5982\u679c\u6b64\u884c\u4e3a\u4e0d\u662f\u6240\u9700\u7684\u884c\u4e3a\uff0c\u8bf7\u4ece\u5e94\u7528\u7a0b\u5e8f\u4e2d\u5220\u9664\u8f83\u65e7\u7684 FaceletViewHandler \u548c\u5e93\u3002
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069\uff1a\u5df2\u660e\u786e\u914d\u7f6e\u7981\u6b62\u5c06 Faces 2.0 Facelets ViewHandler \u7528\u4f5c\u8f83\u65e7\u7684 FaceletViewHandler {0}\u3002\u5982\u679c\u6b64\u884c\u4e3a\u4e0d\u662f\u6240\u9700\u7684\u884c\u4e3a\uff0c\u8bf7\u4ece\u5e94\u7528\u7a0b\u5e8f\u4e2d\u5220\u9664\u8f83\u65e7\u7684 FaceletViewHandler \u548c\u5e93\u3002
jsf.navigation_invalid_query_string=JSF1070\uff1a\u5bfc\u822a\u7ed3\u679c {0} \u4e2d\u7684\u67e5\u8be2\u5b57\u7b26\u4e32\u65e0\u6548
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
jsf.context.exception.handler.log_before=JSF1071\uff1a\u5728 {1} \u7684 beforePhase() \u5904\u7406\u8fc7\u7a0b\u4e2d\u6355\u6349\u5230 {0}\uff1aUIComponent-ClientId={2}\uff0cMessage={3}
diff --git a/impl/src/main/resources/com/sun/faces/LogStrings_zh_HK.properties b/impl/src/main/resources/com/sun/faces/LogStrings_zh_HK.properties
index 5ce91cedf3..8f90331a0c 100644
--- a/impl/src/main/resources/com/sun/faces/LogStrings_zh_HK.properties
+++ b/impl/src/main/resources/com/sun/faces/LogStrings_zh_HK.properties
@@ -92,7 +92,7 @@ jsf.application.resource.unable_to_create_compression_directory=JSF1065\uff1a\u7
jsf.application.publish.event.base_type_mismatch=JSF1066\uff1a\u4f86\u6e90\u7269\u4ef6 {0} \u4e0d\u662f\u6240\u63d0\u4f9b\u4e4b\u57fa\u5e95\u985e\u578b {1} \u7684\u5be6\u4f8b\u3002\u4e8b\u4ef6\u641c\u5c0b\u5c07\u4e0d\u6703\u57f7\u884c\u3002
jsf.config.web_resource_not_found=JSF1067\uff1a\u627e\u4e0d\u5230 {1} \u914d\u7f6e\u9078\u9805\u6307\u5b9a\u7684\u8cc7\u6e90 {0}\u3002\u6b64\u8cc7\u6e90\u5c07\u88ab\u5ffd\u7565\u3002
jsf.cannot_instantiate_component_error=JSF1068\uff1a\u7121\u6cd5\u5be6\u4f8b\u5316\u5143\u4ef6\u985e\u578b\u70ba {0} \u7684\u5143\u4ef6
-jsf.application.legacy_facelet_viewhandler_detected=JSF1069\uff1a\u505c\u7528 JSF 2.0 Facelets ViewHandler\uff0c\u56e0\u5df2\u660e\u78ba\u914d\u7f6e\u4f7f\u7528\u820a\u7248 FaceletViewHandler {0}\u3002\u5982\u679c\u9019\u4e0d\u662f\u6240\u8981\u7684\u904b\u4f5c\u65b9\u5f0f\uff0c\u8acb\u5f9e\u61c9\u7528\u7a0b\u5f0f\u79fb\u9664\u820a\u7248 FaceletViewHandler \u548c\u7a0b\u5f0f\u5eab\u3002
+jsf.application.legacy_facelet_viewhandler_detected=JSF1069\uff1a\u505c\u7528 Faces 2.0 Facelets ViewHandler\uff0c\u56e0\u5df2\u660e\u78ba\u914d\u7f6e\u4f7f\u7528\u820a\u7248 FaceletViewHandler {0}\u3002\u5982\u679c\u9019\u4e0d\u662f\u6240\u8981\u7684\u904b\u4f5c\u65b9\u5f0f\uff0c\u8acb\u5f9e\u61c9\u7528\u7a0b\u5f0f\u79fb\u9664\u820a\u7248 FaceletViewHandler \u548c\u7a0b\u5f0f\u5eab\u3002
jsf.navigation_invalid_query_string=JSF1070\uff1a\u700f\u89bd\u7d50\u679c {0} \u4e2d\u6709\u7121\u6548\u7684\u67e5\u8a62\u5b57\u4e32
# the following three messages are duplicated in jakarta.faces.LogStrings.properties
jsf.context.exception.handler.log_before=JSF1071\uff1a\u5728 {1} \u7684 beforePhase() \u8655\u7406\u671f\u9593\u622a\u7372 {0}\uff1aUIComponent-ClientId={2}\uff0c\u8a0a\u606f={3}
diff --git a/impl/src/main/resources/com/sun/faces/facelets/tag/jsf/html/package.html b/impl/src/main/resources/com/sun/faces/facelets/tag/jsf/html/package.html
index 50167a048f..683c298897 100644
--- a/impl/src/main/resources/com/sun/faces/facelets/tag/jsf/html/package.html
+++ b/impl/src/main/resources/com/sun/faces/facelets/tag/jsf/html/package.html
@@ -22,6 +22,6 @@
Tag Library for http://java.sun.com/jsf/html.
-See JSF HTML Tag Javadocs for attributes/functionality.
+See Faces HTML Tag Javadocs for attributes/functionality.