Merge pull request #4744 from arjantijms/terms_update

Updating terms, mainly JSF to Faces

impl/pom.xml

@@ -46,7 +46,7 @@
     <!-- ###  D E P E N D E N C I E S  ### --> 
 
     <dependencies>
-        <!-- Java EE Dependencies -->
+        <!-- Jakarta EE Dependencies -->
 
         <dependency>
             <groupId>jakarta.servlet</groupId>
@@ -208,7 +208,7 @@
                     <exclude>**/LogStrings*.properties</exclude>
                 </excludes>
             </resource>
-            <!-- Sets the Main JSF version into the log strings -->
+            <!-- Sets the Main Faces version into the log strings -->
             <resource>
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
@@ -298,7 +298,7 @@
                     <instructions>
                         <Bundle-SymbolicName>org.glassfish.jakarta.faces</Bundle-SymbolicName>
                         <Bundle-Version>${project.version}</Bundle-Version>
-                        <Bundle-Name>Mojarra JSF Implementation ${project.version}</Bundle-Name>
+                        <Bundle-Name>Mojarra Faces Implementation ${project.version}</Bundle-Name>
                         <Bundle-Description>Eclipse Faces Implementation (jakarta.faces/3.0) ${project.version}</Bundle-Description>
 
                         <Specification-Title>Jakarta Server Faces</Specification-Title>

impl/src/main/java/com/sun/faces/application/annotation/RuntimeAnnotationHandler.java

@@ -26,7 +26,7 @@ interface RuntimeAnnotationHandler {
 
     /**
      * <p>
-     * 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).
      * </p>
      *

impl/src/main/java/com/sun/faces/config/ConfigManager.java

@@ -102,7 +102,7 @@
 
 /**
  * <p>
- * This class manages the initialization of each web application that uses JSF.
+ * This class manages the initialization of each web application that uses Faces.
  * </p>
  */
 public class ConfigManager {
@@ -210,7 +210,7 @@ public static void removeInstance(ServletContext servletContext) {
 
     /**
      * <p>
-     * This method bootstraps JSF based on the parsed configuration resources.
+     * This method bootstraps Faces based on the parsed configuration resources.
      * </p>
      *
      * @param servletContext the <code>ServletContext</code> for the application that requires initialization

impl/src/main/java/com/sun/faces/context/AjaxExceptionHandlerImpl.java

@@ -44,7 +44,7 @@
 
 /**
  * <p>
- * 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.
  * </p>
  *

impl/src/main/java/com/sun/faces/context/ExceptionHandlerImpl.java

@@ -40,7 +40,7 @@
 
 /**
  * <p>
- * The default implementation of {@link ExceptionHandler} for JSF 2.0.
+ * The default implementation of {@link ExceptionHandler} for Faces.
  * </p>
  *
  * <p>

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);

impl/src/main/java/com/sun/faces/context/flash/FlashELResolver.java

@@ -52,7 +52,7 @@
  * <ul>
  * <p/>
  * <p>
- * 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 @@
  * <p/>
  * <li>
  * <p>
- * Using an EL Expression, such as using <code>#{flash.foo}</code> as the value of an attribute in a JSP page.
+ * Using an Expression Language Expression, such as using <code>#{flash.foo}</code> as the value of an attribute in a Jakarta Server Pages page.
  * </p>
  * </li>
  * <p/>

impl/src/main/java/com/sun/faces/el/ChainTypeCompositeELResolver.java

@@ -28,7 +28,7 @@
 import jakarta.faces.context.FacesContext;
 
 /**
- * Maintains an ordered composite list of child <code>ELResolver for JSF</code>.
+ * Maintains an ordered composite list of child <code>ELResolver for Faces</code>.
  *
  */
 public final class ChainTypeCompositeELResolver extends FacesCompositeELResolver {

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 <code>ELResolver for JSF</code>.
+ * Maintains an ordered composite list of child <code>ELResolver for Faces</code>.
  *
  */
 public class DemuxCompositeELResolver extends FacesCompositeELResolver {

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) {

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 <code>ELResolver for JSF</code>.
+ * Maintains an ordered composite list of child <code>ELResolver for Faces</code>.
  *
  */
 public abstract class FacesCompositeELResolver extends CompositeELResolver {
 
     /**
      * <p>
-     * <b>JSP</b> indicates this CompositeELResolver instance is the JSP chain, specified in section 5.6.1 of the spec.
+     * <b>JSP</b> indicates this CompositeELResolver instance is the Jakarta Server Pages chain, specified in section 5.6.1 of the spec.
      * </p>
      *
      * <p>
-     * <b>Faces</b> indicates this CompositeELResolver instance is the JSF chain, specified in section 5.6.2 of the spec.
+     * <b>Faces</b> indicates this CompositeELResolver instance is the Faces chain, specified in section 5.6.2 of the spec.
      * </p>
      */
     public enum ELResolverChainType {

impl/src/main/java/com/sun/faces/ext/component/WholeBeanValidator.java

@@ -95,7 +95,7 @@ public void validate(FacesContext context, UIValidateWholeBean component, Object
                 copyBeanAndPopulateWithCandidateValues(context, wholeBeanVE, wholeBean, copierType, validationCandidate), component.getValidationGroupsArray(),
                 wholeBeanVE);
 
-        // If there are any violations, transform them into a JSF validator exception
+        // If there are any violations, transform them into a Faces validator exception
         if (violations != null && !violations.isEmpty()) {
             ValidatorException toThrow;
 

impl/src/main/java/com/sun/faces/facelets/tag/jsf/core/CoreLibrary.java

@@ -37,7 +37,7 @@
 import jakarta.faces.validator.RequiredValidator;
 
 /**
- * For Tag details, see JSF Core
+ * For Tag details, see Faces Core
  * <a target="_new" href="http://java.sun.com/j2ee/javaserverfaces/1.1_01/docs/tlddocs/f/tld-summary.html">taglib
  * documentation</a>.
  *

impl/src/main/java/com/sun/faces/facelets/tag/jstl/core/SetHandler.java

@@ -102,7 +102,7 @@ public void apply(FaceletContext ctx, UIComponent parent) throws IOException {
                     scopeStr = scope.getValue(ctx);
                 }
                 if (scopeStr.equals("page")) {
-                    throw new TagException(tag, "page scope does not exist in JSF, consider using view scope instead.");
+                    throw new TagException(tag, "page scope does not exist in Faces, consider using view scope instead.");
                 }
                 if (scopeStr.equals("request") || scopeStr.equals("session") || scopeStr.equals("application") || scopeStr.equals("view")) {
                     scopeStr = scopeStr + "Scope";

impl/src/main/java/com/sun/faces/facelets/util/Classpath.java

@@ -41,7 +41,7 @@ public final class Classpath {
 
     // discard any urls that begin with rar: and sar:
     // or end with their counterparts
-    // as these should not be looked at for JSF related content.
+    // as these should not be looked at for Faces related content.
     private static final String[] PREFIXES_TO_EXCLUDE = { "rar:", "sar:" };
     private static final String[] EXTENSIONS_TO_EXCLUDE = { ".rar", ".sar" };
 

impl/src/main/java/com/sun/faces/flow/FlowDiscoveryCDIExtension.java

@@ -49,15 +49,14 @@
  *  Use AfterBeanDiscovery to add a custom Context.  This is necessary
  *  because it was the only way I found that actually worked that let me
  *  pass in the results of the scanning into something I could invoke in
- *  when processing the JSF PostConstructApplicationEvent.
+ *  when processing the Faces PostConstructApplicationEvent.
  *
  *  Use ProcessBean to build up a tuple for each bean annotated with
  *  @FlowDefinition { definingClass, flow-id, defining-document-id }.  A
  *  data structure containing all the tuples is passed to
  *  FlowDiscoveryCDIContext.
  *
  */
-
 public class FlowDiscoveryCDIExtension implements Extension {
 
     // Log instance for this class

impl/src/main/java/com/sun/faces/lifecycle/ELResolverInitPhaseListener.java

@@ -36,7 +36,7 @@
 
 /**
  * <p>
- * This class is used to register the JSF <code>ELResolver</code> stack with the JSP container.
+ * This class is used to register the Faces <code>ELResolver</code> stack with the Jakarta Server Pages container.
  * </p>
  *
  * <p>

impl/src/main/java/com/sun/faces/mgbean/BeanManager.java

@@ -46,7 +46,7 @@
 
 /**
  * <p>
- * Main interface for dealing with JSF managed beans
+ * Main interface for dealing with Faces managed beans
  * </p>
  */
 public class BeanManager implements SystemEventListener {

impl/src/main/java/com/sun/faces/push/WebsocketFacesListener.java

@@ -36,7 +36,7 @@
 
 /**
  * <p class="changed_added_2_3">
- * 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
  * <code>WebSocket</code> is properly rendered depending on <code>rendered</code> and <code>connected</code> attributes.
  *
  * @author Bauke Scholtz

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 {

impl/src/main/java/com/sun/faces/renderkit/ByteArrayGuard.java

@@ -54,7 +54,7 @@
  * </p>
  *
  * <p>
- * 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.
  * </p>
  */
 public final class ByteArrayGuard {
@@ -169,7 +169,7 @@ public byte[] decrypt(FacesContext facesContext, byte[] bytes) {
         } catch (NoSuchAlgorithmException | NoSuchPaddingException | InvalidKeyException | InvalidAlgorithmParameterException | IllegalStateException
                 | IllegalBlockSizeException | BadPaddingException e) {
             System.err.println("ERROR: Decrypting:" + e.getCause());
-            return null; // Signal to JSF runtime
+            return null; // Signal to Faces runtime
         }
     }
 

impl/src/main/java/com/sun/faces/renderkit/ClientSideStateHelper.java

@@ -272,7 +272,7 @@ protected Object doGetState(FacesContext ctx, String stateString) {
             throw new FacesException(cnfe);
         } catch (InvalidClassException ice) {
             /*
-             * Thrown when the JSF runtime is trying to deserialize a client-side state that has been saved with a previous version
+             * Thrown when the Faces runtime is trying to deserialize a client-side state that has been saved with a previous version
              * of Mojarra. Instead of blowing up, force a ViewExpiredException.
              */
             return null;

impl/src/main/java/com/sun/faces/renderkit/RenderKitUtils.java

@@ -129,15 +129,15 @@ public class RenderKitUtils {
      * IMPLEMENTATION NOTE: This must be kept in sync with the array in UIComponentBase$AttributesMap and
      * HtmlComponentGenerator.
      *
-     * Hopefully JSF 2.0 will remove the need for this.
+     * Hopefully Faces X will remove the need for this.
      */
     private static final String OPTIMIZED_PACKAGE = "jakarta.faces.component.";
 
     /**
      * IMPLEMENTATION NOTE: This must be kept in sync with the Key in UIComponentBase$AttributesMap and
      * HtmlComponentGenerator.
      *
-     * Hopefully JSF 2.0 will remove the need for this.
+     * Hopefully Faces X will remove the need for this.
      */
     private static final String ATTRIBUTES_THAT_ARE_SET_KEY = UIComponentBase.class.getName() + ".attributesThatAreSet";
 

impl/src/main/java/com/sun/faces/spi/ConfigurationResourceProvider.java

@@ -40,7 +40,7 @@ public interface ConfigurationResourceProvider {
     Collection<URI> getResources(ServletContext context);
 
     /**
-     * Parameter to force the XML validation of the JSF configuration files returned by getResources.
+     * Parameter to force the XML validation of the Faces configuration files returned by getResources.
      *
      * @param uri the URI for which Mojarra asks if validation is needed. Should always be one as returned by getResources
      * @param globalValidateXml the global (application level) value of the validateXml parameter

impl/src/main/java/com/sun/faces/spi/HighAvailabilityEnabler.java

@@ -19,7 +19,7 @@
 import jakarta.servlet.ServletContext;
 
 /**
- * This interface is for JSF to check if the app server has HA enabled.
+ * This interface is for Faces to check if the app server has HA enabled.
  *
  * @author sheetalv
  */

impl/src/main/java/com/sun/faces/spi/InjectionProvider.java

@@ -18,8 +18,8 @@
 
 /**
  * <p>
- * 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.
  * </p>
  *
  * <p>